Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r16748 -r16784 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16748) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16784) @@ -507,41 +507,45 @@ Integer lagTime = sterilizer.getLagTime(); //灭菌与生物监测间隔时间 Integer frequency = sterilizationRecord.getFrequency(); //炉次 - String[] biologicalMonitoringDisplayArray = biologicalMonitoringDisplay.split(";"); - String flag = SterilizationRecord.MONITOR_RESULT_NO; - for (String temp : biologicalMonitoringDisplayArray) { - if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_QUALIFIED.equals(temp)) { - flag = SterilizationRecord.MONITOR_RESULT_QUALIFIED; - } else if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_OTHER.equals(temp)) { - if (checkIncludeImplant(sterilizationRecord)) { //此灭菌记录包含植入物 + if (StringUtils.isNotBlank(biologicalMonitoringDisplay)) { + String[] biologicalMonitoringDisplayArray = biologicalMonitoringDisplay.split(";"); + String flag = SterilizationRecord.MONITOR_RESULT_NO; + for (String temp : biologicalMonitoringDisplayArray) { + if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_QUALIFIED.equals(temp)) { flag = SterilizationRecord.MONITOR_RESULT_QUALIFIED; - } else { - flag = SterilizationRecord.MONITOR_RESULT_NO; + } else if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_OTHER.equals(temp)) { + if (checkIncludeImplant(sterilizationRecord)) { //此灭菌记录包含植入物 + flag = SterilizationRecord.MONITOR_RESULT_QUALIFIED; + } else { + flag = SterilizationRecord.MONITOR_RESULT_NO; + } } } - } - - if (StringUtils.contains(biologicalMonitoringDisplay, Sterilizer.BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED) - && frequency == 1) { - flag = SterilizationRecord.MONITOR_RESULT_QUALIFIED; - } - - if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_NOTHING.equals(flag)) { - sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_NO); - } else if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_QUALIFIED.equals(flag)) { - sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); - if (biologicalMonitoringTime != null && lagTime != null) { - Date endDate = sterilizationRecord.getEndDate(); - if (endDate != null) { - long endDateTime = endDate.getTime(); - long biologicalMonitoringStartDate = endDateTime + lagTime*60*1000; - long biologicalMonitoringEndDate = biologicalMonitoringStartDate + biologicalMonitoringTime*60*1000; - sterilizationRecord.setBiologicalMonitoringStartDate(new Date(biologicalMonitoringStartDate)); - sterilizationRecord.setBiologicalMonitoringEndDate(new Date(biologicalMonitoringEndDate)); - sterilizationRecord.setBiologicalMonitoringStatus(SterilizationRecord.BIOLOGICALMONITORING_STATUS_BEGIN); //把生物监测的状态设置成进行中 - sterilizationRecord.setMonitorUser(sterilizationRecord.getFinishOperater()); //生物监测员默认取,灭菌完成操作人(cjr) + + if (StringUtils.contains(biologicalMonitoringDisplay, Sterilizer.BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED) + && frequency == 1) { + flag = SterilizationRecord.MONITOR_RESULT_QUALIFIED; + } + + if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_NOTHING.equals(flag)) { + sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_NO); + } else if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_QUALIFIED.equals(flag)) { + sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); + if (biologicalMonitoringTime != null && lagTime != null) { + Date endDate = sterilizationRecord.getEndDate(); + if (endDate != null) { + long endDateTime = endDate.getTime(); + long biologicalMonitoringStartDate = endDateTime + lagTime*60*1000; + long biologicalMonitoringEndDate = biologicalMonitoringStartDate + biologicalMonitoringTime*60*1000; + sterilizationRecord.setBiologicalMonitoringStartDate(new Date(biologicalMonitoringStartDate)); + sterilizationRecord.setBiologicalMonitoringEndDate(new Date(biologicalMonitoringEndDate)); + sterilizationRecord.setBiologicalMonitoringStatus(SterilizationRecord.BIOLOGICALMONITORING_STATUS_BEGIN); //把生物监测的状态设置成进行中 + sterilizationRecord.setMonitorUser(sterilizationRecord.getFinishOperater()); //生物监测员默认取,灭菌完成操作人(cjr) + } } } + } else { + sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_NO); } /////