Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r18437 -r18466 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 18437) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 18466) @@ -908,9 +908,6 @@ } } - - - TimeoutSetting timeoutSetting = timeoutManager.getTimeoutSetting(TimeoutManager.PROCEDURE_REVIEW_TO_STERILE); // 状态如果是已灭菌或者灭菌失败,就不用加载 if (StringUtils.equals(status, @@ -955,10 +952,10 @@ boolean isNotTimeout = true; boolean isBasketUrgent = false; - //灭菌筐里面器械包的全部的灭菌程序,至少要有一个是属于此灭菌分组或者此灭菌炉才会显示(没选灭菌炉就按灭菌分组过滤) + //灭菌筐里面器械包的全部的灭菌程序,至少要有一个是属于此灭菌分组或者此灭菌炉(或者至少有一个器械包的灭菌程序为“无”)才会显示(没选灭菌炉就按灭菌分组过滤) boolean flag = false; for (TousseSimpleVO vo : vos) { - if (sterilingTypeMap == null || sterilingTypeMap.get(vo.getSterilingType()) != null) { + if (sterilingTypeMap == null || "无".equals(vo.getSterilingType()) || sterilingTypeMap.get(vo.getSterilingType()) != null) { flag = true; } @@ -1010,8 +1007,8 @@ // 加载未入筐的器械包 for (TousseInstance tousseOutsideBasket : toussesOutsideBasketOfToday) { boolean isTimeout = timeoutManager.isTimeouted(tousseOutsideBasket.getReviewTime(), timeoutSetting); - //器械包的灭菌程序,属于此灭菌分组或者此灭菌炉才会显示(没选灭菌炉就按灭菌分组过滤) - if (sterilingTypeMap != null) { + //器械包的灭菌程序,属于此灭菌分组或者此灭菌炉(或者器械包的灭菌程序为“无”)才会显示(没选灭菌炉就按灭菌分组过滤) + if (sterilingTypeMap != null && !"无".equals(tousseOutsideBasket.getSterilingType())) { String sterilingTypeTemp = sterilingTypeMap.get(tousseOutsideBasket.getSterilingType()); if (sterilingTypeTemp == null) { continue;