Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r37782 -r37799 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 37782) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 37799) @@ -6975,7 +6975,8 @@ // 遍历加载放入灭菌篮筐的器械包 boolean enableUrgentFunction = CssdUtils.getSystemSetConfigByNameBool("enableUrgentFunction",false); boolean openGoodsSearch = getOpenGoodsSearchOfExtraActionItemsOfItemsToBeSterilized(); - Map> tousseSimpleVOMap = getTousseInstanceVOsInReviewedBaskets(reviewedBaskets, taskGroup, extraOrder, sterilingMode, sterilizerNameTemp, sterileFrequency, enableUrgentFunction, openGoodsSearch); + boolean enableSterilizersAndFrequencyFilterToSterilizeItems = CssdUtils.getSystemSetConfigByNameBool("enableSterilizersAndFrequencyFilterToSterilizeItems", false); + Map> tousseSimpleVOMap = getTousseInstanceVOsInReviewedBaskets(reviewedBaskets, taskGroup, extraOrder, sterilingMode, enableSterilizersAndFrequencyFilterToSterilizeItems?sterilizerNameTemp:null, enableSterilizersAndFrequencyFilterToSterilizeItems?sterileFrequency:null, enableUrgentFunction, openGoodsSearch); for (ReviewedBasket basket : reviewedBaskets) { List vos = tousseSimpleVOMap.get(basket.getId()); if(CollectionUtils.isEmpty(vos)){ @@ -7136,7 +7137,7 @@ //2、 当天审核的,未入筐的器械包 //List toussesOutsideBasketOfToday = getTodayReviewedTousseInstanceWithOutBasket(orgUnitCoding); //当天审核的,未入筐的器械包(新) :包括固定条码汇总 - List toussesOutsideBasketOfToday = getTodayReviewedTousseInsWithOutBasketBySterilization(orgUnitCoding, enableUrgentFunction, extraOrder, sterilingMode, sterilizerNameTemp, sterileFrequency, openGoodsSearch); + List toussesOutsideBasketOfToday = getTodayReviewedTousseInsWithOutBasketBySterilization(orgUnitCoding, enableUrgentFunction, extraOrder, sterilingMode, enableSterilizersAndFrequencyFilterToSterilizeItems?sterilizerNameTemp:null, enableSterilizersAndFrequencyFilterToSterilizeItems?sterileFrequency:null, openGoodsSearch); for (TousseSimpleVO tousseOutsideBasket : toussesOutsideBasketOfToday) { //器械包的灭菌程序,属于此灭菌分组或者此灭菌炉(或者器械包的灭菌程序为“无”)才会显示(没选灭菌炉就按灭菌分组过滤) if (sterilingTypeMap != null && !Constants.HAS_TYPE_NO.equals(tousseOutsideBasket.getSterilingType())) {