Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r31033 -r31080 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 31033) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 31080) @@ -6773,24 +6773,16 @@ if(StringUtils.equals(frequency, sterilizationFrequecyRemind.getFrequency().toString()) && !StringUtils.equals(sterilizationType, sterilizationFrequecyRemind.getSterilisation().getSterilisation())){ - String sql = String.format("select count(*) from %s where sterilizationType = '%s' and sterilizer_id= %s and frequency = %s and startDate " - + "between %s and %s ", - SterilizationRecord.class.getSimpleName(),sterilizationFrequecyRemind.getSterilisation().getSterilisation(), - sr.getId(), frequency, - dateQueryAdapter.dateAdapter(out_beginTime), - dateQueryAdapter.dateAdapter(out_endTime)); - if(objectDao.countBySql(sql) == 0){ - jsonObj = JSONUtil.buildJsonObject(false); - jsonObj.put("remindMode", sterilizationFrequecyRemind.getRemindMode()); - jsonObj.put("sterilisation", sterilizationFrequecyRemind.getSterilisation().getSterilisation()); - jsonObj.put("frequency", sterilizationFrequecyRemind.getFrequency()); - if(StringUtils.equals(sterilizationFrequecyRemind.getRemindMode(), SterilizationFrequecyRemind.REMINDMODE_MANDATORY)){ - jsonObj.put("confirmMessage", sterilizerName + "第" + frequency + "炉的灭菌程序必须是" + sterilizationFrequecyRemind.getSterilisation().getSterilisation() + "!"); - }else{ - jsonObj.put("confirmMessage", sterilizerName + "第" + frequency + "炉的灭菌程序必须是" + sterilizationFrequecyRemind.getSterilisation().getSterilisation() + ",不修改灭菌程序继续操作吗?"); - } - break; + jsonObj = JSONUtil.buildJsonObject(false); + jsonObj.put("remindMode", sterilizationFrequecyRemind.getRemindMode()); + jsonObj.put("sterilisation", sterilizationFrequecyRemind.getSterilisation().getSterilisation()); + jsonObj.put("frequency", sterilizationFrequecyRemind.getFrequency()); + if(StringUtils.equals(sterilizationFrequecyRemind.getRemindMode(), SterilizationFrequecyRemind.REMINDMODE_MANDATORY)){ + jsonObj.put("confirmMessage", sterilizerName + "第" + frequency + "炉的灭菌程序必须是" + sterilizationFrequecyRemind.getSterilisation().getSterilisation() + "!"); + }else{ + jsonObj.put("confirmMessage", sterilizerName + "第" + frequency + "炉的灭菌程序必须是" + sterilizationFrequecyRemind.getSterilisation().getSterilisation() + ",不修改灭菌程序继续操作吗?"); } + break; } } }