Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r16741 -r16760 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 16741) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 16760) @@ -127,7 +127,8 @@ /*由于不追溯的器械包都会生成一个固定条码的包实例,这些包实例的operationTime都是null, 器械包信息页面oracle数据库按operationTime降排时默认null都排到最前面了,所以增加此过滤条件*/ sqlBuilder.append(" AND operationTime is not null "); - String barcodeSearch = sqlWhereParamMap.get("barcodeSearch"); + + String barcodeSearch = sqlWhereParamMap.get("barcodeSearch"); //条码(包含但不限于:器械包实例条码、标识牌) if(StringUtils.isNotBlank(barcodeSearch)){ BarcodeDevice barcodeDevice = barcodeManager .getBarcodeByBarcode(barcodeSearch); @@ -163,7 +164,7 @@ } } - String sterilizationDate = sqlWhereParamMap.get("sterilizationDate"); + String sterilizationDate = sqlWhereParamMap.get("sterilizationDate"); //灭菌开始日期 if (StringUtils.isNotBlank(sterilizationDate)) { sqlBuilder.append(String.format( " AND (%s >= %s)", @@ -173,7 +174,7 @@ } String sterilizationEndDate = sqlWhereParamMap - .get("sterilizationEndDate"); + .get("sterilizationEndDate"); //灭菌结束日期 if (StringUtils.isNotBlank(sterilizationEndDate)) { sqlBuilder.append(String.format( " AND (%s <= %s)", @@ -182,12 +183,12 @@ + " 23:59:59"))); } - String sterilizerName = sqlWhereParamMap.get("sterilizerName"); + String sterilizerName = sqlWhereParamMap.get("sterilizerName"); //灭菌炉 if (StringUtils.isNotBlank(sterilizerName)) { sqlBuilder.append(String.format(" AND po.sterilizerName = '%s'" ,sterilizerName)); } - String frequency = sqlWhereParamMap.get("frequency"); + String frequency = sqlWhereParamMap.get("frequency"); //炉次 if (StringUtils.isNotBlank(frequency)) { sqlBuilder.append(String.format(" AND po.sterileFrequency = '%s'" ,frequency)); } @@ -220,6 +221,7 @@ } + /////////////////////////////////////////////// LoginUserData userData = AcegiHelper.getLoginUser(); String currentOrgUnitCode = userData .getCurrentOrgUnitCode(); Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r16367 -r16760 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 16367) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 16760) @@ -230,6 +230,7 @@ +