Index: ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/config.js =================================================================== diff -u -r30993 -r31639 --- ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/config.js (.../config.js) (revision 30993) +++ ssts-web/src/main/webapp/disinfectsystem/config/fsszyy/config.js (.../config.js) (revision 31639) @@ -183,6 +183,8 @@ enableInterfereApplyAmount:true, //器械包定义的大小下拉框选项配置 pageSizeArrayConfig:[['超大包'],['大包'],['中包'],['小包'],['特小包']], + //启用使用记录申请单的扩展名 + enableUseRecordFormExtensionFields:["手术状态"], //启用器械包积分统计功能 enableToussePointsStatistics:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r31619 -r31639 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 31619) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 31639) @@ -1726,6 +1726,9 @@ } var sexArray = [['男'],['女']]; + //手术状态 + var operationStatusArray = [[OPERATION_STATUS_PRE_OPERATION],[OPERATION_STATUS_BEGIN_OPERATION],[OPERATION_STATUS_IN_OPERATION],[OPERATION_STATUS_END_OPERATION]]; + var operationNameStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectsystem/basedatamanager/operationOrgAction!findOrgUnitOperationName.do', @@ -2600,6 +2603,29 @@ }), anchor : '96%' }] + },{ + layout : 'form', + labelWidth :70, + columnWidth :.33, + hidden : !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('手术状态')), + items : [{ + xtype : 'combo', + fieldLabel : '手术状态', + valueField : 'operationStatus', + displayField : 'operationStatus', + id : 'operationStatus', + name : 'operationStatus', + mode : 'local', + triggerAction : 'all', + forceSelection : true, + editable : true, + store : new Ext.data.SimpleStore( { + fields : [ 'operationStatus' ], + autoLoad : true, + data : operationStatusArray + }), + anchor : '96%' + }] }, { layout : 'form', columnWidth : 1, Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp =================================================================== diff -u -r30411 -r31639 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 30411) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 31639) @@ -216,6 +216,29 @@ //httpOption的optionListId:丢失报损备注 var errorDamageRemark = '<%=HttpOption.SYSTEMSETTING_ERROR_DAMAGE_REMARK %>'; +/** + * 手术状态(佛山市第二人民医院手术状态) + */ +//入手术室 + var OPERATION_STATUS_IN_OPERATIONROOM = '<%=UseRecord.OPERATION_STATUS_IN_OPERATIONROOM %>'; +//麻醉开始 + var OPERATION_STATUS_BEGIN_ANESTHESIA = '<%=UseRecord.OPERATION_STATUS_BEGIN_ANESTHESIA %>'; +//麻醉操作完成 + var OPERATION_STATUS_FINISH_ANESTHESIA = '<%=UseRecord.OPERATION_STATUS_FINISH_ANESTHESIA %>'; +//麻醉结束 + var OPERATION_STATUS_END_ANESTHESIA = '<%=UseRecord.OPERATION_STATUS_END_ANESTHESIA %>'; +//出手术室 + var OPERATION_STATUS_OUT_OPERATIONROOM = '<%=UseRecord.OPERATION_STATUS_OUT_OPERATIONROOM %>'; + +//手术状态:准备手术 + var OPERATION_STATUS_PRE_OPERATION = '<%=UseRecord.OPERATION_STATUS_PRE_OPERATION %>'; +//手术状态:手术开始 + var OPERATION_STATUS_BEGIN_OPERATION = '<%=UseRecord.OPERATION_STATUS_BEGIN_OPERATION %>'; +//手术状态:手术中 + var OPERATION_STATUS_IN_OPERATION = '<%=UseRecord.OPERATION_STATUS_IN_OPERATION %>'; +//手术状态:手术结束 + var OPERATION_STATUS_END_OPERATION = '<%=UseRecord.OPERATION_STATUS_END_OPERATION %>'; + enableEditBtn = true;