Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java =================================================================== diff -u -r16629 -r16702 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java (.../ReviewedBasketManager.java) (revision 16629) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManager.java (.../ReviewedBasketManager.java) (revision 16702) @@ -23,6 +23,11 @@ public List getAllReviewedBasket(String taskGroup); + /** + * 根据科室编码，获取所有待灭菌的审核篮筐（即：状态为灭菌装载，而且没有灭过菌） + * @param departCode 科室编码 + * @return + */ public List getDepartAllReviewedBasket(String departCode); public void deleteReviewedBasket(ReviewedBasket reviewedBasket); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java =================================================================== diff -u -r16629 -r16702 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 16629) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 16702) @@ -139,7 +139,9 @@ } /** - * 获得当前登录科室任务组的所有正在审核步骤的篮筐 + * 根据科室编码，获取所有待灭菌的审核篮筐（即：状态为灭菌装载，而且没有灭过菌） + * @param departCode 科室编码 + * @return */ @Override public List getDepartAllReviewedBasket(String departCode) { Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java =================================================================== diff -u -r16643 -r16702 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16643) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java (.../TousseInstanceManager.java) (revision 16702) @@ -87,15 +87,18 @@ String orgUnitCode); /** - * 根据时间段及科室编码查询所有已审核的器械包实例 - * @param orgUnitCode - * @param beginDate - * @param endDate - * @param amount 数量 + * 根据时间段及科室编码查询所有已审核的器械包实例（从结果集的下标为start开始取limit个） + * @param orgUnitCode 科室编码 + * @param beginDate 开始日期 + * @param endDate 结束日期 + * @param start 开始下标 + * @param limit 获取的个数 + * @param searchKeyWord 检索关键字（按器械包名称，拼音码，五笔码） + * @param sqlCondition where子句的Map * @return */ public List getAllReviewedTousseInstanceWithOutBasket( - String orgUnitCode , String beginDate , String endDate , String start , String limit , Map sqlCondition); + String orgUnitCode , String beginDate , String endDate ,String start , String limit , String searchKeyWord, Map sqlCondition); /** * 根据科室编码和器械包名称，获取今天审核未入灭菌篮筐的器械包 Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r16629 -r16702 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 16629) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 16702) @@ -717,12 +717,13 @@ */ public void getWaitSterileLoadingTousseInstance(){ try { + String searchKeyWord = StrutsParamUtils.getPraramValue("searchKeyWordReal", ""); String start = StrutsParamUtils.getPraramValue("start", ""); String limit = StrutsParamUtils.getPraramValue("limit", ""); JSONArray jsonArray = new JSONArray(); Map sqlCondition = new HashMap(); List tousses = - tousseInstanceManager.getAllReviewedTousseInstanceWithOutBasket(acegiHelper.getCurrentOrgUnitCode(), null, null , start , limit , sqlCondition); + tousseInstanceManager.getAllReviewedTousseInstanceWithOutBasket(acegiHelper.getCurrentOrgUnitCode(), null, null , start , limit , searchKeyWord, sqlCondition); int count = objectDao.countObjectBySql(TousseInstance.class.getSimpleName(), sqlCondition.get("condition")); @@ -925,7 +926,7 @@ JSONArray jsonArray = new JSONArray(); JSONArray notTimeoutArray = new JSONArray(); - + // 所有待灭菌的审核篮筐 List reviewedBaskets = reviewedBasketManager .getDepartAllReviewedBasket(orgUnitCoding); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16670 -r16702 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16670) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16702) @@ -601,25 +601,38 @@ /** - * 今天审核的未入筐器械包 + * 根据时间段及科室编码查询所有已审核并且还未入审核篮筐的器械包实例（从结果集的下标为start开始取limit个） + * @param orgUnitCode 科室编码 + * @param beginDate 开始日期 + * @param endDate 结束日期 + * @param start 开始下标 + * @param limit 获取的个数 + * @param searchKeyWord 检索关键字（按器械包名称，拼音码，五笔码） + * @param sqlCondition where子句的Map + * @return */ public List getAllReviewedTousseInstanceWithOutBasket( - String orgUnitCode , String beginDate , String endDate , String start , String limit , Map sqlCondition){ + String orgUnitCode , String beginDate , String endDate , String start , String limit, String searchKeyWord, Map sqlCondition){ String sql = " where po.status = '" + TousseInstance.STATUS_REVIEWED - + "' and reviewBasket_id is null"; + + "' and reviewBasket_id is null"; //已审核并且还未入审核篮筐 if(StringUtils.isNotBlank(beginDate)){ sql += " and po.reviewTime >= " + dateQueryAdapter.dateAdapter(beginDate + " 00:00:00"); } - if(StringUtils.isNotBlank(beginDate)){ + if(StringUtils.isNotBlank(endDate)){ sql += " and po.reviewTime <= " + dateQueryAdapter.dateAdapter(endDate + " 23:59:59"); } - if (StringUtils.isNotBlank(orgUnitCode)) { + if (StringUtils.isNotBlank(orgUnitCode)) { //本科科室的器械包实例，外部代理的器械包实例 sql += " and (po.orgUnitCoding = '" + orgUnitCode + "' or (po.orgUnitCoding != '" + orgUnitCode + "' and po.foreignProxyItem_id is not null))"; } + if (StringUtils.isNotBlank(searchKeyWord)) { //按关键字检索（器械包名称，拼音码，五笔码） + sql += " and (po.tousseName like '%" + searchKeyWord + "%' " + + "or po.tousseDefinition.spelling like '%" + searchKeyWord + "%' " + + "or po.tousseDefinition.wbCode like '%" + searchKeyWord + "%') "; + } if(sqlCondition != null){ sqlCondition.put("condition" ,sql); @@ -644,7 +657,7 @@ public List getTodayReviewedTousseInstanceWithOutBasket( String orgUnitCode) { String todayStr = DateTools.getCurrentDayByFormat("yyyy-MM-dd"); - return getAllReviewedTousseInstanceWithOutBasket(orgUnitCode , todayStr, todayStr , null , null , null); + return getAllReviewedTousseInstanceWithOutBasket(orgUnitCode , todayStr, todayStr , null , null , null , null); } /** Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js =================================================================== diff -u -r16163 -r16702 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 16163) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 16702) @@ -585,6 +585,19 @@ }); } +function search() { + var searchKeyWordReal = Ext.getCmp('searchKeyWord').getValue(); + Ext.getCmp('searchKeyWordReal').setValue(searchKeyWordReal); //把搜索的关键字保存起来 + + waitSterileLoadingTousseStore.reload({ + params : { + searchKeyWordReal : searchKeyWordReal, + start : 0, + limit : 100 + } + }); +} + Ext.onReady(function() { function showDelBtn(v,p,record) { @@ -615,17 +628,17 @@ } function renderformBtn(v,p,record){ - var total = record.statisticsTotal; - var barcode = record.data.objBarcode; - if(total != null || total > 0){ - return null; - }else{ - return ""; - } + var total = record.statisticsTotal; + var barcode = record.data.objBarcode; + if(total != null || total > 0){ + return null; + }else{ + return ""; + } -} + } //条码(首)扫描监听事件函数 function keypressBeginBarcodeCallBack(e) { @@ -1061,7 +1074,15 @@ {name: 'objBarcode'}, {name: 'reviewTime'} ] - }) + }), + listeners : { + beforeload : function (_this, options) { + var searchKeyWordRealObject = Ext.getCmp('searchKeyWordReal'); + if (searchKeyWordRealObject) { + _this.baseParams.searchKeyWordReal = searchKeyWordRealObject.getValue(); + } + } + } }); //待灭菌装载器械包信息grid的列头,根据可配置的参数进行动态定义 @@ -1075,6 +1096,13 @@ waitSterileLoadingTousseGridColumnArray.push({header: "审核时间", width: 110, sortable: true, dataIndex: 'reviewTime'}); waitSterileLoadingTousseGridColumnArray.push({header: "装载", width: 40, sortable: true, dataIndex: 'objBarcode',renderer:renderformBtn}); + var pageBar = new Ext.PagingToolbar({ + store: waitSterileLoadingTousseStore, + displayInfo: true, + pageSize:100, + displayMsg: '{0}-{1}/{2}', + emptyMsg: "没有数据" + }) waitSterileLoadingTousseGrid = new Ext.grid.GridPanel({ id : 'waitSterileLoadingTousseGrid', title : '待灭菌装载器械包信息', @@ -1089,13 +1117,37 @@ },*/ columns: waitSterileLoadingTousseGridColumnArray, sm : new Ext.grid.RowSelectionModel({singleSelect:true}), - bbar: new Ext.PagingToolbar({ - store: waitSterileLoadingTousseStore, - displayInfo: true, - pageSize:100, - displayMsg: '{0}-{1}/{2}', - emptyMsg: "没有数据" - }) + bbar: pageBar, + tbar : ['->', { + xtype : 'textfield', + name : 'searchKeyWord', + id : 'searchKeyWord', + listeners : { + specialkey : function (thisTextfield, e) { + if (e.getKey() == Ext.EventObject.ENTER) { + search(); + } + } + } + }, { + text : '搜索', + handler : function (thisButton) { + search(); + } + }, { + xtype : 'textfield', + hidden : true, + id : 'searchKeyWordReal' + }], + listeners:{ + render:function(){ + pageBar.loading.handler = function(){ //在此处重写PagingToolbar的刷新方法，清除之前的搜索条件 + Ext.getCmp('searchKeyWord').setValue(''); + Ext.getCmp('searchKeyWordReal').setValue(''); + waitSterileLoadingTousseStore.load({params:{start:0, limit:100}}); + }; + } + } }); //初始加载 waitSterileLoadingTousseStore.load({params:{start:0, limit:100}});