Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp =================================================================== diff -u -r26833 -r27127 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 26833) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 27127) @@ -36,6 +36,13 @@ } //需要将该变量设置到page中,才能传到后台才能按科室进行过滤,否则使用记录列表将显示所有的数据 pageContext.setAttribute("parm_s_departCoding", parm_s_departCoding); + + //是否从"科室使用记录"菜单链接过来 + String departmentUseRecord = request.getParameter("departmentUseRecord"); + if("true".equals(departmentUseRecord)){ + //科室使用记录 + pageContext.setAttribute("parm_s_dataType", UseRecord.DATATYPE_DEPARTMENT); + } %> @@ -80,6 +87,7 @@ @@ -171,6 +225,7 @@
+
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java =================================================================== diff -u -r27033 -r27127 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 27033) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManager.java (.../UseRecordManager.java) (revision 27127) @@ -36,9 +36,10 @@ /** * 获取科室最近一天(即最近24小时内)的使用记录(仅pda的使用记录列表请求调用) * @param departCoding 科室编码 + * @param dataType 数据类型。@see UseRecord类的dataType字段定义 * @return */ - public List getLastOneDayUseRecordList(String departCoding); + public List getLastOneDayUseRecordList(String departCoding , Integer dataType); /** * 根据使用记录id查询器械材料使用记录 Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r27062 -r27127 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27062) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27127) @@ -899,15 +899,26 @@ var SSTS_Invoice_Manager = SSTS_Invoice_Menu && SSTS_OperationReservationDelivery_Menu && SSTS_CustomDelivery_Manager && SSTS_DeliverGoodsQuqery && SSTS_OperationReservationInvoice; /** - * 《使用记录》菜单 + * 《使用记录》菜单(启用科室使用记录配置项,该菜单名为病人使用记录) */ var SSTS_UseRecord_Menu = true; if (!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord')) { SSTS_UseRecord_Menu = false; } + /** + * 《科室使用记录》菜单 + */ +var SSTS_DepartmentUseRecord_Menu = true; +if(!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord') && sstsConfig.enableDepartmentUseRecord){ + + SSTS_DepartmentUseRecord_Menu = false; + +} + +/** * 《质量监测管理》总菜单 */ var SSTS_QualityRecord_Menu = true; Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r26802 -r27127 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 26802) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 27127) @@ -609,36 +609,38 @@ showResult('请正确填写表单各值'); return false; }*/ - - if(getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true) == false && top.Ext.getCmp('hospitalNum').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ - btObj.enable(); - top.Ext.getCmp('hospitalNum').focus(); - showResult('住院号不能为空'); - return false; + //如果不为科室使用记录时 + if(!fromDepartmentUseRecord){ + if(getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true) == false && top.Ext.getCmp('hospitalNum').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ + btObj.enable(); + top.Ext.getCmp('hospitalNum').focus(); + showResult('住院号不能为空'); + return false; + } + if(getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false) == false && top.Ext.getCmp('washHandNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ + btObj.enable(); + top.Ext.getCmp('washHandNurse').focus(); + showResult('洗手护士不能为空'); + return false; + } + if(getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false) == false && top.Ext.getCmp('circuitNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ + btObj.enable(); + top.Ext.getCmp('circuitNurse').focus(); + showResult(circuitNurseLabelName + '不能为空'); + return false; + } + if(useRecordOperationRoomAllowBlank == false && top.Ext.getCmp('operationRoom').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ + btObj.enable(); + top.Ext.getCmp('operationRoom').focus(); + showResult('手术间不能为空'); + return false; + } + if(!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ + btObj.enable(); + showResult('请输入诊疗号或者住院号或者病人姓名'); + return false; + } } - if(getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false) == false && top.Ext.getCmp('washHandNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ - btObj.enable(); - top.Ext.getCmp('washHandNurse').focus(); - showResult('洗手护士不能为空'); - return false; - } - if(getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false) == false && top.Ext.getCmp('circuitNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ - btObj.enable(); - top.Ext.getCmp('circuitNurse').focus(); - showResult(circuitNurseLabelName + '不能为空'); - return false; - } - if(useRecordOperationRoomAllowBlank == false && top.Ext.getCmp('operationRoom').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ - btObj.enable(); - top.Ext.getCmp('operationRoom').focus(); - showResult('手术间不能为空'); - return false; - } - if(!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields){ - btObj.enable(); - showResult('请输入诊疗号或者住院号或者病人姓名'); - return false; - } // 获取扫描的物品所有条码 var barcodes = getTousseGridData(); if (barcodes != "") { @@ -992,27 +994,31 @@ var tbar; var saveBtn = { text : '保存', + hidden : id ? (fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Update : SSTS_UseRecord_Update) : (fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Create : SSTS_UseRecord_Create), handler : function() { top.Ext.getCmp("audited").setValue(""); submitUseRecordForm(this, useRecordWin, id, false); } }; var saveAndNewBtn = { text : '保存并新建', + hidden : id ? (fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Update : SSTS_UseRecord_Update) : (fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Create : SSTS_UseRecord_Create), handler : function() { top.Ext.getCmp("audited").setValue(""); submitUseRecordForm(this, useRecordWin, id, true); } }; var reviewBtn = { - text : '审核', - handler : function() { - top.Ext.getCmp("audited").setValue("true");// action里则会根据audited的值判断用户是点击申述还是保存按钮，true为审核 - submitUseRecordForm(this, useRecordWin, id, false , reviewUseRecordForm); + text : '审核', + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_Review || sstsConfig.useRecordAuditMode != 1) : (SSTS_UseRecord_Review || sstsConfig.useRecordAuditMode != 1), + handler : function() { + top.Ext.getCmp("audited").setValue("true");// action里则会根据audited的值判断用户是点击申述还是保存按钮，true为审核 + submitUseRecordForm(this, useRecordWin, id, false , reviewUseRecordForm); } }; var createApplicationBtn = { text : '生成申请单', + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_Convert || sstsConfig.useRecordAuditMode != 1) : (SSTS_UseRecord_Convert || sstsConfig.useRecordAuditMode != 1), handler : function() { if((recyclingStatus == "已回收" || recyclingStatus == "部分回收") && sstsConfig.monitorGoodsRecyclingStatusForUseRecord){ showResult('不能生成申请单,请确认该条记录为未回收状态或空'); @@ -1037,20 +1043,23 @@ } var reviewAndConvertBtn = { text : '审核并生成申请单', + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_Convert || sstsConfig.useRecordAuditMode != 1) : (SSTS_UseRecord_Convert || sstsConfig.useRecordAuditMode != 1), handler : function() { top.Ext.getCmp("audited").setValue("true");// action里则会根据audited的值判断用户是点击审核还是保存按钮，true为审核 submitUseRecordForm(this, useRecordWin, id, false , reviewAndConvertUseRecordForm); } }; var saveAndReviewAndConvertBtn = { text : '保存并审核生成申请单', + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_Convert || sstsConfig.useRecordAuditMode != 1) : (SSTS_UseRecord_Convert || sstsConfig.useRecordAuditMode != 1), handler : function() { top.Ext.getCmp("audited").setValue("true");// action里则会根据audited的值判断用户是点击审核还是保存按钮，true为审核 saveAndReviewAndConvertUseRecordForm(this,useRecordWin,false); } }; var saveAndReviewAndConvertAndNewBtn = { text : '保存并审核生成申请单并新建', + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_Convert || sstsConfig.useRecordAuditMode != 1) : (SSTS_UseRecord_Convert || sstsConfig.useRecordAuditMode != 1), handler : function() { top.Ext.getCmp("audited").setValue("true");// action里则会根据audited的值判断用户是点击审核还是保存按钮，true为审核 saveAndReviewAndConvertUseRecordForm(this,useRecordWin,true); @@ -1391,15 +1400,21 @@ name : 'departCoding', id : 'departCoding', value : $Id("currentOrgUnitCode").value + },{ + xtype : 'hidden', + name : 'dataType', + id : 'dataType', + value : $Id("parm_s_dataType").value }, { layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '住院号', id : 'hospitalNum', name : 'hospitalNum', - allowBlank : getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true), + allowBlank : fromDepartmentUseRecord || getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true), enableKeyEvents : true, maxLength:20, maxLengthText :'长度超过限制，不能保存！', @@ -1428,7 +1443,7 @@ }, { layout : 'form', columnWidth : 0.33, - hidden : sstsConfig.hideTreatmentNumOfUseRecord, + hidden : fromDepartmentUseRecord || sstsConfig.hideTreatmentNumOfUseRecord, items : [{ xtype : 'textfield', fieldLabel : '诊疗号', @@ -1463,13 +1478,12 @@ }, { layout : 'form', columnWidth : 0.33, - hidden : sstsConfig.hideWashHandNurseOfUseRecord, + hidden : fromDepartmentUseRecord || sstsConfig.hideWashHandNurseOfUseRecord, items : [{ xtype : 'combo', fieldLabel : '洗手护士', id : 'washHandNurse', name : 'washHandNurse', - hidden : sstsConfig.hideWashHandNurseOfUseRecord, // disabled : !fillTousseName, queryParam : 'spell', minChars : 0, @@ -1480,7 +1494,7 @@ triggerAction : 'all', hideTrigger : true, typeAhead : false, - allowBlank : sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false), + allowBlank : fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false)), anchor : '96%', listeners : { render : function(c){ @@ -1525,6 +1539,7 @@ },{ layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'combo', fieldLabel : circuitNurseLabelName, @@ -1540,7 +1555,7 @@ triggerAction : 'all', hideTrigger : true, typeAhead : false, - allowBlank : sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false), + allowBlank : fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false)), anchor : '96%', listeners : { render : function(c){ @@ -1601,14 +1616,15 @@ }, { layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '手术间', id : 'operationRoom', name : 'operationRoom', maxLength:10, maxLengthText :'长度超过限制，不能保存！', - allowBlank : sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : useRecordOperationRoomAllowBlank, + allowBlank : fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : useRecordOperationRoomAllowBlank), anchor : '96%', listeners:{ render : function(c) { @@ -1623,6 +1639,7 @@ },{ layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '姓名', @@ -1634,6 +1651,7 @@ }, { layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '年龄', @@ -1647,6 +1665,7 @@ }, { layout : 'form', columnWidth : .33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'combo', fieldLabel : '性别', @@ -1668,7 +1687,7 @@ }, { layout : 'form', columnWidth : 0.33, - hidden : sstsConfig.hideRoomNumber, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '病区', @@ -1680,7 +1699,7 @@ }, { layout : 'form', columnWidth : 0.33, - hidden : sstsConfig.hideRoomNumber, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '病室', @@ -1692,6 +1711,7 @@ }, { layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '床位', @@ -1703,6 +1723,7 @@ }, { layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '身份证', @@ -1716,6 +1737,7 @@ }, { layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '医生', @@ -1728,7 +1750,7 @@ }, { layout : 'form', columnWidth : 0.33, - hidden : !sstsConfig.showSurgeonOfUseRecord, + hidden:fromDepartmentUseRecord || !sstsConfig.showSurgeonOfUseRecord, items : [{ xtype : 'textfield', fieldLabel : '主刀医生', @@ -1741,6 +1763,7 @@ }, { layout : 'form', columnWidth : 0.66, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'combo', fieldLabel : "手术名称", @@ -1762,6 +1785,7 @@ },{ layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '手术单号', @@ -1774,6 +1798,7 @@ },{ layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'datefieldWithMin', fieldLabel : '手术时间', @@ -1788,6 +1813,7 @@ layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'numberfield', fieldLabel : '住院次数', @@ -1813,7 +1839,7 @@ }] }, { layout : 'form', - columnWidth : 0.66, + columnWidth : 0.33, items : [{ xtype : 'datefieldWithMin', fieldLabel : '录入时间', @@ -1838,6 +1864,7 @@ },{ layout : 'form', columnWidth : 0.33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'textfield', fieldLabel : '审核人', @@ -1878,6 +1905,7 @@ }, { layout : 'form', columnWidth : .33, + hidden:fromDepartmentUseRecord, items : [{ xtype : 'combo', fieldLabel : '特殊感染类型', @@ -1912,7 +1940,7 @@ layout : 'form', labelWidth :70, columnWidth :.33, - hidden : !sstsConfig.enableExpensiveGoods, + hidden:fromDepartmentUseRecord || !sstsConfig.enableExpensiveGoods, items : [{ xtype : 'textfield', fieldLabel : '扫描条码1', @@ -1934,7 +1962,7 @@ layout : 'form', labelWidth :70, columnWidth :.33, - hidden : !sstsConfig.enableExpensiveGoods, + hidden:fromDepartmentUseRecord || !sstsConfig.enableExpensiveGoods, items : [{ xtype : 'textfield', fieldLabel : '自身条码1', @@ -1950,7 +1978,7 @@ layout : 'form', labelWidth :70, columnWidth :.33, - hidden : !sstsConfig.enableExpensiveGoods, + hidden:fromDepartmentUseRecord || !sstsConfig.enableExpensiveGoods, items : [{ xtype : 'textfield', fieldLabel : '扫描条码2', @@ -1972,7 +2000,7 @@ layout : 'form', labelWidth :70, columnWidth :.33, - hidden : !sstsConfig.enableExpensiveGoods, + hidden:fromDepartmentUseRecord || !sstsConfig.enableExpensiveGoods, items : [{ xtype : 'textfield', fieldLabel : '自身条码2', @@ -1988,7 +2016,7 @@ layout : 'form', labelWidth :70, columnWidth :.33, - hidden : !sstsConfig.enableExpensiveGoods, + hidden:fromDepartmentUseRecord || !sstsConfig.enableExpensiveGoods, items : [{ xtype : 'textfield', fieldLabel : '扫描条码3', @@ -2010,7 +2038,7 @@ layout : 'form', labelWidth :70, columnWidth :.33, - hidden : !sstsConfig.enableExpensiveGoods, + hidden:fromDepartmentUseRecord || !sstsConfig.enableExpensiveGoods, items : [{ xtype : 'textfield', fieldLabel : '自身条码3', Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java =================================================================== diff -u -r27062 -r27127 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java (.../UseRecordTableManager.java) (revision 27062) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java (.../UseRecordTableManager.java) (revision 27127) @@ -109,6 +109,14 @@ statusCondigion += ")"; sql += " and po.status in " + statusCondigion; } + + //判断数据类型 + String dataType = sqlWhereParamMap.get("dataType"); + if(StringUtils.isNotBlank(dataType)){ + sql += " and po.dataType = " + dataType; + }else{ + sql += " and po.dataType is null "; + } returnJson = gridManager.renderGrid(parameterMap, UseRecord.class.getSimpleName(), sql, new String[] { "tousseDefinition" }); Index: ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js =================================================================== diff -u -r27044 -r27127 --- ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js (.../config.js) (revision 27044) +++ ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/config.js (.../config.js) (revision 27127) @@ -1,4 +1,4 @@ -var sstsConfig = { +var sstsConfig = { // 禁用标识牌功能 disableIdCard : false, // 回收时科室显示结算科室 @@ -246,5 +246,7 @@ //是否启用生物监测结果的提示。 //针对做了生物监测的灭菌记录，所有的包（包括器械包、外来器械包、敷料包、自定义器械包、代理灭菌包等）， //也无论是否含有植入物，在扫描发货时系统需要根据灭菌记录的生物监测情况进行提示 - enableBiologicalMonitoringOfAllTousses:true + enableBiologicalMonitoringOfAllTousses:true, + //启用科室使用记录,值未配置或配置为false时，不启用科室使用记录功能；配置为true时，启用科室使用记录功能 + enableDepartmentUseRecord:true } \ No newline at end of file Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r27006 -r27127 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27006) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27127) @@ -26,7 +26,9 @@ } } -DisinfectsystemTreeData =[{ +//高级视图-消毒供应管理树型目录菜单数组(更换为数组格式,以便于方便以后有新菜单需求插入到中间) +var DisinfectsystemTreeData = []; +DisinfectsystemTreeData.push({ text:"科室申领", singleClickExpand:singleClickExpandTree, hidden:SSTS_RecycApplication_Folder, @@ -39,7 +41,8 @@ {hidden :SSTS_Invoice_Sign,text:"物品签收",leaf:true} ] -},{ +}); +DisinfectsystemTreeData.push({ text:"回收清点", singleClickExpand:singleClickExpandTree, hidden:SSTS_RecycRecord_Menu, @@ -53,48 +56,54 @@ }}, {hidden :SSTS_RecycRecord_Menu,text:"器械交接",href:WWWROOT+'/disinfectsystem/recycle/tousseTransition/tousseTransitionView.jsp',hrefTarget:linkTarget,leaf:true} ] -},{ +}); +DisinfectsystemTreeData.push({ text:"回收分类", singleClickExpand:singleClickExpandTree, hidden : true, children:[ {hidden :true,text:"器械分类记录",href:WWWROOT+'/disinfectsystem/becleanitem/becleanitem.jsp',hrefTarget:linkTarget,leaf:true} ] -},{ +}); +DisinfectsystemTreeData.push({ text:"清洗消毒", singleClickExpand:singleClickExpandTree, hidden:SSTS_Wash_Menu, children:[ {hidden :SSTS_WashRecord_Menu,text:"清洗消毒记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashTransitionRecord_Menu,text:"清洗交接记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp?',hrefTarget:linkTarget,leaf:true} ] -}]; +}); -var index = DisinfectsystemTreeData.length; - -DisinfectsystemTreeData[4] = { +//装配菜单位于消毒供应管理的索引位置 +var packingMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length; +DisinfectsystemTreeData.push({ text:"装配管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_Packing_Manager, children:[] -}; +}); -DisinfectsystemTreeData[5] = { +//审核菜单位于消毒供应管理的索引位置 +var reviewMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length; +DisinfectsystemTreeData.push({ text:"审核打包", singleClickExpand:singleClickExpandTree, hidden:SSTS_Tousse_Review_Manager, children:[] -}; +}); -DisinfectsystemTreeData[6] = { +//灭菌菜单位于消毒供应管理的索引位置 +var sterilizationMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length; +DisinfectsystemTreeData.push({ text:"灭菌管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_Sterilization_Manager, children:[ ] -}; -DisinfectsystemTreeData[7] = { +}); +DisinfectsystemTreeData.push({ text:"发货管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_Invoice_Manager, @@ -113,28 +122,29 @@ {hidden :SSTS_DeliverGoodsQuqery,text:"发货物品查询",href:WWWROOT+'/disinfectsystem/reportforms/invoiceQueryView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_OperationReservationInvoice,text:"手术排班物品查询",href:WWWROOT+'/disinfectsystem/reportforms/operationReservationInvoiceView.jsp?',hrefTarget:linkTarget,leaf:true} ] -}; +}); -DisinfectsystemTreeData[8] = { +DisinfectsystemTreeData.push({ text:"使用记录", singleClickExpand:singleClickExpandTree, hidden:SSTS_UseRecord_Menu, children:[ - {hidden :SSTS_UseRecord_Menu,text:"使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_UseRecord_Menu,text:sstsConfig.enableDepartmentUseRecord ? "病人使用记录" : "使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DepartmentUseRecord_Menu,text:"科室使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?departmentUseRecord=true',hrefTarget:linkTarget,leaf:true} ] -}; +}); -DisinfectsystemTreeData[9] = { +DisinfectsystemTreeData.push({ text:"器械包返消", singleClickExpand:singleClickExpandTree, hidden:SSTS_TousseReturnDisinfect_Menu, children:[ {hidden :SSTS_TousseReturnDisinfect_Menu,text:"器械包返消",href:WWWROOT+'/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseReturnDisinfectionReport,text:"器械包返消统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseReturnDisinfectionView.jsp',hrefTarget:linkTarget,leaf:true} ] - }; +}); -DisinfectsystemTreeData[10] = { +DisinfectsystemTreeData.push({ text:"满意度调查", singleClickExpand:singleClickExpandTree, hidden:SSTS_SatisfactionSurvey_Menu, @@ -143,8 +153,8 @@ {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true} ] -}; -DisinfectsystemTreeData[11] = { +}); +DisinfectsystemTreeData.push({ text:"运作监控管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_supplyRoomOperate_View, @@ -153,41 +163,43 @@ {hidden :SSTS_supplyRoomOperate_Menu,text:"消毒供应中心未完成工作列表",href:WWWROOT+'/homepage/supplyRoomUnfinishedWork.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseOperateCountReport,text:"科室运作监控",href:WWWROOT+'/disinfectsystem/reportforms/tousseOperate.jsp',hrefTarget:linkTarget,leaf:true} ] -}; -DisinfectsystemTreeData[12] = { - text:"档案管理", - singleClickExpand:singleClickExpandTree, - hidden:(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive || SSTS_StaffArchive_Menu, - children:[ - {hidden :SSTS_StaffArchive_Menu,text:"人员档案管理",href:WWWROOT+'/disinfectsystem/staffArchives/staffArchiveView.jsp',hrefTarget:linkTarget,leaf:true} - ] - }; -DisinfectsystemTreeData[13] = { - text:"培训管理", - singleClickExpand:singleClickExpandTree, - hidden:SSTS_TrainingManage_Menu, - children:[ - {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true} - ] - }; -DisinfectsystemTreeData[14] = { - text:"收费记录管理", - singleClickExpand:singleClickExpandTree, - hidden:SSTS_chargeRecordManage_MENU, - children:[ - {hidden :SSTS_chargeRecordManage_MENU,text:"收费记录管理",href:WWWROOT+'/disinfectsystem/chargeRecord/chargeRecord.jsp',hrefTarget:linkTarget,leaf:true} - ] - }; -DisinfectsystemTreeData[15] = { - text:"库位管理", - singleClickExpand:singleClickExpandTree, - hidden:SSTS_storageLocationManager && SSTS_storageLocationLook && SSTS_tousseAccess, - children:[ - {hidden :SSTS_storageLocationManager,text:"库位管理",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationManageView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_storageLocationLook,text:"库存查看",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationLookView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_tousseAccess,text:"物品存取",href:WWWROOT+'/disinfectsystem/storageLocationManage/goodsAccess.jsp',hrefTarget:linkTarget,leaf:true} - ] - }; +}); +DisinfectsystemTreeData.push({ + text:"档案管理", + singleClickExpand:singleClickExpandTree, + hidden:(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive || SSTS_StaffArchive_Menu, + children:[ + {hidden :SSTS_StaffArchive_Menu,text:"人员档案管理",href:WWWROOT+'/disinfectsystem/staffArchives/staffArchiveView.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ + text:"培训管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_TrainingManage_Menu, + children:[ + {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ + text:"收费记录管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_chargeRecordManage_MENU, + children:[ + {hidden :SSTS_chargeRecordManage_MENU,text:"收费记录管理",href:WWWROOT+'/disinfectsystem/chargeRecord/chargeRecord.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ + text:"库位管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_storageLocationManager && SSTS_storageLocationLook && SSTS_tousseAccess, + children:[ + {hidden :SSTS_storageLocationManager,text:"库位管理",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationManageView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_storageLocationLook,text:"库存查看",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationLookView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_tousseAccess,text:"物品存取",href:WWWROOT+'/disinfectsystem/storageLocationManage/goodsAccess.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); + +/**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) begin */ DWREngine.setAsync(false); PackingTableManager.getAllTaskGroup(setTaskGroup); function setTaskGroup(taskGroup){ @@ -198,32 +210,35 @@ link1.href = encodeURI(WWWROOT+'/disinfectsystem/packing/packingView.jsp?taskGroup='+taskGroup[i]); link1.hrefTarget = linkTarget; link1.leaf = true; - DisinfectsystemTreeData[4].children[i] = link1; + DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[i] = link1; var link2 = new Object(); link2.hidden = false; link2.text = taskGroup[i]; link2.href = encodeURI(WWWROOT+'/disinfectsystem/packing/reviewView.jsp?taskGroup='+taskGroup[i]); link2.hrefTarget = linkTarget; link2.leaf = true; - DisinfectsystemTreeData[5].children[i] = link2; + DisinfectsystemTreeData[reviewMenuIndexOfDisinfectsystemTree].children[i] = link2; } var directPackingLink = new Object(); directPackingLink.hidden = SSTS_CustomPacking_Manager; directPackingLink.text = '自定义装配'; directPackingLink.href = WWWROOT+'/disinfectsystem/packing/directPacking.jsp'; directPackingLink.hrefTarget = linkTarget; directPackingLink.leaf = true; - DisinfectsystemTreeData[4].children[taskGroup.length] = directPackingLink; + DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[taskGroup.length] = directPackingLink; var historyPackingLink = new Object(); historyPackingLink.hidden = SSTS_HistoryPacking_Manager; historyPackingLink.text = '历史装配记录'; historyPackingLink.href = WWWROOT+'/disinfectsystem/packing/historyPackingView.jsp'; historyPackingLink.hrefTarget = linkTarget; historyPackingLink.leaf = true; - DisinfectsystemTreeData[4].children[taskGroup.length+1] = historyPackingLink; + DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[taskGroup.length+1] = historyPackingLink; } +/**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) end */ + +/**设置"灭菌管理"菜单的下一级子菜单(各灭菌炉组装配、灭菌交接、灭菌物品装载、当天灭菌记录管理、历史灭菌记录管理、代理灭菌管理、外部代理灭菌管理) begin */ DWREngine.setAsync(true); if(sterilerGroupList.length >0){ for(var i=0;i - - - - - - - + + + + + + + - + + + + + + + + + + + + + + Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r27126 -r27127 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 27126) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 27127) @@ -701,14 +701,15 @@ @SuppressWarnings("unchecked") @Override - public List getLastOneDayUseRecordList(String departCoding) { + public List getLastOneDayUseRecordList(String departCoding , Integer dataType) { Date now = new Date(); Date start = new Date(); start.setTime(now.getTime() - 24 * 60*60*1000); String sql = String - .format("where po.departCoding = '%s' and %s",departCoding,dateQueryAdapter.dateAreaSql("po.enteringDate", - Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(start), null, false,true));//没有结束时间,则只要大于开始时间就行，不限制结束时间为当前时间。因为精度只到秒，当前时间与使用记录的时间是同一秒，会导致刚添加的使用记录未被查出 + .format("where po.departCoding = '%s' and %s %s",departCoding,dateQueryAdapter.dateAreaSql("po.enteringDate", + Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(start), null, false,true), + (dataType == null ? " and dataType is null " : " and dataType = " + dataType));//没有结束时间,则只要大于开始时间就行，不限制结束时间为当前时间。因为精度只到秒，当前时间与使用记录的时间是同一秒，会导致刚添加的使用记录未被查出 return objectDao.findBySql(UseRecord.class.getSimpleName(), sql, "statusSequence ASC, enteringDate desc,operationRoom asc"); } @@ -2151,6 +2152,9 @@ //聚合包内的子包使用数据也需要复制到新的使用记录对象中 curUseRecord.setTousseInstanceList(modified.getTousseInstanceList()); curUseRecord.setSubComboTousseUseRecordList(modified.getSubComboTousseUseRecordList()); + + //设置使用记录的数据类型(用于区分病人使用记录与科室使用记录) + curUseRecord.setDataType(modified.getDataType()); if(CollectionUtils.isNotEmpty(modifyContent)){ appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_USERECORD, Log.TYPE_UPDATE, StringUtils.join(modifyContent, ";")); Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r27096 -r27127 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 27096) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 27127) @@ -1374,8 +1374,16 @@ // int firstIndex = params.optInt("firstIndex"); // int maxResultCount = params.optInt("maxResultCount"); + //使用记录数据类型(用于区分病人使用记录与科室使用记录) + Integer dataTypeInteger = null; + if(params.has("dataType")){ + int dataType = params.optInt("dataType"); + if(dataType != 0){ + dataTypeInteger = new Integer(dataType); + } + } List useRecordList = useRecordManager.getLastOneDayUseRecordList( - departCode); + departCode , dataTypeInteger); JsonConfig jsonConfig = new JsonConfig(); jsonConfig.registerJsonValueProcessor(Date.class, _defaultDateJsonValueProcessor1); @@ -1532,6 +1540,7 @@ JSONObject loginInfoJsonObject = JSONObject.fromObject(loginInfo); modified.setDepartCoding(loginInfoJsonObject.optString("orgUnitCodes")); modified.setDepart(loginInfoJsonObject.optString("orgUnitName")); + modified.setOperator(loginInfoJsonObject.optString("userFullName")); }catch(Exception e){ e.printStackTrace(); } @@ -1580,6 +1589,7 @@ JSONObject loginInfoJsonObject = JSONObject.fromObject(loginInfo); modified.setDepartCoding(loginInfoJsonObject.optString("orgUnitCodes")); modified.setDepart(loginInfoJsonObject.optString("orgUnitName")); + modified.setOperator(loginInfoJsonObject.optString("userFullName")); }catch(Exception e){ e.printStackTrace(); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java =================================================================== diff -u -r25697 -r27127 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 25697) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java (.../UseRecord.java) (revision 27127) @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -117,7 +118,7 @@ */ private String departCoding; - private String operator; //登记人 + private String operator; //登记人(即页面的录入人) /** * 洗手护士 @@ -178,8 +179,19 @@ public static final String STATUS_APPLIED = "已申请"; private String remark;//备注 - + /** + * 使用记录数据类型:科室使用记录 + */ + public static final Integer DATATYPE_DEPARTMENT = 1; + /** + * NULL表示病人使用记录 + * 1:科室使用记录 + * ...待扩展 + */ + private Integer dataType; + + /** * 手术申请单号(惠州中心人民医院提出:陈林炜 since:20170329) */ private String operationScheduleId; @@ -792,5 +804,14 @@ public boolean recyclingStatus_partOrAll(){ return RECYCLINGSTATUS_PARTRECYCLE.equals(recyclingStatus) || RECYCLINGSTATUS_RECYCLED.equals(recyclingStatus); } - + + @Column(length=1) + public Integer getDataType() { + return dataType; + } + + public void setDataType(Integer dataType) { + this.dataType = dataType; + } + } Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js =================================================================== diff -u -r27030 -r27127 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 27030) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 27127) @@ -8,6 +8,7 @@ var setRecyclingStatusName = sstsConfig.monitorGoodsRecyclingStatusForUseRecord ?"设置已回收":"" +//添加使用记录 function newUseRecord(){ addAndEditUseRecord('', '',''); setTimeout("top.Ext.getCmp('hospitalNum').focus(true)", 500); @@ -728,16 +729,16 @@ var remarkColumnHeader = "备注"; var columns = [ - {header : patientNameColumnHeader,width : 70,dataIndex : 'patientName',hidden:existsObjInArray(patientNameColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, + {header : patientNameColumnHeader,width : 70,dataIndex : 'patientName',hidden:fromDepartmentUseRecord || existsObjInArray(patientNameColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, {header : statusColumnHeader,width : 50,dataIndex : 'status',hidden:existsObjInArray(statusColumnHeader,hiddenColumnsOfUseRecordListView),renderer : rendererColor}, - {header : hospitalNumColumnHeader,width : 90,dataIndex : 'hospitalNum',hidden:existsObjInArray(hospitalNumColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, - {header : treatmentNumColumnHeader,width : 90,dataIndex : 'treatmentNum',hidden:existsObjInArray(treatmentNumColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, - {header : operationRoomColumnHeader,width : 90,dataIndex : 'operationRoom',hidden:existsObjInArray(operationRoomColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, - {header : patientAgeColumnHeader,width : 40,dataIndex : 'patientAge',hidden:existsObjInArray(patientAgeColumnHeader,hiddenColumnsOfUseRecordListView)}, - {header : patientIDCardColumnHeader,width : 120,dataIndex : 'patientIDCard',hidden:existsObjInArray(patientIDCardColumnHeader,hiddenColumnsOfUseRecordListView)}, - {header : doctorNameColumnHeader,width : 70,dataIndex : 'doctorName',hidden:existsObjInArray(doctorNameColumnHeader,hiddenColumnsOfUseRecordListView)}, - {header : operationColumnHeader,width : 150,dataIndex : 'operation',hidden:existsObjInArray(operationColumnHeader,hiddenColumnsOfUseRecordListView)}, - {header : "回收状态",width : 150,dataIndex : 'recyclingStatus',hidden:sstsConfig.monitorGoodsRecyclingStatusForUseRecord ? false :true,renderer:function(v , p , rec){ + {header : hospitalNumColumnHeader,width : 90,dataIndex : 'hospitalNum',hidden:fromDepartmentUseRecord || existsObjInArray(hospitalNumColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, + {header : treatmentNumColumnHeader,width : 90,dataIndex : 'treatmentNum',hidden:fromDepartmentUseRecord || existsObjInArray(treatmentNumColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, + {header : operationRoomColumnHeader,width : 90,dataIndex : 'operationRoom',hidden:fromDepartmentUseRecord || existsObjInArray(operationRoomColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, + {header : patientAgeColumnHeader,width : 40,dataIndex : 'patientAge',hidden:fromDepartmentUseRecord || existsObjInArray(patientAgeColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : patientIDCardColumnHeader,width : 120,dataIndex : 'patientIDCard',hidden:fromDepartmentUseRecord || existsObjInArray(patientIDCardColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : doctorNameColumnHeader,width : 70,dataIndex : 'doctorName',hidden:fromDepartmentUseRecord || existsObjInArray(doctorNameColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : operationColumnHeader,width : 150,dataIndex : 'operation',hidden:fromDepartmentUseRecord || existsObjInArray(operationColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : "回收状态",width : 150,dataIndex : 'recyclingStatus',hidden:fromDepartmentUseRecord || (sstsConfig.monitorGoodsRecyclingStatusForUseRecord ? false :true),renderer:function(v , p , rec){ //SZSZLYY-31 使用记录监控回收状态功能优化 if(v == awaitRecycle){ return ""+ v +""; @@ -749,11 +750,11 @@ return v; } }}, - {header : "优先转换状态",width : 150,dataIndex : 'priorConvertStatus',hidden:sstsConfig.enablePriorConvertApplyGoods ? false :true}, + {header : "优先转换状态",width : 150,dataIndex : 'priorConvertStatus',hidden:fromDepartmentUseRecord || (sstsConfig.enablePriorConvertApplyGoods ? false :true)}, {header : operatorColumnHeader,width : 60,dataIndex : 'operator',hidden:existsObjInArray(operatorColumnHeader,hiddenColumnsOfUseRecordListView)}, {header : departColumnHeader,width : 80,dataIndex : 'depart',hidden:existsObjInArray(departColumnHeader,hiddenColumnsOfUseRecordListView)}, {header : enteringDateColumnHeader,width : 120,dataIndex : 'enteringDate',hidden:existsObjInArray(enteringDateColumnHeader,hiddenColumnsOfUseRecordListView),renderer : myDateFormatByMinute}, - {header : applicationTimeColumnHeader,width : 120,dataIndex : 'applicationTime',hidden:existsObjInArray(applicationTimeColumnHeader,hiddenColumnsOfUseRecordListView),renderer : myDateFormatByMinute}, + {header : applicationTimeColumnHeader,width : 120,dataIndex : 'applicationTime',hidden:fromDepartmentUseRecord || existsObjInArray(applicationTimeColumnHeader,hiddenColumnsOfUseRecordListView),renderer : myDateFormatByMinute}, {header : remarkColumnHeader,width : 120,dataIndex : 'remark',id : 'autoWidth',hidden:existsObjInArray(remarkColumnHeader,hiddenColumnsOfUseRecordListView)} ]; @@ -801,14 +802,14 @@ var tbar = [ { text : '添加', - hidden : SSTS_UseRecord_Create, + hidden : fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Create : SSTS_UseRecord_Create, iconCls : 'btn_ext_application_add', handler : function() { newUseRecord(); } }, '-', { text : '修改', - hidden : SSTS_UseRecord_Update, + hidden : fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Update : SSTS_UseRecord_Update, iconCls : 'btn_ext_application_edit', id : 'editTbar', handler : function() { @@ -826,21 +827,21 @@ } }, '-', { text : '删除', - hidden : SSTS_UseRecord_Delete, + hidden : fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_Delete : SSTS_UseRecord_Delete, iconCls : 'btn_ext_application_del', handler : function() { deleteUseRecord(grid); } }, '-', { text : '审核', - hidden : SSTS_UseRecord_Review || sstsConfig.useRecordAuditMode != 1, + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_Review || sstsConfig.useRecordAuditMode != 1) : (SSTS_UseRecord_Review || sstsConfig.useRecordAuditMode != 1), iconCls : 'btn_ext_application_edit', handler : function() { audit(grid); } }, '-', { text : sstsConfig.useRecordAuditMode == 1 ? '优先转换申请单' : '审核并优先转换申请单', - hidden : SSTS_UseRecord_PriorConvert, + hidden : fromDepartmentUseRecord ? SSTS_DepartmentUseRecord_PriorConvert : SSTS_UseRecord_PriorConvert, iconCls : 'btn_ext_refresh', handler : function() { priorConvertApplyGoods(grid); @@ -854,7 +855,7 @@ } }, { text : '生成申请单', - hidden : SSTS_UseRecord_Convert || sstsConfig.useRecordAuditMode != 1, + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_Convert || sstsConfig.useRecordAuditMode != 1) : (SSTS_UseRecord_Convert || sstsConfig.useRecordAuditMode != 1), iconCls : 'btn_ext_refresh', handler : function() { convertButtonClicked(grid); @@ -884,21 +885,21 @@ }, { text : '审核并生成申请单', - hidden : SSTS_UseRecord_Convert || sstsConfig.useRecordAuditMode != 2, + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_Convert || sstsConfig.useRecordAuditMode != 2) : (SSTS_UseRecord_Convert || sstsConfig.useRecordAuditMode != 2), iconCls : 'btn_ext_refresh', handler : function() { auditAndConvertBtnClicked(grid); } },{ text : '合并转换申请单', - hidden : SSTS_UseRecord_MergeConvert || sstsConfig.enableMultiUseRecordMergeConvert != true, + hidden : fromDepartmentUseRecord ? (SSTS_DepartmentUseRecord_MergeConvert || sstsConfig.enableMultiUseRecordMergeConvert != true) : (SSTS_UseRecord_MergeConvert || sstsConfig.enableMultiUseRecordMergeConvert != true), iconCls : 'btn_ext_refresh', handler : function() { openUseRecordMergeConvertWin(); } },'-',{ text : '打印', - hidden : !sstsConfig.ControlUseRecordprint && !SSTS_UseRecord_Create, + hidden : fromDepartmentUseRecord ? (!sstsConfig.ControlUseRecordprint && !SSTS_DepartmentUseRecord_Create) : (!sstsConfig.ControlUseRecordprint && !SSTS_UseRecord_Create), iconCls : 'icon_print', handler : function() { getUseRecordRows(grid,0) Index: ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js =================================================================== diff -u -r27045 -r27127 --- ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 27045) +++ ssts-web/src/main/webapp/disinfectsystem/config/ggsrmyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 27127) @@ -26,151 +26,181 @@ } } -DisinfectsystemTreeData =[{ + +//高级视图-消毒供应管理树型目录菜单数组(更换为数组格式,以便于方便以后有新菜单需求插入到中间) +var DisinfectsystemTreeData = []; +DisinfectsystemTreeData.push({ text:"科室申领", singleClickExpand:singleClickExpandTree, hidden:SSTS_RecycApplication_Folder, children:[ - {hidden :SSTS_RecycApplication_Menu,text:"全部申请单",href:WWWROOT+'/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=all',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Application_ShowTodoOnly_Menu,text:"待处理申请单",href:WWWROOT+'/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=todoList',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_ForeignTousseApplication_Menu,text:"外来器械包申请",href:WWWROOT+'/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp?borrowing=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_borrow_Menu,text:"借物单管理",href:WWWROOT+'/disinfectsystem/borrow/borrowingTousseView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_borrowRecord_Menu,text:"科室互借管理",href:WWWROOT+'/disinfectsystem/borrowRecord/borrowRecordView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Invoice_Sign,text:"物品签收",leaf:true} + {hidden :SSTS_RecycApplication_Menu,text:"全部申请单",href:WWWROOT+'/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=all',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Application_ShowTodoOnly_Menu,text:"待处理申请单",href:WWWROOT+'/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=todoList',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ForeignTousseApplication_Menu,text:"外来器械包申请",href:WWWROOT+'/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp?borrowing=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_borrow_Menu,text:"借物单管理",href:WWWROOT+'/disinfectsystem/borrow/borrowingTousseView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_borrowRecord_Menu,text:"科室互借管理",href:WWWROOT+'/disinfectsystem/borrowRecord/borrowRecordView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Sign,text:"物品签收",leaf:true} - ] -},{ + ] +}); +DisinfectsystemTreeData.push({ text:"回收清点", singleClickExpand:singleClickExpandTree, hidden:SSTS_RecycRecord_Menu, children:[ - {hidden :SSTS_RecycRecord_Menu,text:"回收清点",href:'javascript:void(0);',leaf:true,listeners:{ - click:function(node, e){ - var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980'; - top.recyclingWindow = openFullSizeWindowWithName(url,null,"recyclingWindow"); - return; - } - }}, - {hidden :SSTS_RecycRecord_Menu,text:"器械交接",href:WWWROOT+'/disinfectsystem/recycle/tousseTransition/tousseTransitionView.jsp',hrefTarget:linkTarget,leaf:true} - ] -},{ + {hidden :SSTS_RecycRecord_Menu,text:"回收清点",href:'javascript:void(0);',leaf:true,listeners:{ + click:function(node, e){ + var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980'; + top.recyclingWindow = openFullSizeWindowWithName(url,null,"recyclingWindow"); + return; + } + }}, + {hidden :SSTS_RecycRecord_Menu,text:"器械交接",href:WWWROOT+'/disinfectsystem/recycle/tousseTransition/tousseTransitionView.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ text:"回收分类", singleClickExpand:singleClickExpandTree, hidden : true, children:[ - {hidden :true,text:"器械分类记录",href:WWWROOT+'/disinfectsystem/becleanitem/becleanitem.jsp',hrefTarget:linkTarget,leaf:true} - ] -},{ + {hidden :true,text:"器械分类记录",href:WWWROOT+'/disinfectsystem/becleanitem/becleanitem.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ text:"清洗消毒", singleClickExpand:singleClickExpandTree, hidden:SSTS_Wash_Menu, children:[ - {hidden :SSTS_WashRecord_Menu,text:"清洗消毒记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_WashTransitionRecord_Menu,text:"清洗交接记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp?',hrefTarget:linkTarget,leaf:true} - ] -}]; + {hidden :SSTS_WashRecord_Menu,text:"清洗消毒记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_WashTransitionRecord_Menu,text:"清洗交接记录",href:WWWROOT+'/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordView.jsp?',hrefTarget:linkTarget,leaf:true} +] +}); -var index = DisinfectsystemTreeData.length; - -DisinfectsystemTreeData[4] = { +//装配菜单位于消毒供应管理的索引位置 +var packingMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length; +DisinfectsystemTreeData.push({ text:"装配管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_Packing_Manager, children:[] -}; +}); -DisinfectsystemTreeData[5] = { +//审核菜单位于消毒供应管理的索引位置 +var reviewMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length; +DisinfectsystemTreeData.push({ text:"审核打包", singleClickExpand:singleClickExpandTree, hidden:SSTS_Tousse_Review_Manager, children:[] -}; +}); -DisinfectsystemTreeData[6] = { +//灭菌菜单位于消毒供应管理的索引位置 +var sterilizationMenuIndexOfDisinfectsystemTree = DisinfectsystemTreeData.length; +DisinfectsystemTreeData.push({ text:"灭菌管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_Sterilization_Manager, children:[ - ] -}; -DisinfectsystemTreeData[7] = { + ] +}); +DisinfectsystemTreeData.push({ text:"发货管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_Invoice_Manager, children:[ - {hidden :SSTS_Invoice_Menu,text:"发货计划管理",href:WWWROOT+'/disinfectsystem/invoice/invoicePlanExtractedView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Invoice_Menu || !sstsConfig.enableExpensiveGoods,text:"高值耗材发货",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约管理",href:WWWROOT+'/disinfectsystem/invoice/operationReservationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约发货",href:WWWROOT+'/disinfectsystem/invoice/operationReservationInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约汇总发货",href:WWWROOT+'/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_CustomDelivery_Manager,text:"自定义发货",href:WWWROOT+'/disinfectsystem/invoice/customInvoiceForm.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Invoice_Menu,text:"快速发货",href:WWWROOT+'/disinfectsystem/invoice/expressInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Invoice_Menu,text:"科室发货计划设置",href:WWWROOT+'/disinfectsystem/invoice/invoiceDepartmentView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Invoice_Menu,text:"发货单管理",href:WWWROOT+'/disinfectsystem/invoice/invoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_Invoice_Menu,text:"材料发货管理",href:WWWROOT+'/disinfectsystem/invoice/materialInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :true,text:"发货单批量打印",href:WWWROOT+'/disinfectsystem/invoice/invoicePrintView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_DeliverGoodsQuqery,text:"发货物品查询",href:WWWROOT+'/disinfectsystem/reportforms/invoiceQueryView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_OperationReservationInvoice,text:"手术排班物品查询",href:WWWROOT+'/disinfectsystem/reportforms/operationReservationInvoiceView.jsp?',hrefTarget:linkTarget,leaf:true} - ] -}; + {hidden :SSTS_Invoice_Menu,text:"发货计划管理",href:WWWROOT+'/disinfectsystem/invoice/invoicePlanExtractedView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu || !sstsConfig.enableExpensiveGoods,text:"高值耗材发货",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约管理",href:WWWROOT+'/disinfectsystem/invoice/operationReservationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约发货",href:WWWROOT+'/disinfectsystem/invoice/operationReservationInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_OperationReservationDelivery_Menu,text:"手术预约汇总发货",href:WWWROOT+'/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_CustomDelivery_Manager,text:"自定义发货",href:WWWROOT+'/disinfectsystem/invoice/customInvoiceForm.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"快速发货",href:WWWROOT+'/disinfectsystem/invoice/expressInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"科室发货计划设置",href:WWWROOT+'/disinfectsystem/invoice/invoiceDepartmentView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"发货单管理",href:WWWROOT+'/disinfectsystem/invoice/invoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Invoice_Menu,text:"材料发货管理",href:WWWROOT+'/disinfectsystem/invoice/materialInvoiceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :true,text:"发货单批量打印",href:WWWROOT+'/disinfectsystem/invoice/invoicePrintView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DeliverGoodsQuqery,text:"发货物品查询",href:WWWROOT+'/disinfectsystem/reportforms/invoiceQueryView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_OperationReservationInvoice,text:"手术排班物品查询",href:WWWROOT+'/disinfectsystem/reportforms/operationReservationInvoiceView.jsp?',hrefTarget:linkTarget,leaf:true} + ] +}); -DisinfectsystemTreeData[8] = { +DisinfectsystemTreeData.push({ text:"使用记录", singleClickExpand:singleClickExpandTree, hidden:SSTS_UseRecord_Menu, children:[ - {hidden :SSTS_UseRecord_Menu,text:"使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true} - ] -}; + {hidden :SSTS_UseRecord_Menu,text:sstsConfig.enableDepartmentUseRecord ? "病人使用记录" : "使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DepartmentUseRecord_Menu,text:"科室使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?departmentUseRecord=true',hrefTarget:linkTarget,leaf:true} + ] +}); -DisinfectsystemTreeData[9] = { +DisinfectsystemTreeData.push({ text:"器械包返消", singleClickExpand:singleClickExpandTree, hidden:SSTS_TousseReturnDisinfect_Menu, children:[ {hidden :SSTS_TousseReturnDisinfect_Menu,text:"器械包返消",href:WWWROOT+'/disinfectsystem/tousseReturnDisinfect/tousseReturnDisinfectView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseReturnDisinfectionReport,text:"器械包返消统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseReturnDisinfectionView.jsp',hrefTarget:linkTarget,leaf:true} ] - }; +}); -DisinfectsystemTreeData[10] = { +DisinfectsystemTreeData.push({ text:"满意度调查", singleClickExpand:singleClickExpandTree, hidden:SSTS_SatisfactionSurvey_Menu, children:[ - {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查表定义",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true} - ] -}; -DisinfectsystemTreeData[11] = { + {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查表定义",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ text:"运作监控管理", singleClickExpand:singleClickExpandTree, hidden:SSTS_supplyRoomOperate_View, children:[ - {hidden :SSTS_supplyRoomOperate_Menu,text:"消毒供应中心运作监控",href:WWWROOT+'/homepage/supplyRoomOperate.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_supplyRoomOperate_Menu,text:"消毒供应中心未完成工作列表",href:WWWROOT+'/homepage/supplyRoomUnfinishedWork.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TousseOperateCountReport,text:"科室运作监控",href:WWWROOT+'/disinfectsystem/reportforms/tousseOperate.jsp',hrefTarget:linkTarget,leaf:true} - ] -}; -DisinfectsystemTreeData[12] = { - text:"档案管理", - singleClickExpand:singleClickExpandTree, - hidden:(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive || SSTS_StaffArchive_Menu, - children:[ - {hidden :SSTS_StaffArchive_Menu,text:"人员档案管理",href:WWWROOT+'/disinfectsystem/staffArchives/staffArchiveView.jsp',hrefTarget:linkTarget,leaf:true} - ] - }; -DisinfectsystemTreeData[13] = { - text:"培训管理", - singleClickExpand:singleClickExpandTree, - hidden:SSTS_TrainingManage_Menu, - children:[ - {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true} - ] - }; + {hidden :SSTS_supplyRoomOperate_Menu,text:"消毒供应中心运作监控",href:WWWROOT+'/homepage/supplyRoomOperate.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_supplyRoomOperate_Menu,text:"消毒供应中心未完成工作列表",href:WWWROOT+'/homepage/supplyRoomUnfinishedWork.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_TousseOperateCountReport,text:"科室运作监控",href:WWWROOT+'/disinfectsystem/reportforms/tousseOperate.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ + text:"档案管理", + singleClickExpand:singleClickExpandTree, + hidden:(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive || SSTS_StaffArchive_Menu, + children:[ + {hidden :SSTS_StaffArchive_Menu,text:"人员档案管理",href:WWWROOT+'/disinfectsystem/staffArchives/staffArchiveView.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ + text:"培训管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_TrainingManage_Menu, + children:[ + {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ + text:"收费记录管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_chargeRecordManage_MENU, + children:[ + {hidden :SSTS_chargeRecordManage_MENU,text:"收费记录管理",href:WWWROOT+'/disinfectsystem/chargeRecord/chargeRecord.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +DisinfectsystemTreeData.push({ + text:"库位管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_storageLocationManager && SSTS_storageLocationLook && SSTS_tousseAccess, + children:[ + {hidden :SSTS_storageLocationManager,text:"库位管理",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationManageView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_storageLocationLook,text:"库存查看",href:WWWROOT+'/disinfectsystem/storageLocationManage/storageLocationLookView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_tousseAccess,text:"物品存取",href:WWWROOT+'/disinfectsystem/storageLocationManage/goodsAccess.jsp',hrefTarget:linkTarget,leaf:true} + ] +}); +/**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) begin */ DWREngine.setAsync(false); PackingTableManager.getAllTaskGroup(setTaskGroup); function setTaskGroup(taskGroup){ @@ -181,32 +211,35 @@ link1.href = encodeURI(WWWROOT+'/disinfectsystem/packing/packingView.jsp?taskGroup='+taskGroup[i]); link1.hrefTarget = linkTarget; link1.leaf = true; - DisinfectsystemTreeData[4].children[i] = link1; + DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[i] = link1; var link2 = new Object(); link2.hidden = false; link2.text = taskGroup[i]; link2.href = encodeURI(WWWROOT+'/disinfectsystem/packing/reviewView.jsp?taskGroup='+taskGroup[i]); link2.hrefTarget = linkTarget; link2.leaf = true; - DisinfectsystemTreeData[5].children[i] = link2; + DisinfectsystemTreeData[reviewMenuIndexOfDisinfectsystemTree].children[i] = link2; } var directPackingLink = new Object(); directPackingLink.hidden = SSTS_CustomPacking_Manager; directPackingLink.text = '自定义装配'; directPackingLink.href = WWWROOT+'/disinfectsystem/packing/directPacking.jsp'; directPackingLink.hrefTarget = linkTarget; directPackingLink.leaf = true; - DisinfectsystemTreeData[4].children[taskGroup.length] = directPackingLink; + DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[taskGroup.length] = directPackingLink; var historyPackingLink = new Object(); historyPackingLink.hidden = SSTS_HistoryPacking_Manager; historyPackingLink.text = '历史装配记录'; historyPackingLink.href = WWWROOT+'/disinfectsystem/packing/historyPackingView.jsp'; historyPackingLink.hrefTarget = linkTarget; historyPackingLink.leaf = true; - DisinfectsystemTreeData[4].children[taskGroup.length+1] = historyPackingLink; + DisinfectsystemTreeData[packingMenuIndexOfDisinfectsystemTree].children[taskGroup.length+1] = historyPackingLink; } +/**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) end */ + +/**设置"灭菌管理"菜单的下一级子菜单(各灭菌炉组装配、灭菌交接、灭菌物品装载、当天灭菌记录管理、历史灭菌记录管理、代理灭菌管理、外部代理灭菌管理) begin */ DWREngine.setAsync(true); if(sterilerGroupList.length >0){ for(var i=0;i