Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java =================================================================== diff -u -r16347 -r16598 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 16347) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizationrecord/SterilizationRecord.java (.../SterilizationRecord.java) (revision 16598) @@ -158,6 +158,10 @@ */ private String monitorChecker; + /** + * 监测审核员(目前只有东莞中医院需要这个人) + */ + private String monitorAuditor; // 统计本炉次各种包总数 @@ -576,4 +580,12 @@ this.srSituationComfirmTime = srSituationComfirmTime; } + public String getMonitorAuditor() { + return monitorAuditor; + } + + public void setMonitorAuditor(String monitorAuditor) { + this.monitorAuditor = monitorAuditor; + } + } Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js =================================================================== diff -u -r16589 -r16598 --- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 16589) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 16598) @@ -109,5 +109,7 @@ // 是否显示辅助发货按钮 showAuxiliaryInvoiceBtn: true, // 待回收列表申请时间排序方式 - waitRecycleListApplyTimeSortDirection : "DESC" + waitRecycleListApplyTimeSortDirection : "DESC", + // 做生物监测时是否需要监测审核员 + needMonitorAuditor: true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r16571 -r16598 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16571) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16598) @@ -2280,6 +2280,7 @@ return; } top.Ext.getCmp('monitorChecker').setValue(result.fullName); + top.Ext.getCmp('monitorAuditorBarcode').focus(); }else{ showResult('找不到该条码所对应的人员信息'); } @@ -2303,6 +2304,56 @@ anchor : '100%', cls:'x-item-disabled' }] + }, { + columnWidth : .5, + layout : 'form', + labelWidth : 120, + cls:'edit-5char-labelwidth', + hidden : !sstsConfig.needMonitorAuditor, + items : [{ + xtype : 'textfield', + fieldLabel : "监测审核员条码", + name : "monitorAuditorBarcode", + id : "monitorAuditorBarcode", + 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('monitorAuditorBarcode').setValue(); + if(responseText != null && responseText != ""){ + var result = Ext.decode(responseText); + if(!result.success){ + result.isNotSameOrgUnit?showResult("不允许登记非本科室人员,请扫描本科室人员条码"):showResult("输入的条码有误!"); + return; + } + top.Ext.getCmp('monitorAuditor').setValue(result.fullName); + }else{ + showResult('找不到该条码所对应的人员信息'); + } + }); + } + } + } + } + }] + }, { + columnWidth : .5, + layout : 'form', + labelWidth : 120, + cls:'edit-5char-labelwidth', + hidden : !sstsConfig.needMonitorAuditor, + items : [{ + xtype : 'textfield', + fieldLabel : "监测审核员", + name : "monitorAuditor", + id : "monitorAuditor", + readOnly : true, + anchor : '100%', + cls:'x-item-disabled' + }] }] },{ xtype : "fieldset", @@ -2532,6 +2583,8 @@ top.Ext.getCmp('monitorChecker').disable(); top.Ext.getCmp('monitorUserBarcode').disable(); top.Ext.getCmp('monitorUser').disable(); + top.Ext.getCmp('monitorAuditorBarcode').disable(); + top.Ext.getCmp('monitorAuditor').disable(); if(action.result.data.status == statusFailure && reSterilization == false){ top.Ext.getCmp('monitorBtn').show(); @@ -2646,11 +2699,12 @@ var biologicalMonitoringEndDateString = Ext.util.Format.date(biologicalMonitoringEndDate, 'Y-m-d H:i'); var monitorUser = top.Ext.getCmp('monitorUser').getValue(); var monitorChecker = top.Ext.getCmp('monitorChecker').getValue(); + var monitorAuditor = top.Ext.getCmp('monitorAuditor').getValue(); var endDate = top.Ext.getCmp('endDate').getValue(); - if (sstsConfig.monitorCheckerMustFill) { //保存时,监测核对员也要填写 - if (biologyResult != '无' && (!biologicalMonitoringStartDateString || !biologicalMonitoringEndDateString || !monitorUser || !monitorChecker)) { - showResult('生物监测开始时间,结束时间,监测员,监测核对员,都要填写!'); + if (sstsConfig.monitorCheckerMustFill) { //保存时,监测核对员和监测审核员也要填写 + if (biologyResult != '无' && (!biologicalMonitoringStartDateString || !biologicalMonitoringEndDateString || !monitorUser || !monitorChecker || !monitorAuditor)) { + showResult('生物监测开始时间,结束时间,监测员,监测核对员,监测审核员,都要填写!'); return false; } } else { @@ -2701,7 +2755,7 @@ top.Ext.getCmp('cycleCounter').setValue(0); } } - SterilizationRecordTableManager.saveMonitorResult(id,physicsResult,chemistryResult,biologyResult,cycleCounter,biologicalMonitoringStartDateString,biologicalMonitoringEndDateString,monitorUser,monitorChecker,remark,function(result){ + SterilizationRecordTableManager.saveMonitorResult(id,physicsResult,chemistryResult,biologyResult,cycleCounter,biologicalMonitoringStartDateString,biologicalMonitoringEndDateString,monitorUser,monitorChecker,monitorAuditor,remark,function(result){ if(result){ sterilizationRecordWin.close(); showResult('保存成功'); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r16347 -r16598 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 16347) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 16598) @@ -312,7 +312,7 @@ public boolean saveMonitorResult(String recordID, String physicsResult, String chemistryResult, String biologyResult,long cycleCounter, String biologicalMonitoringStartDateString, String biologicalMonitoringEndDateString, - String monitorUser,String monitorChecker,String remark) { + String monitorUser,String monitorChecker,String monitorAuditor,String remark) { if (StringUtils.isNotBlank(recordID)) { SterilizationRecord record = sterilizationRecordManager.getSterilizationRecordById(Long.valueOf(recordID)); @@ -337,9 +337,11 @@ if (SterilizationRecord.MONITOR_RESULT_NO.equals(biologyResult)) { record.setMonitorUser(null); record.setMonitorChecker(null); + record.setMonitorAuditor(null); } else { record.setMonitorUser(monitorUser); record.setMonitorChecker(monitorChecker); + record.setMonitorAuditor(monitorAuditor); }