diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/pojo/DTO/BloodMatchDTO.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/pojo/DTO/BloodMatchDTO.java new file mode 100644 index 0000000..07376da --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/pojo/DTO/BloodMatchDTO.java @@ -0,0 +1,15 @@ +package com.czblood.busBloodbank.pojo.DTO; + +import com.czblood.bus.pojo.XkBloodInfo; +import com.czblood.bus.pojo.xtwh.XkBloodBreed; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class BloodMatchDTO { + private XkBloodInfo xkBloodInfo; + private XkBloodBreed xkBloodBreed; +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/MatchBloodServiceImpl.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/MatchBloodServiceImpl.java index 033543e..190df50 100644 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/MatchBloodServiceImpl.java +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/MatchBloodServiceImpl.java @@ -9,6 +9,7 @@ import com.czblood.bus.pojo.inter.MatchBloodTypeRequest; import com.czblood.bus.utils.BloodBankUtil; import com.czblood.bus.utils.BloodInterfaceUtil; import com.czblood.busBloodbank.mapper.MatchBloodMapper; +import com.czblood.busBloodbank.pojo.DTO.BloodMatchDTO; import com.czblood.busBloodbank.pojo.DTO.MatchBloodDTO; import com.czblood.busBloodbank.pojo.VO.MatchBloodListQueryVO; import com.czblood.busBloodbank.pojo.VO.MatchBloodStockQueryVO; @@ -43,6 +44,8 @@ public class MatchBloodServiceImpl implements MatchBloodService { XkMatchMainMapper xkMatchMainMapper; @Resource XkTransfuseApplyTestitemMapper xkTransfuseApplyTestitemMapper; + @Resource + XkBloodBreedMapper xkBloodBreedMapper; @Override public Result queryWaitInfo() { @@ -115,8 +118,10 @@ public class MatchBloodServiceImpl implements MatchBloodService { return new Result("-1","该血液已经出库!"); } - - return new Result("0","获取数据成功!",xkBloodInfo); + BloodMatchDTO bloodMatchDTO = new BloodMatchDTO(); + bloodMatchDTO.setXkBloodInfo(xkBloodInfo); + bloodMatchDTO.setXkBloodBreed(xkBloodBreedMapper.queryOne(xkBloodInfo.getBlood_breed())); + return new Result("0","获取数据成功!",bloodMatchDTO); } @Override diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/utils/MatchBloodUtil.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/utils/MatchBloodUtil.java index 65cc729..50ba5c7 100644 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/utils/MatchBloodUtil.java +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/utils/MatchBloodUtil.java @@ -106,7 +106,7 @@ public class MatchBloodUtil { } public Result checkBloodNeedMatch(String bloodNo,String productNo){ - String isMatch = matchBloodMapper.checkBloodNeedMatch(bloodNo, productNo); + String isMatch = BloodBankUtil.isBank(matchBloodMapper.checkBloodNeedMatch(bloodNo, productNo)); if(isMatch.equals("Y")) return new Result("0","校验通过!"); return new Result("-1","该血液流水号:"+bloodNo+"产品码:"+productNo+"该血液流水号对应的血液不需要进行配血操作!"); }