Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r37884 -r37950 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 37884) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 37950) @@ -375,6 +375,11 @@ + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r37913 -r37950 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 37913) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 37950) @@ -31,6 +31,11 @@ var urgentLevelQueryName = '加急级别'; var hideVideoAndPictureRecordingQuery = true; var videoAndPictureRecordingQueryName = '影像记录'; +//ZSRY-84：新增扩展查询项"回收时间"与"器械包类型" +var hideRecyclingTimeQuery = true; +var recyclingTimeQueryName = '回收'; +var hideTousseTypeQuery = true; +var tousseTypeQueryName = '器械包类型'; if(sstsConfig.expandQueryFieldsConfigOfTousseInfoQuery && sstsConfig.expandQueryFieldsConfigOfTousseInfoQuery.length > 0){ var expandQueryFieldsConfigOfTousseInfoQuery = sstsConfig.expandQueryFieldsConfigOfTousseInfoQuery; @@ -43,6 +48,14 @@ hideVideoAndPictureRecordingQuery = false; videoAndPictureRecordingQueryName = expandQueryFieldsConfigOfTousseInfoQuery[i].QueryName; } + if(expandQueryFieldsConfigOfTousseInfoQuery[i].fieldName == 'recyclingTime'){ + hideRecyclingTimeQuery = false; + recyclingTimeQueryName = expandQueryFieldsConfigOfTousseInfoQuery[i].QueryName; + } + if(expandQueryFieldsConfigOfTousseInfoQuery[i].fieldName == 'tousseType'){ + hideTousseTypeQuery = false; + tousseTypeQueryName = expandQueryFieldsConfigOfTousseInfoQuery[i].QueryName; + } } } @@ -224,15 +237,63 @@ $Id('parm_s_barcodes').value = (barcodes); //多次扫描模式下的条码 $Id('parm_s_idNumberSearch').value = $Id('idNumberSearch').value; //标识牌编号 if(sstsConfig.enableSterilizationTransition){ - $Id('parm_s_sterilizationTransitionStart').value = $Id('sterilizationTransitionStart').value; //灭菌交接开始时间 - $Id('parm_s_sterilizationTransitionEnd').value = $Id('sterilizationTransitionEnd').value; //灭菌交接结束时间 + var sterilizationTransitionStart = $Id('sterilizationTransitionStart').value; + var sterilizationTransitionEnd = $Id('sterilizationTransitionEnd').value; + $Id('parm_s_sterilizationTransitionStart').value = sterilizationTransitionStart; + $Id('parm_s_sterilizationTransitionEnd').value = sterilizationTransitionEnd; + if(sterilizationTransitionStart !== '' && sterilizationTransitionEnd !== '' && checkEtGreaterThanSt(sterilizationTransitionEnd,sterilizationTransitionStart)){ + showResult('灭菌交接结束时间不得设置早于灭菌交接开始时间'); + return + } } + //ZSRY-84：回收时间 + if(!hideRecyclingTimeQuery){ + var recyclingTimeStart = $Id('recyclingTimeStart').value; + var recyclingTimeEnd = $Id('recyclingTimeEnd').value; + $Id('parm_s_recyclingTimeStart').value = recyclingTimeStart; + $Id('parm_s_recyclingTimeEnd').value = recyclingTimeEnd; + if(recyclingTimeStart !== '' && recyclingTimeEnd !== '' && checkEtGreaterThanSt(recyclingTimeEnd,recyclingTimeStart)){ + showResult('回收结束时间不得设置早于回收开始时间'); + return + } + } + //ZSRY-84：器械包类型 + if(!hideTousseTypeQuery){ + $Id('parm_s_tousseType').value = $Id('tousseType').value; + } $Id('parm_s_taskGroup').value = $Id('taskGroup').value; //装配任务组 - $Id('parm_s_operationStart').value = $Id('operationStart').value; //装配开始时间 - $Id('parm_s_operationEnd').value = $Id('operationEnd').value; //装配结束时间 - $Id('parm_s_invoiceStart').value = $Id('invoiceStart').value; //发货开始时间 - $Id('parm_s_invoiceEnd').value = $Id('invoiceEnd').value; //发货结束时间 + + //装配时间 + var operationStart = $Id('operationStart').value; + var operationEnd = $Id('operationEnd').value; + $Id('parm_s_operationStart').value = operationStart; + $Id('parm_s_operationEnd').value = operationEnd; + if(operationStart !== '' && operationEnd !== '' && checkEtGreaterThanSt(operationEnd,operationStart)){ + showResult('装配结束时间不得设置早于装配开始时间'); + return + } + + //发货时间 + var invoiceStart = $Id('invoiceStart').value; + var invoiceEnd = $Id('invoiceEnd').value; + $Id('parm_s_invoiceStart').value = invoiceStart; + $Id('parm_s_invoiceEnd').value = invoiceEnd; + if(invoiceStart !== '' && invoiceEnd !== '' && checkEtGreaterThanSt(invoiceEnd,invoiceStart)){ + showResult('发货结束时间不得设置早于发货开始时间'); + return + } + + //灭菌时间 + var sterilizationStart = $Id('sterilizationStart').value; + var sterilizationEnd = $Id('sterilizationEnd').value; + $Id('parm_s_sterilizationStart').value = sterilizationStart; + $Id('parm_s_sterilizationEnd').value = sterilizationEnd; + if(sterilizationStart !== '' && sterilizationEnd !== '' && checkEtGreaterThanSt(sterilizationEnd,sterilizationStart)){ + showResult('灭菌结束时间不得设置早于灭菌开始时间'); + return + } + $Id('parm_s_department').value = Ext.getCmp('department').getValue(); //科室编号 $Id('parm_s_tousseStatus').value = $Id('tousseStatus').value; //器械包状态 $Id('parm_s_tousseGroupName').value = $Id('tousseGroupName').value; //器械包分组 @@ -243,9 +304,7 @@ $Id('parm_s_tousseNameFuzzy').value = Ext.getCmp('tousseName').getRawValue(); $Id('parm_s_tousseName').value = ''; } - - $Id('parm_s_sterilizationStart').value = $Id('sterilizationStart').value; //灭菌开始时间 - $Id('parm_s_sterilizationEnd').value = $Id('sterilizationEnd').value; //灭菌结束时间 + $Id('parm_s_sterilizerGroup').value = $Id('sterilizerGroup').value; //灭菌炉分组 $Id('parm_s_sterilizerName').value = $Id('sterilizerName').value; //灭菌炉 $Id('parm_s_frequency').value = $Id('frequency').value; //炉次 @@ -1471,6 +1530,46 @@ labelWidth : labelWidth, labelAlign:"right", height:row1Height, + hidden : hideRecyclingTimeQuery, + items : { + fieldLabel : recyclingTimeQueryName + '开始时间', + name : 'recyclingTimeStart', + id : 'recyclingTimeStart', + xtype : 'datefieldWithMin', + width : datefieldWithMinWidth, +// altFormats:'Y-m-d H:i|Y-n-j H:i|y-n-j H:i|y-m-j H:i|y-m-d H:i|y-n-d H:i|Y-n-d H:i|Y-m-j H:i|Ymd H:i|Ynj H:i|ynj H:i|ymj H:i|ymd H:i|ynd H:i|Ynd H:i|Ymj H:i|Y/m/d H:i|Y/n/j H:i|y/n/j H:i|y/m/j H:i|y/m/d H:i|y/n/d H:i|Y/n/d H:i|Y/m/j|Y-m-d G:i|Y-n-j G:i|y-n-j G:i|y-m-j G:i|y-m-d G:i|y-n-d G:i|Y-n-d G:i|Y-m-j G:i|Ymd G:i|Ynj G:i|ynj G:i|ymj G:i|ymd G:i|ynd G:i|Ynd G:i|Ymj G:i|Y/m/d G:i|Y/n/j G:i|y/n/j G:i|y/m/j G:i|y/m/d G:i|y/n/d G:i|Y/n/d G:i|Y/m/j|G:i|H:i', +// selectOnFocus :true, + readOnly : true, + theHours : 0, + theMinutes : 0, + format : 'Y-m-d H:i' + } + },{ + columnWidth : .2, + layout : 'form', + labelWidth : labelWidth, + labelAlign:"right", + height:row1Height, + hidden : hideRecyclingTimeQuery, + items : { + fieldLabel : recyclingTimeQueryName + '结束时间', + name : 'recyclingTimeEnd', + id : 'recyclingTimeEnd', + xtype : 'datefieldWithMin', + width : datefieldWithMinWidth, +// altFormats:'Y-m-d H:i|Y-n-j H:i|y-n-j H:i|y-m-j H:i|y-m-d H:i|y-n-d H:i|Y-n-d H:i|Y-m-j H:i|Ymd H:i|Ynj H:i|ynj H:i|ymj H:i|ymd H:i|ynd H:i|Ynd H:i|Ymj H:i|Y/m/d H:i|Y/n/j H:i|y/n/j H:i|y/m/j H:i|y/m/d H:i|y/n/d H:i|Y/n/d H:i|Y/m/j|Y-m-d G:i|Y-n-j G:i|y-n-j G:i|y-m-j G:i|y-m-d G:i|y-n-d G:i|Y-n-d G:i|Y-m-j G:i|Ymd G:i|Ynj G:i|ynj G:i|ymj G:i|ymd G:i|ynd G:i|Ynd G:i|Ymj G:i|Y/m/d G:i|Y/n/j G:i|y/n/j G:i|y/m/j G:i|y/m/d G:i|y/n/d G:i|Y/n/d G:i|Y/m/j|G:i|H:i', +// selectOnFocus :true, + readOnly : true, + theHours : 23, + theMinutes : 59, + format : 'Y-m-d H:i' + } + },{ + columnWidth : .2, + layout : 'form', + labelWidth : labelWidth, + labelAlign:"right", + height:row1Height, hidden : !sstsConfig.enableSterilizationTransition, items : { fieldLabel : '灭菌交接开始', @@ -1491,7 +1590,7 @@ labelWidth : labelWidth, labelAlign:"right", height:row1Height, - hidden : sstsConfig.enableSterilizationTransition, + hidden : sstsConfig.enableSterilizationTransition || !hideRecyclingTimeQuery, items : { hideLabel : true, fieldClass : 'fieldReadOnlyNoRemoveAndTop', @@ -1521,7 +1620,7 @@ columnWidth : .2, layout : 'form', height:row1Height, - hidden : sstsConfig.enableSterilizationTransition, + hidden : sstsConfig.enableSterilizationTransition || !hideRecyclingTimeQuery, items : { hideLabel : true, fieldClass : 'fieldReadOnlyNoRemoveAndTop', @@ -2020,6 +2119,37 @@ forceSelection: true, editable: false }] + },{ + columnWidth : .2, + layout : 'form', + labelWidth : labelWidth, + labelAlign:"right", + hidden:hideTousseTypeQuery, + items : [{ + xtype: 'multiSelect', + fieldLabel : tousseTypeQueryName, + listWidth: 200, + id: 'tousseType', + name: 'tousseType', + valueField: 'value', + displayField: 'value', + allowBlank: true, + editable: false, + store: new Ext.data.SimpleStore({ + fields: ['value'], + data: [['全部'], ['器械包'], ['敷料包'], ['消毒物品'], ['外部代理灭菌']] + }), + value: '全部', + forceSelection: false, + mode: 'local', + triggerAction: 'all', + listeners : { + select : function(combo, record, index){ + onAllChoosedOrNot(combo, record,index,'tousseType'); + } + }, + anchor : '100%' + }] }] var formHeight = 0; @@ -2034,6 +2164,11 @@ if(isIE()){ formHeight += 20; } + + //同时开启灭菌交接时间和回收时间 + if(sstsConfig.enableSterilizationTransition && !hideRecyclingTimeQuery){ + formHeight += 20; + } var form = new Ext.Panel({ title : '器械包查询条件', @@ -2082,8 +2217,16 @@ $Id('sterilizationTransitionStart').value = ""; //灭菌交接开始时间 $Id('sterilizationTransitionEnd').value = ""; //灭菌交接结束时间 } + //ZSRY-84：回收时间 + if(!hideRecyclingTimeQuery){ + $Id('recyclingTimeStart').value = ""; + $Id('recyclingTimeEnd').value = ""; + } + //ZSRY-84：器械包类型 + if(!hideTousseTypeQuery){ + Ext.getCmp('tousseType').setValue("全部"); + } - $Id('taskGroup').value=""; //装配任务组 Ext.getCmp('taskGroup').deselectAll(); //器械包状态 $Id('operationStart').value = ""; //装配开始时间 Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js =================================================================== diff -u -r36441 -r37950 --- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js (.../config.js) (revision 36441) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js (.../config.js) (revision 37950) @@ -285,6 +285,8 @@ enableInstrumentRepairManagement : true, //启用自定义表单的审核功能 enableReviewOfFormDefinitionFunction : true, + //器械包信息模块扩展查询项配置 + expandQueryFieldsConfigOfTousseInfoQuery:[{"fieldName":"recyclingTime","QueryName":"回收"},{"fieldName":"tousseType","QueryName":"器械包类型"}], //启用灭菌双人核对功能 enableDoubleCheckOfSterilizationFunction : true } \ No newline at end of file