Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r32089 -r32111 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 32089) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 32111) @@ -3069,6 +3069,17 @@ } // 长沙中心医院的回收单打印处理逻辑 + /** + * + * @param departType 查询界面上所选择的所属科室 + * @param voList + * @param disinfectionGoodsList + * @param recyclingRecords + * @param departTousseMap + * @param taskGroups + * @param tousseGroupIds + * @return + */ private int changshaZhongxingHospitalProcess(String departType, List voList, List disinfectionGoodsList, @@ -3117,6 +3128,8 @@ String tousseName = tousseItem.getTousseName(); TousseDefinition td = tousseDefinitionManager .getTousseDefinitionByName(tousseName); + + // 是否属于被查询的包,即需要打印到回收清单表格上的包 boolean isQueryPackage = false; if (td != null){ @@ -3130,13 +3143,16 @@ continue; } } - // 资产归属 + // 资产归属,或者包定义的资产归属属性的值 String assetsBelong = td.getAssetsBelong(objectDao); + // 界面所选择的所属科室为供应室 if(gys.equals(departType)){ if(StringUtils.isBlank(assetsBelong) || supplyRoomNameSet.contains(assetsBelong)){ isQueryPackage = true; } - }else if(sss.equals(departType) && sss.equals(assetsBelong)){ + } + // 界面所选择的所属科室为手术室,并且包定义的资产归属属性也为手术室 + else if(sss.equals(departType) && sss.equals(assetsBelong)){ isQueryPackage = true; } if (isQueryPackage) {