Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java =================================================================== diff -u -r13792 -r13934 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 13792) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java (.../RecyclingRecordListSqlGenerator.java) (revision 13934) @@ -55,14 +55,15 @@ JSONObject dateRange = jsonObj.optJSONObject("recyclingDateRange"); String dateRangeSql = buildDateRangeSql(dateRange); String idCardBarcodeStr = JSONUtil.optString(jsonObj, "idCardBarcode", null); + String tousseInstanceBarcodeStr = JSONUtil.optString(jsonObj, "tousseInstanceBarcode", null); Map map = new HashMap(); map.put(recyclingRecordPoName + ".departCode", departCodes); map.put(recyclingRecordPoName + ".operator", userNames); map.put(recyclingRecordPoName + ".status", status); map.put(invoicePlanPoName + ".type", appType); - return buildRecyclingRecordFilterSql(map) + " and " + dateRangeSql + " and " + buildIdCardBarcodeSql(idCardBarcodeStr); + return buildRecyclingRecordFilterSql(map) + " and " + dateRangeSql + " and " + buildIdCardBarcodeSql(idCardBarcodeStr) + " and " + bulidTousseInstanceBarcodeSql(tousseInstanceBarcodeStr); } private String buildRecyclingRecordFilterSql(Map propertyValues){ String ret = " (1=1) "; @@ -88,6 +89,16 @@ return sql; } + private String bulidTousseInstanceBarcodeSql(String tousseInstanceBarcode){ + String sql = " (1=1) "; + if(StringUtils.isNotBlank(tousseInstanceBarcode)){ + sql = invoicePlanPoName + + ".id in (select distinct id from RecyclingApplication where tousseBarcodes like '%" + + tousseInstanceBarcode + "%') "; + } + return sql; + } + private String buildDateRangeSql(JSONObject dateRange){ String ret = " (1=1) "; if(dateRange != null){ Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r13872 -r13934 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 13872) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 13934) @@ -222,6 +222,7 @@ String departMent = ""; String orgUnitCoding = ""; boolean isIdCardBarcode = false; + boolean isTousseInstanceBarcode = false; String barcodeStr = StrutsParamUtils.getPraramValue("barcode",null); BarcodeDevice barcodeDevice = barcodeManager .getBarcodeByBarcode(barcodeStr); @@ -232,6 +233,7 @@ // 是否器械包实例 if (barcodeDevice instanceof TousseInstance) { tousseInstance = (TousseInstance) barcodeDevice; + isTousseInstanceBarcode = true; } // 是否器械包标识牌实例 else if (barcodeDevice instanceof IDCardInstance) { @@ -295,6 +297,7 @@ jsonObject.put("departMent", departMent); jsonObject.put("orgUnitCoding", orgUnitCoding); jsonObject.put("isIdCardBarcode", isIdCardBarcode); + jsonObject.put("isTousseInstanceBarcode", isTousseInstanceBarcode); String result = jsonObject.toString(); StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js =================================================================== diff -u -r13744 -r13934 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js (.../recycleRecordFilterManager.js) (revision 13744) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/recycleRecordFilterManager.js (.../recycleRecordFilterManager.js) (revision 13934) @@ -16,6 +16,8 @@ var recyclingDateRange = ''; //标识牌条码 var idCardBarcode = ''; + //普通器械包条码 + var tousseInstanceBarcode = ''; //设置过滤的科室,返回条件表示是否有修改 this.selectDepart = function(name,code){ @@ -122,6 +124,15 @@ return false; } + this.selectTousseInstanceBarcode = function(barcode){ + tousseInstanceBarcode = CookieManager.getCookie('tousseInstanceBarcode'); + if(barcode.length > 0 && tousseInstanceBarcode.indexOf(barcode) == -1){ + CookieManager.setCookie('tousseInstanceBarcode',barcode); + return true; + } + return false; + } + this.getFilter = function(){ var filter = '{'; departCode = CookieManager.getCookie('departCode'); @@ -169,6 +180,14 @@ filter += '"idCardBarcode":'; filter += '"' + idCardBarcode + '"'; } + tousseInstanceBarcode = CookieManager.getCookie('tousseInstanceBarcode'); + if(tousseInstanceBarcode.length > 0){ + if(filter.length > 1){ + filter += ','; + } + filter += '"tousseInstanceBarcode":'; + filter += '"' + tousseInstanceBarcode + '"'; + } filter += '}'; return filter; } @@ -196,6 +215,11 @@ CookieManager.deleteCookie('idCardBarcode'); ret = true; } + tousseInstanceBarcode = CookieManager.getCookie('tousseInstanceBarcode'); + if(tousseInstanceBarcode.length > 0){ + CookieManager.deleteCookie('tousseInstanceBarcode'); + ret = true; + } return ret; } function resetUser(){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r13863 -r13934 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 13863) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 13934) @@ -742,6 +742,8 @@ }else{ if(msg.isIdCardBarcode){ selectIdCardBarcode(barcode); + }else if(msg.isTousseInstanceBarcode){ + selectTousseInstanceBarcode(barcode); } //省医不需要标识牌提示 if("该标识牌没有器械包装配记录!(即没有关联的器械包实例)" != msg.message){ @@ -930,6 +932,11 @@ firstPage(); } } +function selectTousseInstanceBarcode(barcode){ + if(recycleRecordFilterManager.selectTousseInstanceBarcode(barcode)){ + firstPage(); + } +} function filterApplicationType(){ openSelect('选择申请单类型','selectApplicationType.jsp'); }