Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
===================================================================
diff -u -r37256 -r38132
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 37256)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 38132)
@@ -88,18 +88,13 @@
 import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.vo.TousseItemVo;
-import com.forgon.log.model.Log;
-import com.forgon.log.service.LogManager;
-import com.forgon.security.model.User;
 import com.forgon.serialnumber.model.SerialNum;
-import com.forgon.tools.SpringBeanManger;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.ConfigUtils;
 import com.forgon.tools.util.ForgonDateUtils;
 import com.forgon.tools.util.PathUtils;
 import com.forgon.tools.xml.XMLUtil;
-import com.forgon.util.StringUtil;
 
 /***
  * 
@@ -1907,6 +1902,8 @@
 				obj.put("sterilizationPaperType", tdc.getSterilizationPaperType());
 			}
 		}
+		//打印配包注意事项
+		TousseInstanceUtils.setTousseDefinitionNote(objectDao, tousseInstance, obj);
 		return obj;
 	}
 	/**
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionNote.java
===================================================================
diff -u -r34226 -r38132
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionNote.java	(.../TousseDefinitionNote.java)	(revision 34226)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinitionNote.java	(.../TousseDefinitionNote.java)	(revision 38132)
@@ -7,11 +7,15 @@
 import javax.persistence.Index;
 import javax.persistence.Lob;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
+import org.apache.commons.lang.StringUtils;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.jsoup.Jsoup;
+import org.jsoup.safety.Whitelist;
 
 /**
  * 器械包定义的配包注意事项表(ZSRY-9【器械包定义】模块的“配包注意事项”控件改进为支持富文本编辑及弹窗提示方式改进)
@@ -41,6 +45,11 @@
 	 * 注意事项
 	 */
 	private String note;
+	
+	/**
+	 * 注意事项(不带html标签的注意事项文本内容，不保存到数据库)
+	 */
+	private String noteText;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -69,4 +78,16 @@
 		this.note = note;
 	}
 
+	@Transient
+	public String getNoteText() {
+		if(StringUtils.isNotBlank(note)){
+			return Jsoup.clean(note, Whitelist.none());
+		}
+		return noteText;
+	}
+
+	public void setNoteText(String noteText) {
+		this.noteText = noteText;
+	}
+
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
===================================================================
diff -u -r37472 -r38132
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java	(.../TousseInstanceUtils.java)	(revision 37472)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java	(.../TousseInstanceUtils.java)	(revision 38132)
@@ -18,11 +18,13 @@
 
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.Constants;
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinitionNote;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
@@ -637,5 +639,30 @@
 		}
 		obj.put("reduceDescription", reduce);
 		obj.put("damageDescription", damage);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static void setTousseDefinitionNote(ObjectDao objectDao, TousseInstance tousseInstance, JSONObject obj) {
+		TousseDefinition td = tousseInstance.getTousseDefinition();
+		Long ancestorTdId = null;
+		if(td.isSplit()){
+			Long parentID = td.getParentID();
+			if(parentID != null){
+				TousseDefinition parentTd = (TousseDefinition) objectDao.getById(TousseDefinition.class.getSimpleName(), parentID);
+				if(parentTd != null){
+					ancestorTdId = parentTd.getAncestorID();
+				}
+			}
+		}else{
+			ancestorTdId = td.getAncestorID();
+		}
+		String noteText = "";
+		if(ancestorTdId != null){
+			List<TousseDefinitionNote> noteList = objectDao.findByProperty(TousseDefinitionNote.class.getSimpleName(), "tousseDefinitionId", ancestorTdId);
+			if(CollectionUtils.isNotEmpty(noteList)){
+				noteText = noteList.get(0).getNoteText();
+			}
+		}
+		obj.put("noteText", noteText);
 	} 
 }