Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java =================================================================== diff -u -r30647 -r31135 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java (.../QualityMonitoringInstanceAction.java) (revision 30647) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java (.../QualityMonitoringInstanceAction.java) (revision 31135) @@ -102,6 +102,12 @@ boolean success = true; String message = "保存成功!"; try { + if(StringUtils.isNotBlank(map.get("configItemOptionSterFre"))){ + map.put("sterilizerFre", map.get("configItemOptionSterFre")); + } + if(StringUtils.isNotBlank(map.get("configItemOptionSterName"))){ + map.put("sterilizerName", map.get("configItemOptionSterName")); + } String ret = qualityMonitoringInstanceManager.save(qualityMonitoringInstance, map); if(!StringTools.isBlank(ret)){ message = ret; Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java =================================================================== diff -u -r30633 -r31135 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 30633) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java (.../QualityMonitoringInstanceManagerImpl.java) (revision 31135) @@ -522,8 +522,13 @@ TousseInstance ti = tousseInstanceManager.get(tousseInstanceId); if(ti != null){ qmInstance.setTousseInstance(ti); - qmInstance.setSterilizerName(ti.getSterilizerName()); - qmInstance.setSterilizerFrequency(ti.getSterileFrequency()); + // 录入定期监测记录时,页面上显示的炉次、炉号输入框要改为文本框,即既支持扫描器械包条码填写,也能让用户手工输入炉次炉号信息(DGZYY-179) + if(StringUtils.isBlank(qmInstance.getSterilizerName())){ + qmInstance.setSterilizerName(ti.getSterilizerName()); + } + if(StringUtils.isBlank(qmInstance.getSterilizerFrequency())){ + qmInstance.setSterilizerFrequency(ti.getSterileFrequency()); + } qmInstance.setTousseName(ti.getTousseDefinitionName()); if(StringUtils.isBlank(qmInstance.getSterilizationRecordId()) || "0".equals(qmInstance.getSterilizationRecordId())){ if(ti.getSterilizationRecord_id() != null){