Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r15509 -r15724 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 15509) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 15724) @@ -232,6 +232,7 @@ top.Ext.getCmp('remark').setValue(patientInfo.remark); top.Ext.getCmp('circuitNurse').setValue(patientInfo.circuitNurse); top.Ext.getCmp('washHandNurse').setValue(patientInfo.washHandNurse); + top.Ext.getCmp('specialInfection').setValue(patientInfo.specialInfection); } // 获取扫描的物品所有条码 @@ -1141,6 +1142,7 @@ }, { layout : 'form', columnWidth : 0.33, + hidden : sstsConfig.hideRoomNumber, items : [{ xtype : 'textfield', fieldLabel : '病室', Index: ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml =================================================================== diff -u -r15683 -r15724 --- ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml (.../FindPatientInfoByHospitalNumMapper.xml) (revision 15683) +++ ssts-web/src/main/resources/config/dgszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml (.../FindPatientInfoByHospitalNumMapper.xml) (revision 15724) @@ -14,11 +14,12 @@ h.sfzh as patientIDCard, i.[手术者] as doctorName, i.[手术名称] as operation, - i.[确定手术时间] as operationTime, + i.[拟定手术时间] as operationTime, i.[手术间] as opRoomId, i.[床位] as bedNumber, '' as roomNummber, - i.[科别] as patientArea + i.[科别] as ascriptionDepartment, + i.[有无特殊感染] as specialInfection from rydj h, [手术通知与安排] i where h.zyhcs = i.zyhcs Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r15699 -r15724 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 15699) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 15724) @@ -108,6 +108,7 @@ top.Ext4.getCmp('operationTime').setValue(patientInfo.operationTime); top.Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment); top.Ext4.getCmp('operationRoom').setValue(patientInfo.opRoomId); + top.Ext4.getCmp('ascriptionDepartment').setValue(patientInfo.ascriptionDepartment); } function getSupplierName(){ @@ -1244,6 +1245,7 @@ xtype : 'container', width : 730, layout : 'hbox', + hidden : sstsConfig.hideRoomNumber, flex : 1, items : [ { Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js =================================================================== diff -u -r15590 -r15724 --- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 15590) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/config.js (.../config.js) (revision 15724) @@ -35,6 +35,8 @@ useRecordWashHandNurseAllowBlank : true, // 隐藏使用记录的诊疗号域 hideTreatmentNumOfUseRecord : false, + //隐藏使用记录与外来器械申请单的病室域 + hideRoomNumber : true, // 使用记录审核方式, 1: 审核和转换按钮分开; 2:审核和转换按钮合并为1个 useRecordAuditMode : 2, // 隐藏申请科室