Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r29472 -r29507 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29472) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29507) @@ -5937,7 +5937,7 @@ SterilizationRecord.class.getSimpleName(), sterilizer.getId()); List sterilizationRecords = objectDao.findByHql(hql, 0, 1); if(CollectionUtils.isEmpty(sterilizationRecords)){ - return false; + return true; } SterilizationRecord sterilizationRecord = sterilizationRecords.get(0); //灭菌炉最后一次做生物监测的结束时间 Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r29472 -r29507 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 29472) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 29507) @@ -84,6 +84,7 @@ import com.forgon.tools.json.JSONUtil; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.string.StringTools; +import com.forgon.tools.util.ConfigUtils; import com.forgon.tools.util.FileUtils; import com.forgon.tools.util.ForgonDateUtils; import com.forgon.tools.util.SqlUtils; @@ -2081,15 +2082,29 @@ /** * 扫描或者通过下拉框选择灭菌炉时进行提醒(DGSDBZXYY-61) - * 如果超时未做,则进行相同的提示:“【1号灭菌器】已超过6天未做生物监测,请做生物监测!” + * 1、如果超时未做,则进行相同的提示:“【1号灭菌器】已超过6天未做生物监测,请做生物监测!” + * 2、启用扫描灭菌监测包,enableScanSterilizationMonitoringPackage,如果设置为了true + * 则保存灭菌记录时,如果检查到超过了生物监测间隔时间,则提示:“【1号灭菌器】已超过6天未做生物监测,请扫描生物监测包条码!” + * @param sterilizerName 灭菌炉名称不允许重名 + * @param isSave 是否保存灭菌记录 */ public void sterilizerBioMonitoringIntervalReminder(){ - String sterilizerId = StrutsParamUtils.getPraramValue("sterilizerId", null); + String sterilizerName = StrutsParamUtils.getPraramValue("sterilizerName", null); + boolean isSave = StrutsParamUtils.getBoolPraramValue("isSave", false); String message = ""; - if(StringUtils.isNotBlank(sterilizerId)){ - Sterilizer sterilizer = (Sterilizer) objectDao.getById(Sterilizer.class.getSimpleName(), sterilizerId); - if(sterilizationRecordManager.sterilizerBioMonitoringIntervalReminder(sterilizer)){ - message = "【" + sterilizer.getName() + "】已超过" + sterilizer.getBioMonitoringInterval() + "天未做生物监测,请做生物监测!"; + if(StringUtils.isNotBlank(sterilizerName)){ + @SuppressWarnings("unchecked") + List sterilizers = objectDao.findByProperty(Sterilizer.class.getSimpleName(), "name", sterilizerName); + if(CollectionUtils.isNotEmpty(sterilizers)){ + Sterilizer sterilizer = sterilizers.get(0); + if(sterilizationRecordManager.sterilizerBioMonitoringIntervalReminder(sterilizer)){ + String result = "请做生物监测!"; + boolean enableScanSterilizationMonitoringPackage = ConfigUtils.getSystemSetConfigByNameBool("enableScanSterilizationMonitoringPackage", false); + if(enableScanSterilizationMonitoringPackage && isSave){ + result = "请扫描生物监测包条码!"; + } + message = "【" + sterilizer.getName() + "】已超过" + sterilizer.getBioMonitoringInterval() + "天未做生物监测," + result; + } } } StrutsResponseUtils.output(true, message);