Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java =================================================================== diff -u -r41393 -r41443 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 41393) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 41443) @@ -215,8 +215,11 @@ * 生物监测的默认值 */ private String biologicalMonitoringDisplay; - /** + * 管腔化学PCD监测结果默认值 + */ + private String luminalChemistryPcdDefault; + /** * 序号 */ public Integer sequence; @@ -872,4 +875,12 @@ this.pressureEndRange = pressureEndRange; } + public String getLuminalChemistryPcdDefault() { + return luminalChemistryPcdDefault; + } + + public void setLuminalChemistryPcdDefault(String luminalChemistryPcdDefault) { + this.luminalChemistryPcdDefault = luminalChemistryPcdDefault; + } + } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r41361 -r41443 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41361) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41443) @@ -803,16 +803,18 @@ Integer frequency = sterilizationRecord.getFrequency(); //炉次 String biologicalMonitoringDisplay = sterilizer.getBiologicalMonitoringDisplay(); //生物监测的默认值 Integer biologicalMonitoringTime = sterilizer.getBiologicalMonitoringTime(); //生物监测持续时间 - + String luminalChemistryPcdDefault = sterilizer.getLuminalChemistryPcdDefault(); //生物监测的默认值 + boolean isFirst = false;//HBSXKYY-49 灭菌炉设置里隔天重置炉次的值为“否”,生物监测的结果默认值勾上了每天第一炉合格,每天的第一炉对应的灭菌记录的生物监测结果可以自动赋值为合格。 + if (StringUtils.isNotBlank(biologicalMonitoringDisplay) || StringUtils.isNotBlank(luminalChemistryPcdDefault)){ + if(frequency == 1){ + isFirst = true; + }else if(!Constants.STR_YES.equals(sterilizer.getIsEveryDayReset())){ + isFirst = firstSterilizerPerDay(sterilizationRecord.getId(), sterilizer.getId(), startDate, sterilizationRecord.getStartDate()); + } + } if (StringUtils.isNotBlank(biologicalMonitoringDisplay)) { String flag = SterilizationRecord.MONITOR_RESULT_NO; biologicalMonitoringDisplay = String.format(";%s;", biologicalMonitoringDisplay); - boolean isFirst = false;//HBSXKYY-49 灭菌炉设置里隔天重置炉次的值为“否”,生物监测的结果默认值勾上了每天第一炉合格,每天的第一炉对应的灭菌记录的生物监测结果可以自动赋值为合格。 - if(frequency == 1){ - isFirst = true; - }else if(!Constants.STR_YES.equals(sterilizer.getIsEveryDayReset())){ - isFirst = firstSterilizerPerDay(sterilizationRecord.getId(), sterilizer.getId(), startDate, sterilizationRecord.getStartDate()); - } if ((StringUtils.contains(biologicalMonitoringDisplay, String.format(";%s;", Sterilizer.BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED)) && isFirst) || (StringUtils.contains(biologicalMonitoringDisplay, String.format(";%s;", Sterilizer.BIOLOGICALMONITORINGDISPLAY_IMPLANT_QUALIFIED)) @@ -843,6 +845,21 @@ } else{ sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_NO); } + if(StringUtils.isNotBlank(luminalChemistryPcdDefault)){ + String flag = SterilizationRecord.MONITOR_RESULT_NO; + luminalChemistryPcdDefault = String.format(";%s;", luminalChemistryPcdDefault); + if ((StringUtils.contains(luminalChemistryPcdDefault, String.format(";%s;", Sterilizer.BIOLOGICALMONITORINGDISPLAY_FIRSTQUALIFIED)) + && isFirst) + ||(StringUtils.contains(luminalChemistryPcdDefault, String.format(";%s;", Sterilizer.BIOLOGICALMONITORINGDISPLAY_QUALIFIED)))) { + flag = SterilizationRecord.MONITOR_RESULT_QUALIFIED; + } + + if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_NOTHING.equals(flag)) { + sterilizationRecord.setPcdMonitoringResult(SterilizationRecord.MONITOR_RESULT_NO); + } else if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_QUALIFIED.equals(flag)) { + sterilizationRecord.setPcdMonitoringResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); + } + } } @Override public JSONObject completeSterilizationCommon( Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java =================================================================== diff -u -r41361 -r41443 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 41361) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 41443) @@ -189,6 +189,9 @@ if(sterilizer.getIsDoubleCheckOfSterilization() == null || "".equals(sterilizer.getIsDoubleCheckOfSterilization().trim())){ sterilizer.setIsDoubleCheckOfSterilization(Constants.STR_NO); } + if(sterilizer.getLuminalChemistryPcdDefault() != null && StringUtils.EMPTY.equals(sterilizer.getLuminalChemistryPcdDefault().trim())){ + sterilizer.setLuminalChemistryPcdDefault(null);//避免保存空字符串 + } sterilizerManager.saveSterilizer(sterilizer, cleanMethodIDs, consumablesStr, detectionItemsStr, extraInfo, sterilizationFrequecyReminds); JSONUtil.addProperty(outputJson, "barcode", extraInfo.get(0));