Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r33676 -r33801 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33676) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33801) @@ -8311,9 +8311,6 @@ ClassifyBasket classifyBasket = null; TousseInstance tousseInstance = null; User user = null; - List recyclingApplications = null; - //扫描的条码是否为一级供应室条码 - boolean isOneLevelSupply = false; //根据标识牌确认器械包是否需要保养 boolean isTousseNeedMaintain = false; //扫描的条码是否为标识牌条码 @@ -8333,18 +8330,6 @@ if (orgUnit != null) { if(orgUnit.getStatus() != null && OrgUnit.STATUS_DISABLED.intValue() == orgUnit.getStatus().intValue()){ errorMessage = "【" + orgUnit.getName() + "】已经停用,请扫描其它科室条码"; - } else { - SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager - .getSupplyRoomConfigByOrgUnitCoding(orgUnit.getOrgUnitCoding()); - if (supplyRoomConfig != null - && SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM == supplyRoomConfig - .getSupplyRoomType()) { - isOneLevelSupply = true; - } else { - recyclingApplications = recyclingApplicationManager - .getUnfinishedRecyclingApplicationByDepart( - orgUnit.getName(), null); - } } } else { BarcodeDevice barcodeDevice = barcodeManager @@ -8680,8 +8665,6 @@ map.put("containerStatus", classifyBasket == null?"":classifyBasket.getContainerStatus()); map.put("tousseInstance", tousseInstance); map.put("user", buildUserJSONObjectForGetBarcodeInfo(user)); - map.put("isOneLevelSupply", isOneLevelSupply);// 是否为一级供应室 - map.put("application", recyclingApplications); boolean success = true; if(exception != null){ map.put("errorMessage", exception.getMessage());