Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java =================================================================== diff -u -r14020 -r14031 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 14020) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 14031) @@ -11,8 +11,13 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.Map.Entry; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -25,6 +30,8 @@ import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; +import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; +import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; @@ -538,7 +545,47 @@ return PackingMap; } + + @SuppressWarnings("unchecked") + public String findPendingBasket(String departCoding, String currentPage, + String pageSize) { + + String amountSql = "select po from " + ClassifyBasket.class.getSimpleName() + " po "; + String sql = " left join po.washAndDisinfectRecords wr where wr is null"; + + List totalBaskets = objectDao.findByHql(amountSql + sql); + + List tasksList = objectDao.findBySql( + ClassifyBasket.class.getSimpleName(), sql, Integer.parseInt(currentPage), Integer.parseInt(pageSize), null); + int totalCount; + if(totalBaskets != null) + { + totalCount = totalBaskets.size(); + }else{ + totalCount = 0; + } + JSONObject jsonObj = new JSONObject(); + JSONArray basketArray = new JSONArray(); + if( tasksList != null && CollectionUtils.isNotEmpty(tasksList)){ + for (ClassifyBasket basket : tasksList) { +// List rrs = basket.getRecyclingRecords(); +// String containName = basket.getContainerName(); + Set items = basket.getClassfiedItems(); + + JSONObject basketObj = new JSONObject(); + basketObj.put("containerName", basket.getContainerName()); + basketObj.put("containerBarcode", basket.getContainerBarcode()); + basketObj.put("unWashAmount", items.size()); + basketArray.add(basketObj); + } + jsonObj.put("totalPendgingBasketAount", totalCount); + jsonObj.put("totalCount", totalCount); + jsonObj.put("data", basketArray); + } + return jsonObj.toString(); + } + @SuppressWarnings("unchecked") public Map findUnReview(String departCoding, String currentPage, String pageSize, String tousseName,String type,String tousseType) {