Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r17643 -r17667 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 17643) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 17667) @@ -3910,8 +3910,8 @@ //设置申请单状态这一句一定要放在设置申请项之后 setApplicationStatus(recyclingApplication, newTousseNameAndAmountMap); setInstanceCodesToApplication(tousseInstanceMap, recyclingApplication); - // 备注里面增加普通器械包的数量 - RecyclingApplicationUtils.appendTousseAmountRemark(recyclingApplication); + // 备注里面增加普通器械包的数量(做成可配置,不用对所有项目都全部写死的方式) + //RecyclingApplicationUtils.appendTousseAmountRemark(recyclingApplication); saveOrUpdateRecyclingApplication(recyclingApplication,true); list.add(recyclingApplication); Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r17658 -r17667 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 17658) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 17667) @@ -1223,8 +1223,13 @@ for (TousseInstance tousseInstance : useRecord.getTousseInstanceList(objectDao)) { tousseBarcodes += tousseInstance.getBarcode() + ";"; } + recyclingApplication.setTousseBarcodes(tousseBarcodes); recyclingApplication.setUseRecord(useRecord); + //申请人、提交时间及最后修改时间都取最后一条使用记录的信息 + recyclingApplication.setApplicant(applicant); + recyclingApplication.setApplicationTime(applicationCreateDate); + recyclingApplication.setSubmitTime(applicationCreateDate); //住院号叠加 if(StringUtils.isNotBlank(recyclingApplication.getHospitalNumber())){ if(StringUtils.isNotBlank(useRecord.getHospitalNum())){ @@ -1344,6 +1349,10 @@ recyclingApplication.setTousseBarcodes(tousseBarcodes); recyclingApplication.setUseRecord(useRecord); + //申请人、提交时间及最后修改时间都取最后一条使用记录的信息 + recyclingApplication.setApplicant(applicant); + recyclingApplication.setApplicationTime(applicationCreateDate); + recyclingApplication.setSubmitTime(applicationCreateDate); //住院号叠加 if(StringUtils.isNotBlank(recyclingApplication.getHospitalNumber())){ if(StringUtils.isNotBlank(useRecord.getHospitalNum())){ @@ -1460,7 +1469,12 @@ for (TousseInstance tousseInstance : useRecord.getTousseInstanceList(objectDao)) { tousseBarcodes += tousseInstance.getBarcode() + ";"; } - + recyclingApplication.setTousseBarcodes(tousseBarcodes); + recyclingApplication.setUseRecord(useRecord); + //申请人、提交时间及最后修改时间都取最后一条使用记录的信息 + recyclingApplication.setApplicant(applicant); + recyclingApplication.setApplicationTime(applicationCreateDate); + recyclingApplication.setSubmitTime(applicationCreateDate); //住院号叠加 if(StringUtils.isNotBlank(recyclingApplication.getHospitalNumber())){ if(StringUtils.isNotBlank(useRecord.getHospitalNum())){ @@ -1475,8 +1489,6 @@ //原住院号与新使用记录的住院号都为空白时,不用设置 } } - recyclingApplication.setTousseBarcodes(tousseBarcodes); - recyclingApplication.setUseRecord(useRecord); //追加申请项(相同物品的,则数量进行叠加) recyclingApplication.appendTousseItemFromUseRecord(objectDao); @@ -1575,7 +1587,7 @@ * @return */ private String getRemarkByUseRecordAndProjectConfig(UseRecord useRecord){ - String useRecordConvertRecyclingApplicationRemark = CssdUtils.getConfigProperty("useRecordConvertRecyclingApplicationRemark"); + String useRecordConvertRecyclingApplicationRemark = CssdUtils.getSystemSetConfigByName("useRecordConvertRecyclingApplicationRemark"); if(StringUtils.isNotBlank(useRecordConvertRecyclingApplicationRemark)){ //目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount if(StringUtils.isNotBlank(getCircuitNurseLabelName())){ @@ -1606,17 +1618,17 @@ //手术台数(一条使用记录默认就是一台手术) useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@operationAmount", "1"); //器械件数(仅计算能被转换到申请单的器械包总件数) - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@tousseAmount", String.valueOf(useRecord.getTousseInstanceWillBeConvertedTousseItemList(objectDao))); + useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@tousseAmount", String.valueOf(useRecord.getTousseInstanceWillBeConvertedTousseItemList(objectDao).size())); }else{ useRecordConvertRecyclingApplicationRemark = ""; if(StringUtils.isNotBlank(useRecord.getWashHandNurse())){ useRecordConvertRecyclingApplicationRemark += "洗手护士:" + useRecord.getWashHandNurse() + ";"; } if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){ - useRecordConvertRecyclingApplicationRemark = getCircuitNurseLabelName() + ":" + useRecord.getCircuitNurse() + ";"; + useRecordConvertRecyclingApplicationRemark += getCircuitNurseLabelName() + ":" + useRecord.getCircuitNurse() + ";"; } if(StringUtils.isNotBlank(useRecord.getPatientName())){ - useRecordConvertRecyclingApplicationRemark = "病人:" + useRecord.getPatientName() + ";"; + useRecordConvertRecyclingApplicationRemark += "病人:" + useRecord.getPatientName() + ";"; } } return useRecordConvertRecyclingApplicationRemark; @@ -1634,77 +1646,77 @@ * @return */ private String getRemarkByRecyclingApplicationAndProjectConfig(RecyclingApplication recyclingApplication){ - String useRecordConvertRecyclingApplicationRemark = CssdUtils.getSystemSetConfigByName("useRecordConvertRecyclingApplicationRemark"); + String useRecordMergeConvertRecyclingApplicationRemark = CssdUtils.getSystemSetConfigByName("useRecordMergeConvertRecyclingApplicationRemark"); List useRecordList = objectDao.findBySql(UseRecord.class.getSimpleName(), " where id in (select useRecordId from UseRecordToRecycleApplication where invoicePlanId="+ recyclingApplication.getId() +")"); Set remarks = new HashSet(); if(CollectionUtils.isNotEmpty(useRecordList)){ //如果有配置使用记录转换申请单后的备注格式 - if(StringUtils.isNotBlank(useRecordConvertRecyclingApplicationRemark)){ + if(StringUtils.isNotBlank(useRecordMergeConvertRecyclingApplicationRemark)){ //如果备注格式只需要@operationAmount或@tousseAmount并且又未配置@circuitNurseLabelName、@circuitNurseLabelName、@circuitNurse、@patientName、@useRecordRemark、@hospitalNumber其中任何一个时等时 - if((useRecordConvertRecyclingApplicationRemark.indexOf("@operationAmount") != -1 || useRecordConvertRecyclingApplicationRemark.indexOf("@tousseAmount") != -1)){ + if((useRecordMergeConvertRecyclingApplicationRemark.indexOf("@operationAmount") != -1 || useRecordMergeConvertRecyclingApplicationRemark.indexOf("@tousseAmount") != -1)){ if(CollectionUtils.isNotEmpty(recyclingApplication.getApplicationItems())){ int tousseTotalAmount = 0; for (TousseItem tousseItem : recyclingApplication.getApplicationItems()) { tousseTotalAmount += tousseItem.getAmount(); } //手术台数(一条使用记录默认就是一台手术) - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@operationAmount", String.valueOf(useRecordList.size())); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@operationAmount", String.valueOf(useRecordList.size())); //器械件数(仅计算能被转换到申请单的器械包总件数) - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@tousseAmount", String.valueOf(tousseTotalAmount)); - remarks.add(useRecordConvertRecyclingApplicationRemark); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@tousseAmount", String.valueOf(tousseTotalAmount)); + remarks.add(useRecordMergeConvertRecyclingApplicationRemark); } } - if(useRecordConvertRecyclingApplicationRemark.indexOf("@circuitNurseLabelName") != -1 - || useRecordConvertRecyclingApplicationRemark.indexOf("@circuitNurse") != -1 - || useRecordConvertRecyclingApplicationRemark.indexOf("@patientName") != -1 - || useRecordConvertRecyclingApplicationRemark.indexOf("@useRecordRemark") != -1 - || useRecordConvertRecyclingApplicationRemark.indexOf("@hospitalNumber") != -1){ + if(useRecordMergeConvertRecyclingApplicationRemark.indexOf("@circuitNurseLabelName") != -1 + || useRecordMergeConvertRecyclingApplicationRemark.indexOf("@circuitNurse") != -1 + || useRecordMergeConvertRecyclingApplicationRemark.indexOf("@patientName") != -1 + || useRecordMergeConvertRecyclingApplicationRemark.indexOf("@useRecordRemark") != -1 + || useRecordMergeConvertRecyclingApplicationRemark.indexOf("@hospitalNumber") != -1){ for (UseRecord useRecord : useRecordList) { //目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount if(StringUtils.isNotBlank(getCircuitNurseLabelName())){ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", getCircuitNurseLabelName()); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", getCircuitNurseLabelName()); }else{ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", ""); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", ""); } if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", useRecord.getCircuitNurse()); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurse", useRecord.getCircuitNurse()); }else{ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", ""); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurse", ""); } if(StringUtils.isNotBlank(useRecord.getPatientName())){ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@patientName", useRecord.getPatientName()); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@patientName", useRecord.getPatientName()); }else{ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@patientName", ""); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@patientName", ""); } if(StringUtils.isNotBlank(useRecord.getRemark())){ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", useRecord.getRemark()); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@useRecordRemark", useRecord.getRemark()); }else{ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", ""); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@useRecordRemark", ""); } if(StringUtils.isNotBlank(useRecord.getHospitalNum())){ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", useRecord.getHospitalNum()); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@hospitalNumber", useRecord.getHospitalNum()); }else{ - useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", ""); + useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@hospitalNumber", ""); } - remarks.add(useRecordConvertRecyclingApplicationRemark); + remarks.add(useRecordMergeConvertRecyclingApplicationRemark); } } }else{ for (UseRecord useRecord : useRecordList) { - useRecordConvertRecyclingApplicationRemark = ""; + useRecordMergeConvertRecyclingApplicationRemark = ""; if(StringUtils.isNotBlank(useRecord.getWashHandNurse())){ - useRecordConvertRecyclingApplicationRemark += "洗手护士:" + useRecord.getWashHandNurse() + ";"; + useRecordMergeConvertRecyclingApplicationRemark += "洗手护士:" + useRecord.getWashHandNurse() + ";"; } if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){ - useRecordConvertRecyclingApplicationRemark = getCircuitNurseLabelName() + ":" + useRecord.getCircuitNurse() + ";"; + useRecordMergeConvertRecyclingApplicationRemark += getCircuitNurseLabelName() + ":" + useRecord.getCircuitNurse() + ";"; } if(StringUtils.isNotBlank(useRecord.getPatientName())){ - useRecordConvertRecyclingApplicationRemark = "病人:" + useRecord.getPatientName() + ";"; + useRecordMergeConvertRecyclingApplicationRemark += "病人:" + useRecord.getPatientName() + ";"; } - remarks.add(useRecordConvertRecyclingApplicationRemark); + remarks.add(useRecordMergeConvertRecyclingApplicationRemark); } } }