Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r41239 -r41268 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41239) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41268) @@ -10575,9 +10575,7 @@ return true; } Sterilizer sterilizer = sterilizationRecord.getSterilizer(); - if(!Constants.STR_YES.equals(sterilizer.getAutoJudgmentResult()) - || sterilizer.getPressureEndRange() == null || sterilizer.getPressureStartRange() == null - || sterilizer.getTempEndRange() == null || sterilizer.getTempStartRange() == null){ + if(!Constants.STR_YES.equals(sterilizer.getAutoJudgmentResult())){ return true; } if(SterilizationRecord.STERILIZATIONPARATYPE_TYPE_GETINGE_COMMON.equals(sterilizationRecord.getSterilizationParaType())){ @@ -10613,22 +10611,22 @@ return false; } //压力不能大于最大值 - if (pressureEndRange.compareTo(p1Mbar) < 0) { + if (pressureEndRange != null && pressureEndRange.compareTo(p1Mbar) < 0) { //pressureEndRange < p1Mbar return false; } //压力不能小于最小值 - if (p1Mbar.compareTo(pressureStartRange) < 0) { + if (pressureStartRange != null && p1Mbar.compareTo(pressureStartRange) < 0) { //p1Mbar < pressureStartRange return false; } //温度不能大于最大值 - if (tempEndRange.compareTo(t1Temp) < 0) { + if (tempEndRange != null && tempEndRange.compareTo(t1Temp) < 0) { //tempEndRange < t1Temp return false; } //温度不能小于最小值 - if (t1Temp.compareTo(tempStartRange) < 0) { + if (tempStartRange !=null && t1Temp.compareTo(tempStartRange) < 0) { //tempEndRange < t1Temp return false; }