Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r35716 -r35717
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 35716)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 35717)
@@ -1875,7 +1875,7 @@
 					}
 				} else {
 					vo.setAmount(vo.getAmount() + task.getUnPackAmount());
-					Integer urgentAmount = vo.getUrgentAmount() == null ? 0 : vo.getUrgentAmount();
+					Integer urgentAmount = vo.getUrgentAmount() == null ? Integer.valueOf(0) : vo.getUrgentAmount();
 					
 					if(task.getUrgentAmount() != null){
 						vo.setUrgentAmount(urgentAmount + task.getUrgentAmount());
@@ -2185,7 +2185,6 @@
 					if(StringUtils.isBlank(fta.getPatient())){
 						continue;
 					}
-					ip.getPatient();
 					invoicePlanIDToPatient.put(ip.getId(), fta.getPatient());
 				}
 			}
@@ -2210,7 +2209,7 @@
 					}
 					Integer totalAmount = 0;
 					for(ClassifiedItem ci : classifyBasket.getClassfiedItems()){
-						Integer numOfUnwashedStops = ci.getNumOfUnwashedStops()==null?0:ci.getNumOfUnwashedStops();
+						Integer numOfUnwashedStops = ci.getNumOfUnwashedStops()==null?Integer.valueOf(0):ci.getNumOfUnwashedStops();
 						totalAmount += ci.getAmount() - numOfUnwashedStops;
 					}
 					sbf.append(classifyBasket.getContainerName())
@@ -2569,12 +2568,10 @@
 			if(basket == null){
 				return null;// 未找到篮筐，异常情况
 			}
-			if (basket != null) {
-				String status = basket.getStatus();
-				if (Container.CONTAINER_STATUS_WASHLOADING.equals(status)
-						|| Container.CONTAINER_STATUS_WASHING.equals(status)) {
-					return null;
-				}
+			String status = basket.getStatus();
+			if (Container.CONTAINER_STATUS_WASHLOADING.equals(status)
+					|| Container.CONTAINER_STATUS_WASHING.equals(status)) {
+				return null;
 			}
 			sql += " and po.basketBarcode like '%" + basketBarcode + "%' ";
 		}
@@ -2763,19 +2760,15 @@
 				if(SqlUtils.isExistColumn(rs, "recyclingUser")){
 					task.setRecyclingUser(rs.getString("recyclingUser"));
 				}
-				if(enableUrgentFunction){
-					try {
-						Long urgentLevelId = rs.getLong("urgentLevelId");
-						if(urgentLevelId != null){
-							UrgentLevel ul = new UrgentLevel();
-							ul.setColorCode(rs.getString("colorCode"));
-							ul.setName(rs.getString("urgentLevelName"));
-							ul.setGrade(rs.getInt("grade"));
-							ul.setId(urgentLevelId);
-							task.setUrgentLevelObj(ul);
-						}
-					} catch (Exception e) {//如果没有urgentLevelId,不需要打印错误信息
-						//e.printStackTrace();
+				if(enableUrgentFunction && SqlUtils.isExistColumn(rs,"urgentLevelId")){
+					Long urgentLevelId = rs.getLong("urgentLevelId");
+					if(urgentLevelId != null){
+						UrgentLevel ul = new UrgentLevel();
+						ul.setColorCode(rs.getString("colorCode"));
+						ul.setName(rs.getString("urgentLevelName"));
+						ul.setGrade(rs.getInt("grade"));
+						ul.setId(urgentLevelId);
+						task.setUrgentLevelObj(ul);
 					}
 				}
 				task.setSerialNumber(rs.getString("serialNumber"));
@@ -3015,11 +3008,11 @@
 		JSONObject json = new JSONObject();
 		JSONArray toussesArray = new JSONArray();
 		JSONArray logTousseArray = new JSONArray();
-		List<Long> ids = new ArrayList<Long>();
+		List<String> ids = new ArrayList<String>();
 		String[] tids = StringUtils.split(idsStr, ';');
 		for (String id : tids){
 			if (StringUtils.isNumeric(id)){
-				ids.add(new Long(id));
+				ids.add(id);
 			}
 		}
 		// 根据页面传过来的器械包的id集合，查找待审核的器械包，并且只找状态为待审核的包，避免重复审核
@@ -4104,7 +4097,7 @@
 			tousse.put("sterilizerName", sterilizer);
 			tousse.put("sterileFrequency", frequency);
 			tousse.put("barcode", tousseInstance.getBarcode());
-			tousse.put("foreignTousseApp_id", tousseInstance.getForeignTousseApp_id().longValue());
+			tousse.put("foreignTousseApp_id", tousseInstance.getForeignTousseApp_id());
 			tousse.put("supplierName", tousseInstance.getTousseDefinition().getSupplierName());
 			tousse.put("washOperator", tousseInstance.getWashOperator());
 			tousse.put("washOperatorCode", tousseInstance.getWashOperatorCode());
@@ -4725,7 +4718,7 @@
 			List<Long> ids = new ArrayList<Long>();
 			for (String id : idsStr){
 				if (StringUtils.isNumeric(id)){
-					Long lid = new Long(id);
+					Long lid = Long.valueOf(id);
 					if(ids.contains(lid)){
 						continue;
 					}
@@ -8091,9 +8084,7 @@
 					}
 					Long packignRecordId = null;
 					if(packingRecord != null){
-						List<Long> packingRecordIdList = new ArrayList<Long>();
 						packignRecordId = packingRecord.getId();
-						packingRecordIdList.add(packignRecordId);
 						IDCardInstance idCardInstance = idCardInstanceManager.getIDCardInstanceByID(idCardInstanceId);
 						if(enableInstrumentLifeCycleTraceabilityManagement && idCardInstance != null){
 							List<IDCardInstance> addIdCardInstanceList  = new ArrayList<IDCardInstance>();