Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java
===================================================================
diff -u -r15383 -r15563
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java	(.../TousseDefinitionHelper.java)	(revision 15383)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionHelper.java	(.../TousseDefinitionHelper.java)	(revision 15563)
@@ -65,6 +65,13 @@
                 map = this.setReturnResult(tousseDefinition, price);
             }
         }
+        //如果类型为组合申请单,则保留类型为器械包,消毒物品,敷料包
+        else if ("combo".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)) {
+                map = this.setReturnResult(tousseDefinition, price);
+            }
+        }
         //如果器械包分组为专科器械组,则只保留类型为专科器械组的数据
         else if (TousseDefinition.TOUSSE_GROUP_SPECIALIZED_INSTRUMENT.equals(tousseType)) {
             if (TousseDefinition.TOUSSE_GROUP_SPECIALIZED_INSTRUMENT.equals(tousseDefinition.getTousseGroupName())) {
@@ -102,6 +109,9 @@
             case InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM:
                 goodType = TousseItem.TYPE_DIPOSABLE_GOODS;
                 break;
+            case InvoicePlan.TYPE_COMBO_FORM:
+                goodType = "combo";
+                break;
         }
         return goodType;
     }
@@ -152,6 +162,15 @@
         map.put("tousseType", tousseDefinition.getTousseType());
         map.put("type", tousseDefinition.getTousseType());
         map.put("unit", tousseDefinition.getUnit());
+        map.put("isApplyEntireTousse", tousseDefinition.getIsApplyEntireTousse());
+        String isThereIdentificationCard = "否";
+        if ("否".equals(tousseDefinition.getIsDisableIDCard())) {
+            isThereIdentificationCard = "是";
+        }
+        map.put("isThereIdentificationCard", isThereIdentificationCard);
+        if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition.getTousseType())) {
+            map.put("materials", tousseDefinitionManager.getMaterialsOfDisinfectionGoods(tousseDefinition, true).toString());
+        }
         return map;
     }
 
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r15493 -r15563
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 15493)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 15563)
@@ -22,6 +22,7 @@
 import javax.servlet.http.HttpSession;
 
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionHelper;
+import com.forgon.tools.util.GetJsonUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
@@ -1492,7 +1493,7 @@
 			}
 			
 			
-			//如果处理科室编码不为空且类型不为一次性物品,则进行过滤
+			//如果处理科室编码不为空则进行过滤
 			if(StringUtils.isNotBlank(cssdOrgUnitCode)){
 				List<Map<String , Object>> mapList = new ArrayList<Map<String,Object>>();
 				//如果不为一次性物品,则先查出器械包.
@@ -1505,18 +1506,7 @@
 					if(CollectionUtils.isNotEmpty(tousseDefinitiionList)){
 						for(TousseDefinition tousseDefinition : tousseDefinitiionList){
 							Map<String , Object> map = tousseDefinitionHelper.filterResultByTousseType(tousseType,tousseDefinition);
-
 							if(map != null){
-								map.put("isApplyEntireTousse", tousseDefinition.getIsApplyEntireTousse());
-								String isDisableIDCard =  tousseDefinition.getIsDisableIDCard();
-								String isThereIdentificationCard = "否";
-								if("否".equals(isDisableIDCard)){
-									isThereIdentificationCard = "是";
-								}
-								map.put("isThereIdentificationCard", isThereIdentificationCard);
-								if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition.getTousseType())){
-									map.put("materials", tousseDefinitionManager.getMaterialsOfDisinfectionGoods(tousseDefinition, true).toString());
-								}
 								mapList.add(map);
 							}
 						}
@@ -1527,8 +1517,8 @@
 							spell, false, false, false,false,showReferencePrice,"1","0",false,showExternalCodeOfDisposableGoods,cssdOrgUnitCode);
 				}
 				
-				//如果为空则需要再查出一次性物品并追加
-				if(StringUtils.isBlank(tousseType)){
+				//如果申请单类型为组合申请单,则需要再查询一次性物品出来和上面的器械包物品合并
+				if("combo".equals(tousseType)){
 					mapList.addAll(tousseDefinitionManager.searchTousseOrDiposableGoodsBySpellAndWbCode(
 							spell, false, false, false,false,showReferencePrice,"1","0",false,showExternalCodeOfDisposableGoods,cssdOrgUnitCode));
 				}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r15410 -r15563
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 15410)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 15563)
@@ -108,7 +108,7 @@
 	public static final String PACKAGE_TYPE_INSIDE = "器械包";
 	public static final String PACKAGE_TYPE_INSIDE_AND_DISINFECTION = "器械包与消毒物品";//器械包(含敷料包和消毒物品)
 	public static final String PACKAGE_TYPE_CAN_CUSTOM_PACKING = "允许自定义装配的器械包";
-	public static final String PACKAGE_TYPE_INSIDE_AND_DRESSING = "器械包与敷料包";//器械包(含敷料包和消毒物品)
+	public static final String PACKAGE_TYPE_INSIDE_AND_DRESSING = "器械包与敷料包";
 	public static final String PACKAGE_TYPE_FOREIGN = "外来器械包";
 	public static final String PACKAGE_TYPE_SPLIT = "外来器械拆分小包";
 	public static final String PACKAGE_TYPE_FOREIGNPROXY = "外部代理灭菌";