Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java =================================================================== diff -u -r30709 -r30714 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 30709) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java (.../TousseInstanceTableManager.java) (revision 30714) @@ -769,6 +769,16 @@ sqlBuilder.append(String.format(" AND po.tousseDefinition.taskGroup = '%s'", taskGroup)); }*/ + // 包装类型 + String packageType = sqlWhereParamMap.get("parm_s_packageType"); + if (StringUtils.isNotBlank(packageType)) { + sqlBuilderWhere.append(String.format(" AND po.packageType = '%s'", packageType)); + } + // 灭菌方式 + String sterilingMode = sqlWhereParamMap.get("parm_s_sterilingMode"); + if (StringUtils.isNotBlank(sterilingMode)) { + sqlBuilderWhere.append(String.format(" AND po.sterilingMode = '%s'", sterilingMode)); + } String sql = sqlBuilderWhere.toString(); String jsonStr = gridManager .renderGrid(