Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r12553 -r12580
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 12553)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 12580)
@@ -112,6 +112,8 @@
 	public static final String STR_YES = "是";
 	public static final String STR_NO = "否";
 	
+	private String isApplyEntireTousse = STR_NO;//是否整包申请（只针对消毒物品）
+	
 	private String isRecycling = STR_YES;//是否回收
 	
 	private String isPacking = STR_YES;//是否装配
@@ -177,6 +179,8 @@
 	private Long tousseGroupID;	// 器械包分组id
 	private String tousseGroupName;// 器械包分组名字
 	
+	private Long recyclingApplicationID;
+	
 	/**
 	 * 是否特殊器械包(是否或,为空默认为否),中大六院项目新增的字段,其它医院暂时不用
 	 */
@@ -761,7 +765,15 @@
 	public void setIsPecPack(String isPecPack) {
 		this.isPecPack = isPecPack;
 	}
+	
+	public String getIsApplyEntireTousse() {
+		return isApplyEntireTousse;
+	}
 
+	public void setIsApplyEntireTousse(String isApplyEntireTousse) {
+		this.isApplyEntireTousse = isApplyEntireTousse;
+	}
+
 	public Long getParentID() {
 		return parentID;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
===================================================================
diff -u -r12531 -r12580
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 12531)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 12580)
@@ -21,6 +21,7 @@
 
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
+import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.cleanmethod.CleanMethod;
 import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
@@ -35,6 +36,7 @@
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.vo.TousseItemVo;
 import com.forgon.serialnumber.model.SerialNum;
+import com.forgon.tools.Path;
 import com.forgon.tools.hibernate.ObjectDao;
 
 /***
@@ -47,6 +49,41 @@
 	
 	private static Properties prop = null;
 	
+	
+	public static String getDiposableGoodsName(DiposableGoods dg) {
+		if (dg != null) {
+			String name = dg.getName();
+			if (StringUtils.isNotBlank(dg.getSpecification())) {
+				name += "[" + dg.getSpecification() + "]";
+			}
+			return name;
+		}
+		return null;
+	}
+	
+	/**
+	 * 获取config.js内容
+	 * 使用先决条件是要去掉config.js中的中文注释，不然转json会报错
+	 */
+	public static JSONObject getWebConfigInfo(){
+		try {
+			String rootPath = Path.getWebAppRoot();
+			String project = getConfigProperty("project");
+			String configPath = rootPath + "/disinfectsystem/config/" + project
+					+ "/config.js";
+			String jsonStr = CssdUtils.readFile(configPath);
+			if (StringUtils.isNotBlank(jsonStr)) {
+				int startIndex = jsonStr.indexOf("{");
+				int endIndex = (jsonStr.lastIndexOf("}") + 1);
+				if (startIndex != -1 && endIndex != -1 && startIndex < endIndex) {
+					jsonStr = jsonStr.substring(startIndex, endIndex);
+					return JSONObject.fromObject(jsonStr);
+				}
+			}
+		} catch (Exception e) {}
+		return null;
+	}
+	
 	// 判断用户名是否为条形码编码
 	public static boolean usernameIsBarcode(String username) {
 		return username.matches("^[0-9]{9}$");
@@ -149,9 +186,22 @@
 			int begin = index2 + 1;
 			name = name.substring(begin, name.length());
 		}
+		
+		name = filterUnderScoreName(name);
+		
 		return name;
 	}
 
+	// 过滤名字中的下划线
+	public static String filterUnderScoreName(String name) {
+		int pos2 = name.lastIndexOf("_");
+		if (pos2 != -1) {
+			name = name.substring(0, pos2);
+		}
+		return name;
+	}
+	
+	
 	public static String getMaterialsStr(TousseDefinition td) {
 		String materialStr = "";
 		
@@ -344,13 +394,13 @@
 	    return names;
 	}
 
-	public static JSONObject getTousseObjForPrint(String tousseName,
+	public static JSONObject getTousseObjForPrint(String tousseName,JSONObject tdJson,
 			JSONArray barcodeArray, JSONArray virtualSeqNumArray, String tousseType, String packageType,
 			String sterilingType, String sterilizerName, String sterileFrequency, boolean isPrintUserName, String operator,
 			String operatorCode, String reviewer, String reviewerCode,
-			String validUntilDateToPrint, String sterileDateToPrint,Date operationTime,
+			String validUntilDateToPrint, String sterileDateToPrint,boolean markTousse, Date operationTime,
 			boolean isDisinfectionGoods,
-			boolean isDisinfectionGoodsPrintExpirationDate, boolean isPrint,
+			boolean isDisinfectionGoodsPrintExpirationDate, boolean isPrint, boolean isReview,
 			boolean isTraceable, String bigPackage, String fixedBarcode,
 			JSONArray materialsJsonArray, long foreignTousseApp_id,
 			String supplierName, int toolAmount, int implantAmount, String department, boolean isPrintOrg,ObjectDao objectDao) {