Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r14324 -r14345 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 14324) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 14345) @@ -1261,18 +1261,19 @@ if("gzfdzl".equals(projectName)){ remark.append(hospitalNum); }else{ + List remarks = new ArrayList(); if(washHandNurseSet.size() > 0){ - remark.append("洗手护士:"); - remark.append(StringUtils.join(washHandNurseSet, ",")).append(";"); + remarks.add("洗手护士:" + StringUtils.join(washHandNurseSet, ",")); } if(circuitNurseSet.size() > 0){ - remark.append("巡回护士:"); - remark.append(StringUtils.join(circuitNurseSet, ",")); + remarks.add("巡回护士:" + StringUtils.join(circuitNurseSet, ",")); } if(patientNameSet.size() > 0){ - remark.append("病人:"); - remark.append(StringUtils.join(patientNameSet, ",")); + remarks.add("病人:" + StringUtils.join(patientNameSet, ",")); } + if(remarks.size() > 0){ + remark.append(StringUtils.join(remarks, ";")); + } } // 新建申请单 mintRecyclingApplication(config.getAutoMergeApplication(),