From f22d0b138214763e6e9aeb594d438ec116bcd144 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Tue, 15 Sep 2026 16:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=89=E9=85=8D=E8=A1=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BD=9C=E5=BA=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czblood/bus/pojo/DTO/BloodInfoDTO.java | 15 +++++++++++++++ .../java/com/czblood/bus/utils/BloodBankUtil.java | 9 +++++++++ .../service/impl/MatchBloodServiceImpl.java | 1 + .../main/resources/mapper/MatchBloodMapper.xml | 3 ++- .../service/impl/RecycleBagServiceImpl.java | 2 ++ 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 blood_bus/src/main/java/com/czblood/bus/pojo/DTO/BloodInfoDTO.java diff --git a/blood_bus/src/main/java/com/czblood/bus/pojo/DTO/BloodInfoDTO.java b/blood_bus/src/main/java/com/czblood/bus/pojo/DTO/BloodInfoDTO.java new file mode 100644 index 0000000..6bcdbe9 --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/pojo/DTO/BloodInfoDTO.java @@ -0,0 +1,15 @@ +package com.czblood.bus.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 BloodInfoDTO { + private XkBloodInfo xkBloodInfo; + private XkBloodBreed xkBloodBreed; +} diff --git a/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java b/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java index b14bd92..d1715be 100644 --- a/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java +++ b/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.czblood.bus.cache.DmzdCache; import com.czblood.bus.cache.OptionCache; import com.czblood.bus.mapper.*; +import com.czblood.bus.pojo.DTO.BloodInfoDTO; import com.czblood.bus.pojo.XkBloodInfo; import com.czblood.bus.pojo.XkCheckBloodtype; import com.czblood.bus.pojo.XkMatchDetail; @@ -240,4 +241,12 @@ public class BloodBankUtil { return new Result("0","校验通过"); } + public BloodInfoDTO queryBloodInfoDTO(String bloodNo,String productNo){ + XkBloodInfo xkBloodInfo = xkBloodInfoMapper.queryOne(bloodNo, productNo); + XkBloodBreed xkBloodBreed = xkBloodBreedMapper.queryOne(xkBloodInfo.getBlood_breed()); + BloodInfoDTO bloodInfoDTO = new BloodInfoDTO(); + bloodInfoDTO.setXkBloodInfo(xkBloodInfo); + bloodInfoDTO.setXkBloodBreed(xkBloodBreed); + return bloodInfoDTO; + } } 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 190df50..876c7f8 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 @@ -222,6 +222,7 @@ public class MatchBloodServiceImpl implements MatchBloodService { if(xkMatchMain == null) return new Result("-1","该配血单不存在！"); String billStatus = BloodBankUtil.isBank(xkMatchMain.getBill_status()); if(billStatus.equals("B")) return new Result("-1","该配血单已发血,不可作废！"); + if(billStatus.equals("ZF")) return new Result("-1","该配血单已作废,不可作废！"); String chargeMainBillNo = BloodBankUtil.isBank(matchBloodMapper.queryChargeMainBillNo(billNo)); String checkNo = BloodBankUtil.isBank(xkMatchMain.getCheck_no()); XkCheckBloodtype xkCheckBloodtypeTemp = null; diff --git a/blood_bus_bloodbank/src/main/resources/mapper/MatchBloodMapper.xml b/blood_bus_bloodbank/src/main/resources/mapper/MatchBloodMapper.xml index 111784c..88dac53 100644 --- a/blood_bus_bloodbank/src/main/resources/mapper/MatchBloodMapper.xml +++ b/blood_bus_bloodbank/src/main/resources/mapper/MatchBloodMapper.xml @@ -171,9 +171,10 @@ space(4) as match_delay, space(4) as choose FROM xk_blood_info - left join xk_match_detail on (xk_blood_info.blood_no = xk_match_detail.blood_no and xk_match_detail.product_no = xk_blood_info.product_no) + left join xk_match_detail on (xk_blood_info.blood_no = xk_match_detail.blood_no and xk_match_detail.product_no = xk_blood_info.product_no),xk_match_main WHERE ( xk_blood_info.blood_status = '1' ) AND ( xk_blood_info.blood_sort In ('C','W') OR ISNULL(xk_blood_info.blood_sort,'') = '') + 'ZF']]> AND xk_blood_info.blood_no = #{bloodNo} diff --git a/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/impl/RecycleBagServiceImpl.java b/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/impl/RecycleBagServiceImpl.java index bd072ea..221a2b0 100644 --- a/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/impl/RecycleBagServiceImpl.java +++ b/blood_bus_nurse/src/main/java/com/czblood/busNurse/service/impl/RecycleBagServiceImpl.java @@ -92,6 +92,8 @@ public class RecycleBagServiceImpl implements RecycleBagService { if(xkBloodInfo == null) return new Result("-1","血液信息"+bloodNo+"_"+productNo+"不存在"); String bloodStatus = xkBloodInfo.getBlood_status(); if(!bloodStatus.equals("4")) return new Result("-1","该血液"+bloodNo+"_"+productNo+"尚未出库!"); + String recycleSign = BloodBankUtil.isBank(xkBloodInfo.getRecycle_sign()); + if(recycleSign.equals("Y")) return new Result("-1","该血袋"+bloodNo+"_"+productNo+"已经回收，请重新检索数据！"); } Date currentTimeDate = bloodBankUtil.getCurrentTimeDate();