Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationForm.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationForm.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationForm.js (revision 40728) @@ -0,0 +1,426 @@ +var configWin; +var patientAreaWin; +var formPanel; +var patientAreaListStore; + +//保存病区 +function savePatientArea() { + var idArr = []; + var valueArr = []; + + for (var i = 0; i < patientAreaListStore.getCount(); i++) { + var record = patientAreaListStore.getAt(i); + idArr[i] = record.get('id'); + valueArr[i] = record.get('value'); + } + + if (idArr.length !== 0 && valueArr.length !== 0) { + var ids = idArr.join(';'); + var values = valueArr.join(';') + top.Ext4.getCmp("patientAreaHttpOptionIds").setValue(ids); + top.Ext4.getCmp("patientAreaHttpOptionNames").setValue(values); + } + patientAreaWin.close(); +} + +//删除病区 +function removePatientAreaItem(id) { + for (var i = 0; i < patientAreaListStore.getCount(); i++) { + var item = patientAreaListStore.data.items[i]; + if (item.data.id == id) { + patientAreaListStore.remove(item) + } + } +} + +//判断病区是否存在 +function isPatientAreaRepeat(id) { + for (var i = 0; i < patientAreaListStore.getCount(); i++) { + var record = patientAreaListStore.getAt(i); + var nid = record.get('id'); + if (nid == id) { + return true; + } + } + return false; +} + +//添加病区 +function addPatientAreaItem(id, value) { + if (id == null || id == '') { + showResult('请选择病区！'); + return false; + } + var b = isPatientAreaRepeat(id); + if (b) { + showResult('病区：[' + value + '] 已存在！'); + top.Ext4.getCmp('patientArea').setValue(""); + return false; + } + var record = { + id: id, + value: value + }; + patientAreaListStore.add(record) + top.Ext4.getCmp("patientArea").setValue(""); +} + +function openSelectPatientArea(patientAreaHttpOptionIds, patientAreaHttpOptionNames) { + var patientAreaStore = new top.Ext4.data.Store({ + proxy: { + type: 'ajax', + url: WWWROOT + '/disinfectSystem/core/httpOptionController/getHttpOptionList.mhtml?optionListId=patientArea', + reader: { + type: 'json', + root: 'data' + } + }, + fields: [ + { name: 'id' }, + { name: 'value' } + ] + }); + + patientAreaListStore = new top.Ext4.data.Store({ + fields: [ + { name: 'id' }, + { name: 'value' } + ] + }); + + if (patientAreaHttpOptionIds && patientAreaHttpOptionNames) { + var nameArr = patientAreaHttpOptionNames.split(';'); + var idArr = patientAreaHttpOptionIds.split(';'); + + for (var i = 0; i < nameArr.length; i++) { + var name = nameArr[i]; + var id = idArr[i]; + + var record = { + id: id, + value: name + }; + patientAreaListStore.add(record) + } + } + + var tbar = [{ + text: '选择病区:' + }, { + xtype: 'combo', + id: 'patientArea', + name: 'patientArea', + queryParam: 'spell', + fieldLabel: '', + minChars: 0, + valueField: 'id', + displayField: 'value', + width: 320, + store: patientAreaStore, + listeners: { + select: function (combo, record, index) { + var id = record[0].data.id; + var value = record[0].data.value; + addPatientAreaItem(id, value); + } + } + }, { + text: '添加所有', + iconCls: 'btn_ext_application_add', + handler: function () { + patientAreaStore.load(); + top.Ext4.getCmp("patientArea").setValue(""); + setTimeout(function () { + for (var i = 0; i < patientAreaStore.getCount(); i++) { + var id = patientAreaStore.getAt(i).get('id'); + var value = patientAreaStore.getAt(i).get('value'); + addPatientAreaItem(id, value) + } + }, 200); + } + }, { + text: '清空所有', + iconCls: 'btn_ext_application_del', + handler: function () { + patientAreaListStore.removeAll(); + } + }] + + var columns = [{ + header: "病区名称", + dataIndex: 'value', + width: 480, + menuDisabled: true + }, { + id: 'deleteItem', + header: '操作', + width: 60, + menuDisabled: true, + dataIndex: 'button', + renderer: function (v, p, record, index) { + return ""; + } + }] + + var grid = new top.Ext4.grid.GridPanel({ + title: '', + id: 'girdID', + columns: columns, + frame: false, + width: 690, + autoScroll: true, + store: patientAreaListStore, + tbar: tbar, + viewConfig: { + autoFill: true + } + }); + + patientAreaWin = new top.Ext4.window.Window({ + id: 'patientAreaWin', + layout: 'border', + title: '选择病区', + width: 760, + height: 500, + border: 0, + modal: true, + defaults: { + bodyStyle: "background-color: none", + frame: true, + border: false + }, + style: 'padding:20px', + items: [{ + region: "west", + width: 720, + border: 0, + title: '', + autoScroll: true, + items: [grid] + }], + buttonAlign: 'center', + buttons: [{ + id: 'confirmBtn', + text: '确定', + handler: function () { + savePatientArea(); + } + }, { + text: '取消', + handler: function () { + patientAreaWin.close(); + } + }] + }); + + patientAreaWin.show(); +} + +function cancel() { + configWin.close(); +} + +function editConfig(record) { + showAddOrEditWindow(record); +} + +function deleteConfig(grid) { + var selectedRecords = grid.getSelectionModel().getSelection(); + var selectedCount = grid.getSelectionModel().getCount(); + var ids = []; + if (selectedCount < 1) { + showResult("请选择要删除的数据"); + } else { + for (var i = 0, len = selectedRecords.length; i < len; i++) { + ids[i] = selectedRecords[i].data['orgUnitId']; + } + Ext4.MessageBox.confirm("请确认", "确定要删除选中的信息吗？", function (button, text) { + if ("yes" == button) { + Ext4.Ajax.request({ + url: WWWROOT + '/disinfectSystem/core/orgUnitPatientAreaRelationController/deleteOrgUnitPatientAreaRelationByOrgUnitId.mhtml', + params: { orgUnitIds: ids.join(';') }, + success: function (response, options) { + var result = Ext4.JSON.decode(response.responseText); + var success = result.success; + if (true != success) { + showResult(result.message); + return; + } else { + showResult('删除成功!'); + listStore.load(); + } + }, + failure: function (response, options) { + var result = Ext4.JSON.decode(response.responseText); + showResult(result.message); + } + }); + } + }); + } +} + +function saveConfig() { + var orgUnitId = top.Ext4.getCmp('orgUnitId').getValue(); + var patientAreaHttpOptionIds = top.Ext4.getCmp('patientAreaHttpOptionIds').getValue(); + Ext4.Ajax.request({ + url: WWWROOT + '/disinfectSystem/core/orgUnitPatientAreaRelationController/saveOrgUnitPatientAreaRelation.mhtml', + method: 'POST', + params: { + orgUnitId: orgUnitId, + patientAreaHttpOptionIds: patientAreaHttpOptionIds + }, + success: function (response, options) { + var result = Ext.decode(response.responseText); + var success = result.success; + if (true != success) { + showResult(result.message); + } else { + configWin.close(); + listStore.load(); + showResult('保存成功'); + } + } + }); +} + +function showAddOrEditWindow(record) { + var applyDepartJsonStore = new Ext4.data.Store({ + pageSize: 25, + proxy: { + type: 'ajax', + url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do?showDisableOrgUnit=false', + reader: { + type: 'json', + totalProperty: 'totalCount', + root: 'data' + } + }, + fields: [ + { name: 'orgUnitId', mapping: 'orgUnitId' }, + { name: 'name', mapping: 'name' } + ] + }); + applyDepartJsonStore.load(); + + formPanel = new top.Ext4.form.Panel({ + id: 'configForm', + frame: true, + labelSeparator: ':', + bodyStyle: 'padding:5px 5px 0px 5px;', + width: 800, + fieldDefaults: { + labelAlign: 'right', + labelWidth: 70 + }, + buttonAlign: 'center', + items: [{ + layout: 'column', + border: 0, + items: [{ + columnWidth: 0.98, + layout: 'form', + border: 0, + style: 'margin-bottom:10px', + items: [{ + xtype: 'combo', + fieldLabel: "选择科室", + valueField: 'orgUnitId', + displayField: 'name', + minChars: 0, + matchFieldWidth: false, + store: applyDepartJsonStore, + allowBlank: false, + pageSize: 100, + queryDelay: 500, + listConfig: { width: 380 }, + lazyInit: true, + typeAhead: false, + triggerAction: 'all', + queryParam: 'spell', + name: "orgUnitId", + id: "orgUnitId", + anchor: '95%' + }] + }] + }, { + layout: 'column', + border: 0, + items: [{ + columnWidth: 0.78, + layout: 'form', + border: 0, + style: 'margin-bottom:10px', + items: [{ + xtype: 'hidden', + id: 'patientAreaHttpOptionIds', + name: 'patientAreaHttpOptionIds' + }, { + xtype: 'textarea', + fieldLabel: '病区', + id: 'patientAreaHttpOptionNames', + name: 'patientAreaHttpOptionNames', + height: 130, + allowBlank: false, + readOnly: true, + anchor: '98%' + }] + }, { + columnWidth: .15, + layout: 'form', + border: 0, + style: 'margin-left:10px', + items: [{ + xtype: 'button', + text: '选择病区', + listeners: { + click: function () { + var patientAreaHttpOptionIds = top.Ext4.getCmp('patientAreaHttpOptionIds').getValue(); + var patientAreaHttpOptionNames = top.Ext4.getCmp('patientAreaHttpOptionNames').getValue(); + openSelectPatientArea(patientAreaHttpOptionIds, patientAreaHttpOptionNames); + } + } + }] + }] + }], + buttons: [{ + id: 'saveBtn', + text: '保存', + handler: function () { + if (formPanel.getForm().isValid()) { + saveConfig(); + } else { + showResult('请填写表单！'); + return false; + } + } + }, { + text: '取消', + handler: cancel + }] + }); + configWin = new top.Ext4.window.Window({ + id: 'configWin', + layout: 'border', + title: '申请科室关联病区设置', + width: 500, + height: 250, + border: false, + plain: true, + modal: true, + items: [{ + region: 'center', + width: 400, + layout: 'fit', + items: [formPanel] + }] + }); + configWin.show(); + + if (record) { + top.Ext4.getCmp('orgUnitId').setValue(record.orgUnitId); + top.Ext4.getCmp('patientAreaHttpOptionIds').setValue(record.patientAreaHttpOptionIds); + top.Ext4.getCmp('patientAreaHttpOptionNames').setValue(record.patientAreaHttpOptionOptionText); + } +} + Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js =================================================================== diff -u -r40693 -r40728 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 40693) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 40728) @@ -980,7 +980,7 @@ {hidden :SSTS_UseRecordConvertConfig_Manager,text:"使用记录转换配置",href:WWWROOT+'/disinfectsystem/basedatamanager/useRecordConvertConfig/useRecordConvertConfigView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecyclePrint_Menu,text:"器械包回收备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=recycleItem_remark',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SpecialInfection_manager,text:"特殊感染类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=specialInfection',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enablePatientAreaSetting,text:"病区设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=patientArea',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enablePatientAreaSetting,text:"病区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp?optionListId=patientArea',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_application_end_cause_manager,text:"申请单终止原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=application_end_cause',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true}, @@ -1038,7 +1038,8 @@ {hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=positionalTitle',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableMultipleBranchesOfHospital,text:"院区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_chargeRecordManage_MENU,text:"收费项目设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=chargeItem&optionName=收费项目设置'),hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DepartmentToWardAssociation_Select,text:"申请科室关联病区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"供应室服务临床科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"科室供应室设置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enablePackingMaterialsCheckFunction,text:"配包需逐一检查材料的物品",href:WWWROOT+'/disinfectsystem/basedatamanager/packingMaterialsCheck/packingMaterialsCheckView.jsp',hrefTarget:linkTarget,leaf:true} Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r40703 -r40728 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 40703) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 40728) @@ -1109,7 +1109,7 @@ {hidden :SSTS_RecyclePrint_Menu,text:"器械包回收备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=recycleItem_remark',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SpecialInfection_manager,text:"特殊感染类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableReduceSendAmountAfterTerminatePackAmountFunction,text:"装配删除原因设置",href:WWWROOT+'/disinfectsystem/basedatamanager/packingDeleteCause/packingDeleteCauseView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enablePatientAreaSetting,text:"病区设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=patientArea',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enablePatientAreaSetting,text:"病区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp?optionListId=patientArea',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_application_end_cause_manager,text:"申请单终止原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=application_end_cause',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true}, @@ -1175,7 +1175,8 @@ {hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=positionalTitle',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableMultipleBranchesOfHospital,text:"院区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_chargeRecordManage_MENU,text:"收费项目设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=chargeItem&optionName=收费项目设置'),hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DepartmentToWardAssociation_Select,text:"申请科室关联病区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"供应室服务临床科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"科室供应室设置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enablePackingMaterialsCheckFunction,text:"配包需逐一检查材料的物品",href:WWWROOT+'/disinfectsystem/basedatamanager/packingMaterialsCheck/packingMaterialsCheckView.jsp',hrefTarget:linkTarget,leaf:true} Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationView.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationView.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationView.js (revision 40728) @@ -0,0 +1,92 @@ +var listStore; +var orgUnitPatientAreaRelationGrid; + +function modify(v, data) { + editConfig(data); +} + +Ext4.onReady(function () { + Ext4.QuickTips.init(); + var columns = [ + { header: "科室名称", dataIndex: 'orgUnitName', width: 150, renderer: modifyRecord }, + { header: "病区", dataIndex: 'patientAreaHttpOptionOptionText', width: document.body.clientWidth - 300, sortable: false } + ]; + var tbar = [{ + text: '添加', + iconCls: 'btn_ext_application_add', + hidden: SSTS_DepartmentToWardAssociation_Create, + handler: function () { + showAddOrEditWindow(); + } + }, '-', { + text: '修改', + iconCls: 'btn_ext_application_edit', + hidden: SSTS_DepartmentToWardAssociation_Update, + handler: function () { + var selectedRecords = orgUnitPatientAreaRelationGrid.getSelectionModel().getSelection(); + var selectedCount = orgUnitPatientAreaRelationGrid.getSelectionModel().getCount(); + if (selectedCount < 1) { + showResult("请选择要修改的数据"); + } else if (selectedCount > 1) { + showResult("只能修改一条数据"); + } else { + editConfig(selectedRecords[0].data); + } + } + }, '-', { + text: '删除', + iconCls: 'btn_ext_application_del', + hidden: SSTS_DepartmentToWardAssociation_Delete, + handler: function () { + deleteConfig(orgUnitPatientAreaRelationGrid); + } + }]; + + listStore = new Ext4.data.JsonStore({ + proxy: { + type: 'ajax', + url: WWWROOT + '/disinfectSystem/core/orgUnitPatientAreaRelationController/loadOrgUnitPatientAreaRelation.mhtml', + reader: { + root: 'data.list', + totalProperty: 'data.count' + } + }, + fields: [ + { name: 'orgUnitId' }, + { name: 'orgUnitName' }, + { name: 'patientAreaHttpOptionIds' }, + { name: 'patientAreaHttpOptionOptionText' } + ] + }); + + listStore.loadPage(1); + + orgUnitPatientAreaRelationGrid = new Ext4.grid.GridPanel({ + title: '申请科室关联病区设置列表', + columns: columns, + frame: false, + autoScroll: false, + store: listStore, + tbar: tbar, + dockedItems: [{ + xtype: 'pagingtoolbar', + store: listStore, // same store GridPanel is using + dock: 'bottom', + displayInfo: true + }], + viewConfig: { + autoFill: true + }, + selModel: new Ext4.selection.CheckboxModel() + }); + + new Ext4.container.Viewport({ + layout: 'border', + items: [{ + region: 'center', + layout: 'fit', + items: [orgUnitPatientAreaRelationGrid] + }] + }); + +}); \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp =================================================================== diff -u -r40696 -r40728 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp (.../httpOptionView.jsp) (revision 40696) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp (.../httpOptionView.jsp) (revision 40728) @@ -19,6 +19,8 @@ var optionType_washMethod = '<%=HttpOption.SYSTEMSETTING_WASHMETHOD%>'; //GYEY-777：灭菌目的 var optionType_sterilizationPurpose = '<%=HttpOption.SYSTEMSETTING_STERILIZATIONPURPOSE%>'; + //DGSETYY-122：病区 + var optionType_patientArea = '<%=HttpOption.SYSTEMSETTING_PATIENT_AREA%>'; //《DGSETYY-79：清洗类型添加》权限 var SSTS_CleanType_Create = true; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/httpOption/httpOptionView.js =================================================================== diff -u -r40693 -r40728 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/httpOption/httpOptionView.js (.../httpOptionView.js) (revision 40693) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/httpOption/httpOptionView.js (.../httpOptionView.js) (revision 40728) @@ -15,6 +15,8 @@ title = '清洗方式'; }else if(optionListId == optionType_sterilizationPurpose){ title = '灭菌目的'; + }else if(optionListId == optionType_patientArea){ + title = '病区'; } Ext4.QuickTips.init(); var columns = [ Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r40725 -r40728 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 40725) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 40728) @@ -6931,6 +6931,8 @@ */ function isConfirmRequestPackingTousse(params, index, isTrue) { var len = params.length; + console.log(index) + console.log(len) if (index == len) { if (isTrue) { printLabelsAfterPacking(params); @@ -6964,6 +6966,29 @@ requestPackingTousse(params, index, isTrue); } }); + }else if (sstsConfig.enableDepartmentToWardAssociation && sstsConfig.enablePatientAreaSetting && params[index].tousseType == '外来器械包') { + Ext4.Ajax.request({ + url: WWWROOT + '/disinfectSystem/core/orgUnitPatientAreaRelationController/checkPackingTaskApplyOrgUnitPatientAreaRelation.mhtml', + params: { + packingTaskIds:params[index].taskIds + }, + success: function (result) { + var jsonObj = Ext4.JSON.decode(result.responseText); + if(jsonObj.success){ + onPackingTousseBtnClickComplete(); + showPackingTousseBtnClick_mask(); + requestPackingTousse(params, index, isTrue); + }else { + Ext4.MessageBox.confirm("请确认", jsonObj.message, function (btn) { + if (btn == 'yes') { + onPackingTousseBtnClickComplete(); + showPackingTousseBtnClick_mask(); + requestPackingTousse(params, index, isTrue); + } + }); + } + } + }); } else { requestPackingTousse(params, index, isTrue); } Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r40679 -r40728 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40679) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40728) @@ -1529,7 +1529,7 @@ * @param actionType 提交的类型 * @param needPrint 提交成功后是否需要打印 */ -function submitForm(actionType, needPrint){ +function submitForm(actionType, needPrint, checkApplyDepartPatientAreaRelation){ var returneeOfSupplier = ''; var returnMan = ''; var completeness = '' @@ -1609,13 +1609,24 @@ params.cleanQualified = cleanQualified; } var oldVersion = top.Ext4.getCmp('oldVersion').getValue() || 0; + if(sstsConfig.enableDepartmentToWardAssociation && sstsConfig.enablePatientAreaSetting && !checkApplyDepartPatientAreaRelation){ + params.checkApplyDepartPatientAreaRelation = true; + } foreignTousseForm.form.submit({ url : WWWROOT + submitUrl, method : 'POST', waitMsg : '正在保存数据，请稍候', waitTitle : '提交表单', params : params, success : function(form, action) { + if(action.result.applyDepartNoMatchParentArea){ + top.Ext.MessageBox.confirm("请确认",action.result.message,function(button, text) { + if ("yes" == button){ + submitForm(actionType, needPrint, true) + } + }); + return + } if (needPrint) { top.Ext4.getCmp('id').setValue(action.result.id); top.Ext4.getCmp('applicationTime').setValue(action.result.applicationTime); @@ -1631,7 +1642,16 @@ } }, failure : function(form, action) { - showResult(action.result.message); + if(action.result.applyDepartNoMatchParentArea){ + top.Ext.MessageBox.confirm("请确认",action.result.message,function(button, text) { + if ("yes" == button){ + submitForm(actionType, needPrint, true) + } + }); + return + }else { + showResult(action.result.message); + } } }); } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationView.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationView.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentToWardAssociation/departmentToWardAssociationView.jsp (revision 40728) @@ -0,0 +1,49 @@ +<%@page import="java.util.Date"%> +<%@page import="java.text.SimpleDateFormat"%> +<%@ page contentType="text/html; charset=UTF-8"%> +<%@ include file="/common/taglibs.jsp"%> +<% + request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName()); + request.setAttribute("orgunit",AcegiHelper.getLoginUser().getCurrentOrgUnitName()); + request.setAttribute("orgUnitCoding",AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig()); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + request.setAttribute("today", dateFormat.format(new Date())); +%> + + + +<%@ include file="/common/includeExtJsAndCss.jsp"%> +<%@ include file="/common/includeExtJs4_2.jsp"%> + +申请科室关联病区设置 + + + + + + + + + \ No newline at end of file Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r40685 -r40728 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 40685) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 40728) @@ -809,6 +809,11 @@ + + + + + Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r40686 -r40728 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 40686) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 40728) @@ -2549,6 +2549,15 @@ */ var SSTS_Expiration = SSTS_Expiration_Create && SSTS_Expiration_Update && SSTS_Expiration_Delete && SSTS_Expiration_Select; +/** + * 《DGSETYY-122：申请科室关联病区查询》权限 + */ +var SSTS_DepartmentToWardAssociation_Select = true; + + if(sstsConfig.enableDepartmentToWardAssociation && sstsConfig.enablePatientAreaSetting){ + SSTS_DepartmentToWardAssociation_Select = false + } + /** * 《科室供应室配置管理》权限 Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js =================================================================== diff -u -r40685 -r40728 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 40685) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 40728) @@ -334,6 +334,10 @@ enableDefaultQualityMonitoringDefinitionAlerts:true, //启用清洗类型功能 enableTypesOfWashingFunction:true, + //启用申请科室关联病区功能 + enableDepartmentToWardAssociation:true, + //启用病区设置功能 + enablePatientAreaSetting:true, //提取诊疗号的正则表达式 regExpForExtractingClinicNumber:"[0-9]+" } \ No newline at end of file