diff --git a/blood_bus/src/main/resources/mapper/XkTransfuseApplyApprovalMapper.xml b/blood_bus/src/main/resources/mapper/XkTransfuseApplyApprovalMapper.xml index c3dbe1e..7b06847 100644 --- a/blood_bus/src/main/resources/mapper/XkTransfuseApplyApprovalMapper.xml +++ b/blood_bus/src/main/resources/mapper/XkTransfuseApplyApprovalMapper.xml @@ -30,7 +30,8 @@ Medical_CheckTime = #{Medical_CheckTime}, ApplyLevel = #{ApplyLevel}, Flag = #{Flag}, - bill_no = #{billNo} + bill_no = #{Bill_No} + where bill_no = #{Bill_No} delete from xk_transfuse_apply_approval where bill_no = #{billNo} diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyServiceImpl.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyServiceImpl.java index 50ae8d2..8be9fe0 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyServiceImpl.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/service/impl/TransfuseApplyServiceImpl.java @@ -92,7 +92,6 @@ public class TransfuseApplyServiceImpl implements TransfuseApplyService { String beinhosId = xkTransfuseApplyBefore.getBeinhos_id(); TransfuseApplyInfoOne transfuseApplyInfoOne = new TransfuseApplyInfoOne(); XkTransfuseApply xkTransfuseApply = new XkTransfuseApply(); - XkPatientInfo xkPatientInfoSet = new XkPatientInfo(); xkTransfuseApply.setBeinhos_id(beinhosId); xkTransfuseApply.setHos_id(xkTransfuseApplyBefore.getHos_id()); xkTransfuseApply.setBeinhos_number(xkPatientInfo.getBeinhos_number()); @@ -126,12 +125,14 @@ public class TransfuseApplyServiceImpl implements TransfuseApplyService { xkTransfuseApply.setNotice_yn("N"); xkTransfuseApply.setBill_sort("N"); xkTransfuseApply.setAssess_bill_no(xkTransfuseApplyBefore.getBill_no()); //输血评估单号 - xkPatientInfoSet.setPatient_name(xkPatientInfo.getPatient_name()); - xkPatientInfoSet.setPatient_sex(xkPatientInfo.getPatient_sex()); - xkPatientInfoSet.setAge(xkPatientInfo.getAge()); - xkPatientInfoSet.setApanage(xkPatientInfo.getApanage()); +// xkPatientInfoSet.setPatient_name(xkPatientInfo.getPatient_name()); +// xkPatientInfoSet.setPatient_sex(xkPatientInfo.getPatient_sex()); +// xkPatientInfoSet.setAge(xkPatientInfo.getAge()); +// xkPatientInfoSet.setApanage(xkPatientInfo.getApanage()); +// xkPatientInfoSet.setAbo(xkPatientInfo.getAbo()); +// xkPatientInfoSet.setRh(xkPatientInfo.getRh()); transfuseApplyInfoOne.setXkTransfuseApply(xkTransfuseApply); - transfuseApplyInfoOne.setXkPatientInfo(xkPatientInfoSet); + transfuseApplyInfoOne.setXkPatientInfo(xkPatientInfo); return new Result("0","操作成功",transfuseApplyInfoOne); } diff --git a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyUtil.java b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyUtil.java index 145c3d4..2d94be2 100644 --- a/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyUtil.java +++ b/blood_bus_doctor/src/main/java/com/czblood/busDoctor/utils/TransfuseApplyUtil.java @@ -131,15 +131,15 @@ public class TransfuseApplyUtil { String beinhosId = BloodBankUtil.isBank(xkTransfuseApply.getBeinhos_id()); String deptType = BloodBankUtil.isBank(xkTransfuseApply.getDept_Type()); String useType = BloodBankUtil.isBank(xkTransfuseApply.getUse_type()); - XkCausalisSet xkCausalisSet = new XkCausalisSet(); - xkCausalisSet.setUse_Sign("Y"); - xkCausalisSet.setDept_Type(deptType); - xkCausalisSet.setUse_Type(useType); - List xkCausalisSetList = xkCausalisSetMapper.queryList(xkCausalisSet); - List xkTransfuseApplyCausalisList = new ArrayList<>(); - int i = 0; //这个返回也是原来的逻辑 if(beinhosId.equals("") || deptType.equals("") || useType.equals("") ) return new Result("0","字段没有填完整,无法校验!"); + XkCausalisSet xkCausalisSet = new XkCausalisSet(); + xkCausalisSet.setUse_Sign("Y"); + xkCausalisSet.setDept_Type(deptType); //科室类型 + xkCausalisSet.setUse_Type(useType); //科室类型对应的类型 + List xkCausalisSetList = xkCausalisSetMapper.queryList(xkCausalisSet); + List xkTransfuseApplyCausalisList = new ArrayList<>(); + int i = 1; List xkTransfuseApplyTestitemList = transfuseApplyDTO.getXkTransfuseApplyTestitemList(); for (XkTransfuseApplyBloodbreed xkTransfuseApplyBloodbreed : xkTransfuseApplyBloodbreedList) { String bloodBreed = BloodBankUtil.isBank(xkTransfuseApplyBloodbreed.getBlood_breed()); @@ -156,9 +156,9 @@ public class TransfuseApplyUtil { XkTransfuseApplyCausalisDTO xkTransfuseApplyCausalisDTO = new XkTransfuseApplyCausalisDTO(); XkTransfuseApplyCausalis xkTransfuseApplyCausalis = new XkTransfuseApplyCausalis(); xkTransfuseApplyCausalis.setSID(i++); - xkTransfuseApplyCausalis.setCausalis_Code(xkCausalisSet.getCausalis_Code()); - xkTransfuseApplyCausalis.setCausalis_Name(xkCausalisSet.getCausalis_Name()); - xkTransfuseApplyCausalis.setCausalis_Result(xkCausalisSet.getCausalis_Result()); + xkTransfuseApplyCausalis.setCausalis_Code(xkCausalisSet2.getCausalis_Code()); + xkTransfuseApplyCausalis.setCausalis_Name(xkCausalisSet2.getCausalis_Name()); + xkTransfuseApplyCausalis.setCausalis_Result(xkCausalisSet2.getCausalis_Result()); xkTransfuseApplyCausalis.setUse_Flag("Y"); xkTransfuseApplyCausalis.setUpload_Flag("N"); xkTransfuseApplyCausalis.setExplain(""); @@ -188,7 +188,10 @@ public class TransfuseApplyUtil { String testValueStandard2 = xkCausalisSet.getTest_Value2(); if(!StrUtil.isNumeric(testValue)) continue; //不是数字型的不处理 if(!StrUtil.isNumeric(testValueStandard)) continue; - if(!StrUtil.isNumeric(testValueStandard2)) continue; + if(resultExpression.equals("between")){ + if(!StrUtil.isNumeric(testValueStandard2)) continue; + } + String causalisResult = xkCausalisSet.getCausalis_Result(); if(causalisResult.equals("")) continue; if(causalisResult.equals("Y")){