Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js =================================================================== diff -u -r15659 -r15880 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 15659) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 15880) @@ -325,7 +325,12 @@ var departCodingStr = grid.getSelectionModel() .getSelections()[0].data.departCoding; - top.Ext.MessageBox.confirm("请确认","是否确定要将选中的" + entityName + "信息生成申请单?", + var confirmMessage = "是否确定要将选中的" + entityName + "信息生成申请单?"; + if(sstsConfig.auditAndConvertUseRecordConfirmMessage){ + confirmMessage = "手术是否已完成,不需要追加器械包?"; + } + + top.Ext.MessageBox.confirm("请确认",confirmMessage, function(button, text) { if ("yes" == button) { convertUseRecordToApplication(null, ids, operatorStr, departStr, departCodingStr, null); Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js =================================================================== diff -u -r15724 -r15880 --- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 15724) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 15880) @@ -35,6 +35,8 @@ useRecordWashHandNurseAllowBlank : true, // 隐藏使用记录的诊疗号域 hideTreatmentNumOfUseRecord : false, + //隐藏外来器械申请单的病区域 + hidePatientArea : true, //隐藏使用记录与外来器械申请单的病室域 hideRoomNumber : true, // 使用记录审核方式, 1: 审核和转换按钮分开; 2:审核和转换按钮合并为1个 @@ -73,7 +75,9 @@ //触摸屏清洗默认清洗程序条码 defaultDisinfectProgramBarcode : "", //保存使用记录是否需要提示"请点击"审核并生成申请单"按钮,否则无法发送供应室"字样,为true时才给予提示,没配或者为false则不提示 - saveUseRecordPrompt : true, + saveUseRecordPrompt : false, + //使用记录点击审核并生成申请时是否需要提示"手术是否已完成,不需要追加器械包?"字样,为true时才给予提示,没配或者为false则不提示 + auditAndConvertUseRecordConfirmMessage : true, //生物检测是否要提示,为true表示要提示,为false或者没有配置,都不提示 biologicalMonitoringEnable : true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r15811 -r15880 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 15811) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 15880) @@ -1219,7 +1219,7 @@ } } }, - flex : 1 + flex : (sstsConfig.hidePatientArea ? 0.5 : 1) },{ xtype : 'textfield', fieldLabel : '诊疗号', @@ -1245,6 +1245,7 @@ id : 'patientArea', name : 'patientArea', allowBlank : true, + hidden : sstsConfig.hidePatientArea, flex : 1 } ]