Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r34689 -r34695
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 34689)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 34695)
@@ -2439,15 +2439,6 @@
         if(CollectionUtils.isNotEmpty(deleteDetailIds)){
         	objectDao.excuteSQL("update " + SteriConsumeMaterialUseDetail.class.getSimpleName() + " set isDisable='是' where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", deleteDetailIds));
         }
-        /*HttpOption httpOption = null;
-        Long sterilizationPurposeId = paramObj.optLong("sterilizationPurposeId");
-        if(DatabaseUtil.isPoIdValid(sterilizationPurposeId)){
-        	httpOption = (HttpOption)objectDao.getById(HttpOption.class.getSimpleName(), sterilizationPurposeId);
-        }
-        boolean consumptionMaterialRequired = consumptionMaterialRequired(sterilizationRecord.getSterilizationPurpose(), httpOption);//灭菌目的是否需要消耗耗材
-        if(!consumptionMaterialRequired){
-        	return;
-        }*/
         JSONArray steriConsumeMaterialArr = paramObj.optJSONArray("steriConsumeMaterialArr");
         if(CollectionUtils.isEmpty(steriConsumeMaterialArr)){
         	return;
@@ -8164,29 +8155,6 @@
 				,sterilizationRecordId);
     	return sql;
 	}
-	/**
-	 * 灭菌目的是否需要消耗耗材
-	 * @param sterilizationPurpose
-	 * @param httpOption 灭菌目的
-	 * @return
-	 */
-	private boolean consumptionMaterialRequired(String sterilizationPurpose, HttpOption httpOption){
-		boolean consumptionMaterialRequired = true;//灭菌目的是否需要消耗耗材
-        if(StringUtils.isBlank(sterilizationPurpose)){
-        	consumptionMaterialRequired = false;
-        }else{
-        	if(httpOption == null){
-        		throw new RuntimeException(sterilizationPurpose + "灭菌目的异常");
-        	}
-			String sql = " select count(*) from "+ SteriliPurposeDisposableGoods.class.getSimpleName() 
-					+ " where sterilizationPurposeId="
-					+ httpOption.getId();
-			if(objectDao.countBySql(sql) == 0){
-				consumptionMaterialRequired =false;
-			}
-        }
-        return consumptionMaterialRequired;
-	}
 	@Override
 	public JSONArray getSteriConsumeMaterialUseDetailInfo(
 			SterilizationRecord sterilizationRecord, HttpOption httpOption) {
@@ -8195,34 +8163,31 @@
 			return null;
 		}
 		JSONArray steriConsumeMaterialUseRecordArr = new JSONArray();
-        //boolean consumptionMaterialRequired = consumptionMaterialRequired(sterilizationRecord.getSterilizationPurpose(), httpOption);//灭菌目的是否需要消耗耗材
-        if(true){
-    		String sql = "select bd.barcode,a.id,a.disposableGoodsId,a.disposableGoodsBatchId,a.useAmount,c.name,c.specification "
-    				+ "from SteriConsumeMaterialUseDetail a "
-    				+ "join SteriConsumeMaterialUseRecord b on b.id=a.useRecord_id "
-    				+ "join DisposableGoods c on c.id=a.disposableGoodsId "
-    				+ "join barcodeDevice bd on a.disposableGoodsBatchId=bd.id "
-    				+ "where a.isDisable='否' and b.sterilizationRecordId="
-    				+ sterilizationRecord.getId();
-    		ResultSet rs = null;
-    		try{
-    			rs = objectDao.executeSql(sql);
-    			while(rs.next()){
-    				JSONObject obj = new JSONObject();
-    				obj.put("detailId", rs.getLong("id"));
-    				obj.put("disposableGoodsId", rs.getLong("disposableGoodsId"));
-    				obj.put("disposableGoodsBatchId", rs.getLong("disposableGoodsBatchId"));
-    				obj.put("useAmount", rs.getLong("useAmount"));
-    				obj.put("specification", rs.getString("specification"));
-    				obj.put("disposableGoodsName", rs.getString("name"));
-    				obj.put("batchBarcode", rs.getString("barcode"));
-    				steriConsumeMaterialUseRecordArr.add(obj);
-    			}
-            }catch(Exception e){
-                e.printStackTrace();
-            }finally{
-            	DatabaseUtil.closeResultSetAndStatement(rs);
-            }
+		String sql = "select bd.barcode,a.id,a.disposableGoodsId,a.disposableGoodsBatchId,a.useAmount,c.name,c.specification "
+				+ "from SteriConsumeMaterialUseDetail a "
+				+ "join SteriConsumeMaterialUseRecord b on b.id=a.useRecord_id "
+				+ "join DisposableGoods c on c.id=a.disposableGoodsId "
+				+ "join barcodeDevice bd on a.disposableGoodsBatchId=bd.id "
+				+ "where a.isDisable='否' and b.sterilizationRecordId="
+				+ sterilizationRecord.getId();
+		ResultSet rs = null;
+		try{
+			rs = objectDao.executeSql(sql);
+			while(rs.next()){
+				JSONObject obj = new JSONObject();
+				obj.put("detailId", rs.getLong("id"));
+				obj.put("disposableGoodsId", rs.getLong("disposableGoodsId"));
+				obj.put("disposableGoodsBatchId", rs.getLong("disposableGoodsBatchId"));
+				obj.put("useAmount", rs.getLong("useAmount"));
+				obj.put("specification", rs.getString("specification"));
+				obj.put("disposableGoodsName", rs.getString("name"));
+				obj.put("batchBarcode", rs.getString("barcode"));
+				steriConsumeMaterialUseRecordArr.add(obj);
+			}
+        }catch(Exception e){
+            e.printStackTrace();
+        }finally{
+        	DatabaseUtil.closeResultSetAndStatement(rs);
         }
         return steriConsumeMaterialUseRecordArr;
 	}