Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r20808 -r21561 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 20808) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 21561) @@ -139,7 +139,7 @@ Map sqlWhereParamMap = gridManager .getParamFromView(parameterMap); StringBuilder sqlBuilder = new StringBuilder(" WHERE 1=1 "); - String idNumber = sqlWhereParamMap.get("idNumberSearch"); + String idNumber = sqlWhereParamMap.get("idNumberSearch "); String idNumberSql = null; if(StringUtils.isNotBlank(idNumber)){ idNumberSql = String.format(" and po.idCardInstanceID in(select idi.id from IDCardInstance idi , IDCardDefinition idd where idi.idCardDefinitionID=idd.id and idd.idNumber like '%%%s%%') ", idNumber); @@ -250,7 +250,17 @@ + "%'"); } + String tousseStatus = sqlWhereParamMap.get("tousseStatus"); //器械包状态 + if (StringUtils.isNotBlank(tousseStatus) && !"全部".equals(tousseStatus)){ + sqlBuilder.append(String.format(" AND po.status = '%s' ",tousseStatus)); + } + String department = sqlWhereParamMap.get("department"); //科室 + if (StringUtils.isNotBlank(department) && !"全部".equals(department)){ + sqlBuilder.append(String.format(" AND po.departCoding = '%s' ",department)); + } + + /////////////////////////////////////////////// LoginUserData userData = AcegiHelper.getLoginUser(); String currentOrgUnitCode = userData Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r19838 -r21561 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 19838) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 21561) @@ -3,6 +3,36 @@ var barcodes = ''; var singleScanLabel = '单次扫描'; var repeatScanLabel = '多次扫描'; + +var departmentComboBoxStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do', + method : 'POST' + }), + reader : new Ext.data.JsonReader({ + root : 'data' + },[ + {name : 'id',mapping : 'id'}, + {name : 'departCode',mapping : 'departCode'}, + {name : 'name',mapping : 'name'} + ] + ), + listeners : { + load : function(st) { + var TopicRecord = Ext.data.Record.create([ + {name : 'id',mapping : 'id'}, + {name : 'departCode',mapping : 'departCode'}, + {name : 'name',mapping : 'name'} + ]); + var myNewRecord = new TopicRecord({ + id: 'all', + departCode: '全部', + name: '全部' + }); + st.insert(0,myNewRecord); + } + } +}); function initQueryValueAndReload() { $Id('parm_s_sterilizationDate').value = $Id('sterilizationDate').value; //灭菌开始时间 @@ -41,7 +71,12 @@ $Id('parm_s_barcodeSearch').value = barcode; //$Id('parm_s_barcodes').value = (barcodes.length == 9 ? '' : barcodes); //barcodes长度为9说明用户启用多次扫描模式，并且是第一次扫描 $Id('parm_s_barcodes').value = (barcodes); + $Id('parm_s_department').value = Ext.getCmp('department').getValue(); //科室 + $Id('parm_s_tousseStatus').value = $Id('tousseStatus').value; //器械包状态 +// var test_value = 'ceshi'; +// $Id('parm_s_department').value = test_value; + Ext.getCmp('barcodeSearch').setValue(''); grid.getStore().lastOptions.params['start'] = 0; grid.dwrReload(); @@ -297,9 +332,9 @@ width : fontSize == 12 ? 840 : 980, layout : 'column', items:[{ - columnWidth : .25, + columnWidth : .27, layout : 'form', - labelWidth : fontSize == 12 ? 70 : 90, + labelWidth : fontSize == 12 ? 81 : 110, labelAlign:"right", items : [{ xtype : 'combo', @@ -320,9 +355,9 @@ }) }] },{ - columnWidth : .25, + columnWidth : .23, layout : 'form', - labelWidth : fontSize == 12 ? 70 : 90, + labelWidth : fontSize == 12 ? 45 : 65, labelAlign:"right", items : [{ xtype : 'textfield', @@ -497,6 +532,67 @@ id : 'frequency', anchor : '95%' }] + },{ + columnWidth : .25, + layout : 'form', + labelWidth : fontSize == 12 ? 70 : 90, + labelAlign: "right", + items : [{ + xtype : 'combo', + fieldLabel : '科室', + id : 'department', + name : 'department', + emptyText : '全部', + valueField : 'departCode', + displayField : 'name', + store : departmentComboBoxStore, + triggerAction : 'all', + mode : 'remote', + forceSelection : false, + allowBlank : true, + editable : false, + anchor : '95%' + }] + },{ + columnWidth : .25, + layout : 'form', + labelWidth : fontSize == 12 ? 70 : 90, + labelAlign: "right", + items : [{ + xtype : 'combo', + fieldLabel : '器械包状态', + id : 'tousseStatus', + name : 'tousseStatus', + emptyText : '全部', + valueField : 'tousseStatus', + displayField : 'tousseStatus', + store : new Ext.data.SimpleStore({ + fields : ['tousseStatus'], + data : [['全部'], + ['已装配'], + ['已审核'], + ['已灭菌'], + ['已发货'], + ['已签收'], + ['待发货'], + ['已使用'], + ['灭菌中'], + ['已消毒'], + ['已退货'], + ['预回收'], + ['已回收'], + ['已废弃'], + ['待召回'], + ['已召回'], + ['灭菌待确认']] + }), + triggerAction : 'all', + mode : 'local', + forceSelection : false, + allowBlank : true, + editable : false, + anchor : '95%' + }] }] },{ width : fontSize == 12 ? 120 : 150, @@ -531,6 +627,8 @@ $Id('tousseGroupName').value = ""; $Id('scanPattern').value = singleScanLabel; $Id('idNumberSearch').value = ""; + $Id('department').value=""; + $Id('tousseStatus').value=""; barcodes = ''; } }] Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r19266 -r21561 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 19266) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 21561) @@ -114,6 +114,10 @@ + + + + \ No newline at end of file