Index: ssts-web/src/main/webapp/systemmanage/operationNameView.js
===================================================================
diff -u -r16920 -r17211
--- ssts-web/src/main/webapp/systemmanage/operationNameView.js	(.../operationNameView.js)	(revision 16920)
+++ ssts-web/src/main/webapp/systemmanage/operationNameView.js	(.../operationNameView.js)	(revision 17211)
@@ -577,13 +577,19 @@
     function gotoPage(v, p, record){
     	///userForm.mhtml
     	var id = record.get("id");
+    	var tousseItemsString = record.get("tousseItemsString");
+    	if(!tousseItemsString || tousseItemsString == '无'){
+    		v = "<p style=\"background-color:yellow\">" + v + "|[器械包:无]</p>";
+    	}else{
+    		v = "<p style=\"background-color:white\">" + v + "|[器械包:"+ tousseItemsString +"]</p>";
+    	}
     	return "<a href='#' onclick='setOperationUseTousse(" + id + ");return false;' >" + v + "</a>";
     }
 
     
     //Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
     var columns = [
-        {header: "手术名称", width: 300, dataIndex: 'operationName', renderer : gotoPage},
+        {header: "手术名称|器械包", width: 300, dataIndex: 'operationName', renderer : gotoPage},
         {header: "拼音码", width: 200, dataIndex: 'spelling'},
         {id:'operationDescription',header: "五笔码", width: 200, dataIndex: 'wbCode'}
     ];
@@ -592,6 +598,7 @@
     var readerDetail = [
         {name: 'id'},
         {name: 'operationName'},
+        {name: 'tousseItemsString'},
         {name: 'spelling'},
         {name: 'wbCode'},
         {name: 'orgUnitCoding'}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java
===================================================================
diff -u -r15387 -r17211
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java	(.../OperationName.java)	(revision 15387)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/operationNameManager/OperationName.java	(.../OperationName.java)	(revision 17211)
@@ -14,6 +14,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
@@ -42,7 +43,12 @@
 	 * 手术使用到的器械包
 	 */
 	private List<OperationUseTousseItem> tousseItems = new ArrayList<OperationUseTousseItem>();
-
+	
+	/**
+	 * 手术使用到的器械包(按数量+名称的方式进行拼接),不映射到数据库
+	 */
+	private String tousseItemsString;
+	
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -94,6 +100,30 @@
 
 	public void setTousseItems(List<OperationUseTousseItem> tousseItems) {
 		this.tousseItems = tousseItems;
+		setTousseItemsString();
 	}
+
+	/**
+	 * 手术使用到的器械包(按数量+名称的方式进行拼接)
+	 * @return
+	 */
+	@javax.persistence.Transient
+	public String getTousseItemsString() {
+		return tousseItemsString;
+	}
 	
+	public void setTousseItemsString() {
+		if(CollectionUtils.isNotEmpty(tousseItems)){
+			tousseItemsString = "";
+			for(OperationUseTousseItem item : tousseItems){
+				if(tousseItemsString.length() >= 30){
+					tousseItemsString += "...";
+					break;
+				}
+				tousseItemsString += item.getName() + " * " + item.getAmount() + ";";
+			}
+		}else{
+			tousseItemsString = "无";
+		}
+	}
 }