Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js =================================================================== diff -u -r16274 -r16347 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 16274) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 16347) @@ -571,7 +571,7 @@ labelWidth : 80, items:[{ xtype : 'combo', - fieldLabel : '生物监测显示', + fieldLabel : '生物监测的结果默认显示值', allowBlank : false, name : 'biologicalMonitoringDisplay', id : 'biologicalMonitoringDisplay', @@ -593,12 +593,26 @@ columnWidth: 0.5, items:[{ xtype : 'numberfield', + allowNegative : false, //不允许负数 allowDecimals : false, - fieldLabel : '生物监测时间(分钟)', + fieldLabel : '生物监测持续时间(分钟)', id : 'biologicalMonitoringTime', name : 'biologicalMonitoringTime', anchor : '95%' }] + },{ + layout:'form', + labelWidth : 80, + columnWidth: 0.5, + items:[{ + xtype : 'numberfield', + allowNegative : false, //不允许负数 + allowDecimals : false, + fieldLabel : '灭菌与生物监测间隔时间(分钟)', + id : 'lagTime', + name : 'lagTime', + anchor : '95%' + }] }] }, { columnWidth : 0.4, @@ -750,18 +764,6 @@ method : 'GET', waitMsg : '正在加载数据，请稍候', success : function(form, action) { - var sterilizer = action.result.data; - var biologicalMonitoringDisplay = sterilizer.biologicalMonitoringDisplay; - var biologicalMonitoringTime = sterilizer.biologicalMonitoringTime; - - top.Ext.getCmp('biologicalMonitoringDisplay').setValue(biologicalMonitoringDisplay?biologicalMonitoringDisplay:'无'); //处理旧数据的null - if (biologicalMonitoringTime == 0) { - top.Ext.getCmp('biologicalMonitoringTime').setValue(0); - } else { //处理旧数据的null - top.Ext.getCmp('biologicalMonitoringTime').setValue(biologicalMonitoringTime?biologicalMonitoringTime:190); - } - - if(id != 0){ configStore.loadData(Ext.util.JSON.decode(action.result.sterilisationJsonData)); consumableStore.loadData(Ext.util.JSON.decode(action.result.consumptiveJsonData)); @@ -782,8 +784,6 @@ top.Ext.getCmp('isEveryDayReset').setValue('是'); top.Ext.getCmp('isCheckSterilizationTime').setValue('否'); top.Ext.getCmp('isAutoCompleteSterilization').setValue('是'); - top.Ext.getCmp('biologicalMonitoringDisplay').setValue('无'); - top.Ext.getCmp('biologicalMonitoringTime').setValue(190); } @@ -808,6 +808,33 @@ } } +function checkBiologicalMonitoringParameter() { + var biologicalMonitoringTime = top.Ext.getCmp('biologicalMonitoringTime').getValue(); + var lagTime = top.Ext.getCmp('lagTime').getValue(); + + if (biologicalMonitoringTime === 0) { + if (lagTime || lagTime === 0) { + return true; + } else { + return false; + } + } else { //过滤掉biologicalMonitoringTime为0的情况 + if (biologicalMonitoringTime) { + if (lagTime || lagTime === 0) { + return true; + } else { + return false; + } + } else { + if (lagTime || lagTime === 0) { + return false; + } else { + return true; + } + } + } +} + function validateAndSubmit(print){ Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!validate.do', @@ -858,6 +885,12 @@ this.enable(); return false; } + if (!checkBiologicalMonitoringParameter()) { + showResult('灭菌与生物监测间隔时间与生物监测持续时间，全为空或者全填写！'); + this.enable(); + return false; + } + var print = false; validateAndSubmit(print); } @@ -868,6 +901,11 @@ this.enable(); return false; } + if (!checkBiologicalMonitoringParameter()) { + showResult('灭菌与生物监测间隔时间与生物监测持续时间，全为空或者全填写！'); + this.enable(); + return false; + } var print = true; validateAndSubmit(print); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java =================================================================== diff -u -r16274 -r16347 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 16274) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilizer/Sterilizer.java (.../Sterilizer.java) (revision 16347) @@ -107,8 +107,13 @@ public static Map ColumnNameAndPoPropertyNameMap = new LinkedHashMap(); /** - * 生物监测的默认时间(单位：分钟)默认190分钟 + * 灭菌与生物监测间隔时间(单位：分钟)默认190分钟 */ + private Integer lagTime; + + /** + * 生物监测持续时间(单位：分钟) + */ private Integer biologicalMonitoringTime; /** @@ -389,4 +394,12 @@ public void setBiologicalMonitoringDisplay(String biologicalMonitoringDisplay) { this.biologicalMonitoringDisplay = biologicalMonitoringDisplay; } + + public Integer getLagTime() { + return lagTime; + } + + public void setLagTime(Integer lagTime) { + this.lagTime = lagTime; + } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r16291 -r16347 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16291) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16347) @@ -320,6 +320,35 @@ String orgUnitCode,String finishOperater,String finishComfirmer){ return completeSterilization(sterilizationRecordIds,orgUnitCode,finishOperater,finishComfirmer,false); } + + /** + * 检查此灭菌记录是否有植入物，有则返回true，否则返回false + * @param sterilizationRecord + * @return + */ + private boolean checkIncludeImplant(SterilizationRecord sterilizationRecord) { + + Collection allTousseInstances = CollectionUtils.emptyCollection(); //所有器械包，包括直接隶属的器械包和在篮筐里的器械包 + + allTousseInstances = CollectionUtils + .union(allTousseInstances, sterilizationRecord.getTousseInstanceList()); + + List reviewedBasketList = sterilizationRecord.getReviewedBaskets(); + for (ReviewedBasket reviewedBasket : reviewedBasketList) { + allTousseInstances = CollectionUtils + .union(allTousseInstances, reviewedBasket.getTousseInstances(objectDao)); + } + + for (TousseInstance tousseInstance : allTousseInstances) { + TousseDefinition td = tousseInstance.getTousseDefinition(); + if (td.getIncludeImplant() == 0) { //包含植入物 + return true; + } + } + return false; + + } + @Override public JSONObject completeSterilization(Collection sterilizationRecordIds, String orgUnitCode,String finishOperater,String finishComfirmer,boolean needFinishConfirm) { @@ -461,7 +490,36 @@ sterilizationRecord.setStatus(SterilizationRecord.STERILIZATION_STATUS_END); sterilizationRecord.setPhysicsResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); sterilizationRecord.setChemistryResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); -// sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); + + String biologicalMonitoringDisplay = sterilizer.getBiologicalMonitoringDisplay(); //生物监测的默认显示值 + Integer biologicalMonitoringTime = sterilizer.getBiologicalMonitoringTime(); //生物监测持续时间 + Integer lagTime = sterilizer.getLagTime(); //灭菌与生物监测间隔时间 + + if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_OTHER.equals(biologicalMonitoringDisplay)) { + if (checkIncludeImplant(sterilizationRecord)) { //此灭菌记录包含植入物 + biologicalMonitoringDisplay = SterilizationRecord.MONITOR_RESULT_QUALIFIED; + } else { + biologicalMonitoringDisplay = SterilizationRecord.MONITOR_RESULT_NO; + } + } + + if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_NOTHING.equals(biologicalMonitoringDisplay)) { + sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_NO); + } else if (Sterilizer.BIOLOGICALMONITORINGDISPLAY_QUALIFIED.equals(biologicalMonitoringDisplay)) { + sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED); + if (biologicalMonitoringTime != null && lagTime != null) { + Date endDate = sterilizationRecord.getEndDate(); + if (endDate != null) { + long endDateTime = endDate.getTime(); + long biologicalMonitoringStartDate = endDateTime + lagTime*60*1000; + long biologicalMonitoringEndDate = biologicalMonitoringStartDate + biologicalMonitoringTime*60*1000; + sterilizationRecord.setBiologicalMonitoringStartDate(new Date(biologicalMonitoringStartDate)); + sterilizationRecord.setBiologicalMonitoringEndDate(new Date(biologicalMonitoringEndDate)); + sterilizationRecord.setMonitorUser(sterilizationRecord.getFinishOperater()); //生物监测员默认取，灭菌完成操作人 + } + } + } + // 灭菌记录的的温度压力数据条数 int count = getSterilerRecordsCount(sterilizer.getDeviceInterfaceId(), sterilizer.getMachineNumber(), Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r16274 -r16347 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 16274) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 16347) @@ -172,11 +172,6 @@ */ private Integer reviewedBasketAmount; - /** - * 本炉次灭菌的所有器械包是否含有植入物,默认为"否"（这个属性不做会持久化） - */ - private String isIncludeImplan = Constants.STR_NO; - private SterilizerGrossRecord sterilizerGrossRecord; @Id @@ -581,13 +576,4 @@ this.srSituationComfirmTime = srSituationComfirmTime; } - @Transient - public String getIsIncludeImplan() { - return isIncludeImplan; - } - - public void setIsIncludeImplan(String isIncludeImplan) { - this.isIncludeImplan = isIncludeImplan; - } - } Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r16320 -r16347 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16320) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16347) @@ -15,7 +15,7 @@ var USER = "用户"; var POSITION = "位置"; -var _biologicalMonitoringTime = 0; //此灭菌炉的生物监测的默认时间 +var _biologicalMonitoringTime = 0; //此灭菌炉的生物监测持续时间 //定义首篮筐的label变量 var beginBarcodeLabel = '扫描条码'; @@ -2096,6 +2096,7 @@ items : [{ columnWidth : 0.5, layout : 'form', + labelWidth : 120, items : [{ xtype : 'combo', fieldLabel : "物理监测结果", @@ -2113,6 +2114,7 @@ },{ columnWidth : 0.5, layout : 'form', + labelWidth : 120, items : [{ xtype : 'combo', fieldLabel : "化学监测结果", @@ -2128,8 +2130,9 @@ anchor : '100%' }] }, { - columnWidth : 0.5, + columnWidth : 1, layout : 'form', + labelWidth : 120, items : [{ xtype : 'combo', fieldLabel : "生物监测结果", @@ -2142,7 +2145,7 @@ name : "biologyResult", id : "biologyResult", allowBlank : false, - anchor : '100%' + anchor : '50%' }] }, { columnWidth : .5, @@ -2155,7 +2158,7 @@ id : 'biologicalMonitoringStartDate', name : 'biologicalMonitoringStartDate', editable : false, - readOnly : true, +// readOnly : true, altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', selectOnFocus :true, format : 'Y-m-d H:i', @@ -2171,19 +2174,6 @@ columnWidth : .5, layout : 'form', cls:'edit-5char-labelwidth', - items : [{ - xtype : 'textfield', - fieldLabel : "监测员", - name : "monitorUser", - id : "monitorUser", - readOnly : true, - anchor : '100%', - cls:'x-item-disabled' - }] - }, { - columnWidth : .5, - layout : 'form', - cls:'edit-5char-labelwidth', labelWidth : 120, items : [{ xtype : 'datefieldWithMin', @@ -2193,27 +2183,76 @@ editable : false, altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', selectOnFocus :true, - readOnly : true, +// readOnly : true, format : 'Y-m-d H:i', anchor : '100%' }] }, { columnWidth : .5, layout : 'form', + labelWidth : 120, cls:'edit-5char-labelwidth', items : [{ xtype : 'textfield', + fieldLabel : "监测员条码", + name : "monitorUserBarcode", + id : "monitorUserBarcode", + anchor : '100%', + listeners : { + specialkey : function(thiz, e){ + if(e.getKey() == 13){ + var peopleOfBarcode = thiz.getValue(); + if(peopleOfBarcode){ + UserTableManager.getUserByBarcode(peopleOfBarcode, function(responseText){ + top.Ext.getCmp('monitorUserBarcode').setValue(); + if(responseText != null && responseText != ""){ + var result = Ext.decode(responseText); + if(!result.success){ + result.isNotSameOrgUnit?showResult("不允许登记非本科室人员，请扫描本科室人员条码"):showResult("输入的条码有误！"); + return; + } + top.Ext.getCmp('monitorUser').setValue(result.fullName); + }else{ + showResult('找不到该条码所对应的人员信息'); + } + }); + } + } + } + } + }] + }, { + columnWidth : .5, + labelWidth : 120, + layout : 'form', + cls:'edit-5char-labelwidth', + items : [{ + xtype : 'textfield', + fieldLabel : "监测员", + name : "monitorUser", + id : "monitorUser", + readOnly : true, + anchor : '100%', + cls:'x-item-disabled' + }] + }, { + columnWidth : .5, + layout : 'form', + labelWidth : 120, + cls:'edit-5char-labelwidth', + items : [{ + xtype : 'textfield', fieldLabel : "监测核对员条码", - name : "monitorCheckerCode", - id : "monitorCheckerCode", + name : "monitorCheckerBarcode", + id : "monitorCheckerBarcode", anchor : '100%', listeners : { specialkey : function(thiz, e){ if(e.getKey() == 13){ var peopleOfBarcode = thiz.getValue(); if(peopleOfBarcode){ UserTableManager.getUserByBarcode(peopleOfBarcode, function(responseText){ - top.Ext.getCmp('monitorCheckerCode').setValue(); + top.Ext.getCmp('monitorCheckerBarcode').setValue(); if(responseText != null && responseText != ""){ var result = Ext.decode(responseText); if(!result.success){ @@ -2233,6 +2272,7 @@ }, { columnWidth : .5, layout : 'form', + labelWidth : 120, cls:'edit-5char-labelwidth', items : [{ xtype : 'textfield', @@ -2468,7 +2508,7 @@ top.Ext.getCmp('biologicalMonitoringStartDate').disable(); top.Ext.getCmp('biologicalMonitoringEndDate').disable(); - top.Ext.getCmp('monitorCheckerCode').disable(); + top.Ext.getCmp('monitorCheckerBarcode').disable(); top.Ext.getCmp('monitorChecker').disable(); top.Ext.getCmp('monitorUser').disable(); @@ -2487,36 +2527,12 @@ } }else{ //灭菌完成 灭菌失败 灭菌中断 var sterilizationRecord = action.result.data; //此灭菌记录对象 + _biologicalMonitoringTime = sterilizationRecord.sterilizer.biologicalMonitoringTime*60*1000; //此灭菌炉的生物监测持续时间 var biologicalMonitoringStartDate = sterilizationRecord.biologicalMonitoringStartDate; //生物监测的开始时间 + var biologicalMonitoringEndDate = sterilizationRecord.biologicalMonitoringEndDate; //生物监测的结束时间 - if (biologicalMonitoringStartDate) { //已经添加过生物监测 - top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(biologicalMonitoringStartDate)); //设置生物监测的开始时间 - top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(action.result.data.biologicalMonitoringEndDate)); //设置生物监测的结束时间 - } else { //还有没添加过生物监测的 - var isIncludeImplan = sterilizationRecord.isIncludeImplan; //此灭菌记录是否有植入物 - var sterilizer = sterilizationRecord.sterilizer; //此灭菌炉对象 - - var biologicalMonitoringDisplay = sterilizer.biologicalMonitoringDisplay; //此灭菌炉的生物监测的默认显示值 - _biologicalMonitoringTime = sterilizer.biologicalMonitoringTime; //此灭菌炉的生物监测的默认时间 - if (_biologicalMonitoringTime == 0) { - _biologicalMonitoringTime = 0; - } else { - _biologicalMonitoringTime = (_biologicalMonitoringTime ? _biologicalMonitoringTime : 190); //要考虑升级脚本 - } - _biologicalMonitoringTime = _biologicalMonitoringTime*60*1000; - - if (biologicalMonitoringDisplay == '有植入物为合格否则为无') { - biologicalMonitoringDisplay = (isIncludeImplan == '是') ? '合格' : '无'; - } - top.Ext.getCmp('biologyResult').setValue(biologicalMonitoringDisplay); - - if (biologicalMonitoringDisplay == '合格') { - top.Ext.getCmp('biologicalMonitoringStartDate').setValue(top.Ext.getCmp('endDate').getValue()); - var temp = top.Ext.getCmp('biologicalMonitoringStartDate').getValue().getTime() + _biologicalMonitoringTime; - top.Ext.getCmp('biologicalMonitoringEndDate').setValue(new Date(temp)); - } - top.Ext.getCmp('monitorUser').setValue(userName); - } + top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(biologicalMonitoringStartDate)); + top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(biologicalMonitoringEndDate)); top.Ext.getCmp('monitorBtn').show(); top.Ext.getCmp('saveBtn').hide(); @@ -2595,11 +2611,6 @@ showResult('请正确填写表单各值'); return false; } - var monitorChecker = top.Ext.getCmp('monitorChecker').getValue(); - if (!monitorChecker && top.Ext.getCmp('biologyResult').getValue() != '无') { //如果生物监测结果是无也可以让他保存 - showResult('请扫描监测核对员条码'); - return false; - } var id =top.Ext.getCmp('id').getValue(); var physicsResult =top.Ext.getCmp('physicsResult').getValue(); @@ -2611,7 +2622,14 @@ var biologicalMonitoringStartDateString = Ext.util.Format.date(top.Ext.getCmp('biologicalMonitoringStartDate').getValue(), 'Y-m-d H:i'); var biologicalMonitoringEndDateString = Ext.util.Format.date(top.Ext.getCmp('biologicalMonitoringEndDate').getValue(), 'Y-m-d H:i'); var monitorUser = top.Ext.getCmp('monitorUser').getValue(); + var monitorChecker = top.Ext.getCmp('monitorChecker').getValue(); + if (biologyResult != '无' && (!biologicalMonitoringStartDateString || !biologicalMonitoringEndDateString || !monitorUser || !monitorChecker)) { + showResult('生物监测开始时间，结束时间，监测员，监测核对员，都要填写！'); + return false; + } + + // 验证循环计数器是否已经存在，一个灭菌炉的一个循环次数应是唯一的。 { DWREngine.setAsync(false); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r16285 -r16347 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 16285) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 16347) @@ -324,36 +324,6 @@ } } - /** - * 检查此灭菌记录是否有植入物，（此方法仅供此类使用） - * @param sterilizationRecord - * @return - */ - private void checkIncludeImplant() { - - Collection allTousseInstances = org.apache.commons.collections4.CollectionUtils - .emptyCollection(); //所有器械包，包括直接隶属的器械包和在篮筐里的器械包 - - allTousseInstances = org.apache.commons.collections4.CollectionUtils - .union(allTousseInstances, sterilizationRecord.getTousseInstanceList()); - - List reviewedBasketList = sterilizationRecord.getReviewedBaskets(); - for (ReviewedBasket reviewedBasket : reviewedBasketList) { - allTousseInstances = org.apache.commons.collections4.CollectionUtils - .union(allTousseInstances, reviewedBasket.getTousseInstances(objectDao)); - } - - for (TousseInstance tousseInstance : allTousseInstances) { - TousseDefinition td = tousseInstance.getTousseDefinition(); - if (td.getIncludeImplant() == 0) { //包含植入物 - sterilizationRecord.setIsIncludeImplan(Constants.STR_YES); - return; - } - } - sterilizationRecord.setIsIncludeImplan(Constants.STR_NO); - - } - public void loadSterilizationRecord() { try { StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); @@ -373,7 +343,6 @@ if (sterilizationRecord.getId() != null) { //不是新加的记录 List reviewedBasketList = sterilizationRecord.getReviewedBaskets(); sterilizationRecord.setReviewedBasketAmount(reviewedBasketList.size()); //计算此灭菌记录的灭菌篮筐总数 - checkIncludeImplant(); } Map map = new HashMap(); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r16294 -r16347 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 16294) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 16347) @@ -317,20 +317,32 @@ if (StringUtils.isNotBlank(recordID)) { SterilizationRecord record = sterilizationRecordManager.getSterilizationRecordById(Long.valueOf(recordID)); if (record != null) { - try { - Date biologicalMonitoringStartDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringStartDateString); + + Date biologicalMonitoringStartDate = null; + Date biologicalMonitoringEndDate = null; + try { //生物监测开始时间 + biologicalMonitoringStartDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringStartDateString); record.setBiologicalMonitoringStartDate(biologicalMonitoringStartDate); - Date biologicalMonitoringEndDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDateString); - record.setBiologicalMonitoringEndDate(biologicalMonitoringEndDate); - record.setMonitorUser(monitorUser); //监测员 - record.setMonitorChecker(monitorChecker); //监测核对人 } catch (ParseException e) { - //输入的时间格式不对，就当没做生物监测 record.setBiologicalMonitoringStartDate(null); + } + try { //生物监测结束时间 + biologicalMonitoringEndDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDateString); + record.setBiologicalMonitoringEndDate(biologicalMonitoringEndDate); + } catch (ParseException e) { record.setBiologicalMonitoringEndDate(null); - record.setMonitorUser(""); //监测员 - record.setMonitorChecker(""); //监测核对人 } + + + if (SterilizationRecord.MONITOR_RESULT_NO.equals(biologyResult)) { + record.setMonitorUser(null); + record.setMonitorChecker(null); + } else { + record.setMonitorUser(monitorUser); + record.setMonitorChecker(monitorChecker); + } + + record.setPhysicsResult(physicsResult); record.setChemistryResult(chemistryResult); record.setBiologyResult(biologyResult);