Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r30326 -r30625 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 30326) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 30625) @@ -3324,18 +3324,32 @@ firstUseRecord = useRecordList.get(0); firstUseRecordId = firstUseRecord.getId(); for (UseRecord tempUseRecord : useRecordList) { - if(StringUtils.isNotBlank(hospitalNumbers)){ - hospitalNumbers += ","; + //使用记录的住院号 + String tempHospitalNum = tempUseRecord.getHospitalNum(); + if(StringUtils.isNotBlank(tempHospitalNum)){ + if(StringUtils.isNotBlank(hospitalNumbers)){ + hospitalNumbers += ","; + } + hospitalNumbers += tempHospitalNum; } - hospitalNumbers += tempUseRecord.getHospitalNum(); - if(StringUtils.isNotBlank(treatmentNums)){ - treatmentNums += ","; + + //使用记录的诊疗号 + String tempTreatmentNum = tempUseRecord.getTreatmentNum(); + if(StringUtils.isNotBlank(tempTreatmentNum)){ + if(StringUtils.isNotBlank(treatmentNums)){ + treatmentNums += ","; + } + treatmentNums += tempTreatmentNum; } - treatmentNums += tempUseRecord.getTreatmentNum(); - if(StringUtils.isNotBlank(patientNames)){ - patientNames += ","; + + //使用记录的病人名称 + String tempPatientName = tempUseRecord.getPatientName(); + if(StringUtils.isNotBlank(tempPatientName)){ + if(StringUtils.isNotBlank(patientNames)){ + patientNames += ","; + } + patientNames += tempPatientName; } - patientNames += tempUseRecord.getPatientName(); } }