Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
===================================================================
diff -u -r16164 -r16167
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java	(.../TousseDefinitionHelper.java)	(revision 16164)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java	(.../TousseDefinitionHelper.java)	(revision 16167)
@@ -49,7 +49,8 @@
      * @param tousseDefinition 要过滤的物品po
      * @return 过滤好的结果
      */
-    public Map<String, Object> filterResultByTousseType(String tousseType, TousseDefinition tousseDefinition) {
+    @Deprecated
+/*    public Map<String, Object> filterResultByTousseType(String tousseType, TousseDefinition tousseDefinition) {
         Map<String, Object> map = null;
         Double price = tousseDefinition.getPrice();
         //如果类型为消毒物品,则只保留类型为消毒物品的数据
@@ -68,9 +69,15 @@
         //如果类型为组合申请单或者器械包申请单,则保留类型为器械包,消毒物品,敷料包(组合申请单后面会添加一次性物品,器械包申请单则不会)
         else if ("combo".equals(tousseType) || TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseType)) {
             String type = tousseDefinition.getTousseType();
-            if (tousseDefinition.PACKAGE_TYPE_INSIDE.equals(type) || TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(type) || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(type)) {
+            //器械包和敷料包
+            if (tousseDefinition.PACKAGE_TYPE_INSIDE.equals(type)  || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(type)) {
                 map = this.setReturnResult(tousseDefinition, price);
             }
+            //消毒物品
+            else if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(type)){
+                price = tousseDefinitionManager.getDisinfectGoodsPrice(tousseDefinition);
+                map = this.setReturnResult(tousseDefinition, price);
+            }
         }
         //如果器械包分组为专科器械组,则只保留类型为专科器械组的数据
         else if (TousseDefinition.TOUSSE_GROUP_SPECIALIZED_INSTRUMENT.equals(tousseType)) {
@@ -82,7 +89,7 @@
             map = this.setReturnResult(tousseDefinition, price);
         }
         return map;
-    }
+    }*/
     
     public Map<String, Object> filterResultByTousseType2(String tousseType, TousseDefinition tousseDefinition) {
         Map<String, Object> map = null;
@@ -98,11 +105,22 @@
         }
         //如果类型为组合申请单或者器械包申请单,则保留类型为器械包,消毒物品,敷料包(组合申请单后面会添加一次性物品,器械包申请单则不会)
         else if ("combo".equals(tousseType) || TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseType)) {
-        	map = this.setReturnResult(tousseDefinition, price);
+            String type = tousseDefinition.getTousseType();
+            //器械包和敷料包
+            if (tousseDefinition.PACKAGE_TYPE_INSIDE.equals(type)  || TousseDefinition.PACKAGE_TYPE_DRESSING.equals(type)) {
+                map = this.setReturnResult(tousseDefinition, price);
+            }
+            //消毒物品
+            else if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(type)){
+                price = tousseDefinitionManager.getDisinfectGoodsPrice(tousseDefinition);
+                map = this.setReturnResult(tousseDefinition, price);
+            }
         }
         //如果器械包分组为专科器械组,则只保留类型为专科器械组的数据
         else if (TousseDefinition.TOUSSE_GROUP_SPECIALIZED_INSTRUMENT.equals(tousseType)) {
-        	map = this.setReturnResult(tousseDefinition, price);
+            if (TousseDefinition.TOUSSE_GROUP_SPECIALIZED_INSTRUMENT.equals(tousseDefinition.getTousseGroupName())) {
+                map = this.setReturnResult(tousseDefinition, price);
+            }
         }
         else {
             map = this.setReturnResult(tousseDefinition, price);