Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js =================================================================== diff -u -r23214 -r25191 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js (.../interfereRecordForm.js) (revision 23214) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereRecordForm.js (.../interfereRecordForm.js) (revision 25191) @@ -3179,10 +3179,13 @@ top.Ext.getCmp('srSituationComfirmer').setValue(sr.srSituationComfirmer); //加载条码放至全局数组中 - var fixedBarcodes = action.result.fixedBarcodes - var barcodes = action.result.barcodes - myFixedBarcodes = fixedBarcodes.split(",") - myBarcodes = barcodes.split(",") + var fixedBarcodes = action.result.fixedBarcodes; + var barcodes = action.result.barcodes; + myFixedBarcodes = fixedBarcodes.split(","); + myBarcodes = barcodes.split(","); + top.Ext.getCmp('biologicalObserveDate').setValue(formatDateYear(sr.biologicalObserveDate)); //生物监测的观察时间 + top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(sr.biologicalMonitoringStartDate)); //生物监测的开始时间 + top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(sr.biologicalMonitoringEndDate)); //生物监测的结束时间 } //判断是否无条件显示循环次数 Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r24123 -r25191 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 24123) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 25191) @@ -288,6 +288,24 @@ //判断是否从干预页面进入 if(StringUtils.isNotBlank(isInterfereStr)){ if(isInterfereStr.equals("true")){ + //除了开始时间外,干预保存时几个时间字段(结束时间、生物监测观察时间、生物监测开始时间、生物监测结束时间等)都要回传,否则会时分秒都会变成0 + String endDateString = StrutsParamUtils.getPraramValue("endDate", null); + String biologicalMonitoringStartDateString = StrutsParamUtils.getPraramValue("biologicalMonitoringStartDate", null); + String biologicalMonitoringEndDateString = StrutsParamUtils.getPraramValue("biologicalMonitoringEndDate", null); + String biologicalObserveDateString = StrutsParamUtils.getPraramValue("biologicalObserveDateString", null); + if(StringUtils.isNotBlank(endDateString)){ + sterilizationRecord.setEndDate(ForgonDateUtils.safelyParseDate(endDateString)); + } + if(StringUtils.isNotBlank(biologicalMonitoringStartDateString)){ + sterilizationRecord.setBiologicalMonitoringStartDate(ForgonDateUtils.safelyParseDate(biologicalMonitoringStartDateString)); + } + if(StringUtils.isNotBlank(biologicalMonitoringEndDateString)){ + sterilizationRecord.setBiologicalMonitoringEndDate(ForgonDateUtils.safelyParseDate(biologicalMonitoringEndDateString)); + } + if(StringUtils.isNotBlank(biologicalObserveDateString)){ + sterilizationRecord.setBiologicalObserveDate(ForgonDateUtils.safelyParseDate(biologicalObserveDateString)); + } + Map result =sterilizationRecordManager.updateSterilizationRecordInterfere( sterilizationRecord, tousseInstanceBarcodes, containerBarcodes, originalRecordId,barcodePositionMap);