Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r38348 -r38574 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 38348) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 38574) @@ -614,7 +614,10 @@ /*由于不追溯的器械包都会生成一个固定条码的包实例,这些包实例的operationTime都是null, 器械包信息页面oracle数据库按operationTime降排时默认null都排到最前面了,所以增加此过滤条件*/ - sqlBuilder.append(" AND operationTime is not null "); + boolean enableAnInstanceIsGeneratedAfterRecycled = ConfigUtils.getSystemSetConfigByNameBool("enableAnInstanceIsGeneratedAfterRecycled"); + if(!enableAnInstanceIsGeneratedAfterRecycled){ + sqlBuilder.append(" AND operationTime is not null "); + } //对应器械包干预审核时间页面,不显示审核时间为空的数据项 String reviewTime = sqlWhereParamMap.get("isReview"); @@ -990,6 +993,9 @@ continue; } Long id = obj.optLong("id"); + if(StringUtils.startsWith(obj.optString("barcode"), "TEMP")){ + obj.put("barcode", ""); + } if(setCodeMap != null && setCodeMap.containsKey(id)){ obj.put("setCode", setCodeMap.get(id)); }