Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r18601 -r18775
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 18601)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 18775)
@@ -16,6 +16,7 @@
 		   {name: 'tousseName'},
 		   {name: 'amount'},
 		   {name: 'depart'},
+		   {name: 'formType'},
 		   {name: 'applicationTime'},
 		   {name: 'submitTime'},
 		   {name: 'departCoding'},
@@ -46,6 +47,9 @@
 function renderCallRecyclingApplicationShowFun(v, p, record){
 	var applicationID = record.data['id'];
 	if(applicationID != null && applicationID != "" && applicationID !== 'null'){
+		if (record.data['formType'] === '通用申请单'){
+            return "<a href=\"#\" onclick=\"showRecyclingApplication('"+applicationID+"','通用申请单','"+record.data['applicationTime']+"','"+record.data['depart']+"','"+record.data['departCoding']+"','"+record.data['serialNumber']+"','"+record.data['applicant']+"','"+record.data['settleAccountsDepart']+"','"+record.data['remark']+"');return false;\">"+record.data['tousseName']+"</a>";
+        }
 		if(record.data['diposable'] == '否'){
 			return "<a href=\"#\" onclick=\"showRecyclingApplication('"+applicationID+"','器械包申请单','"+record.data['applicationTime']+"','"+record.data['depart']+"','"+record.data['departCoding']+"','"+record.data['serialNumber']+"','"+record.data['applicant']+"','"+record.data['settleAccountsDepart']+"','"+record.data['remark']+"');return false;\">"+record.data['tousseName']+"</a>";
 		}else{
@@ -455,6 +459,7 @@
 	    	 {header : "器械包名称",width : 180,dataIndex : 'tousseName', renderer : renderCallRecyclingApplicationShowFun},
 	    	 {header : "申请数量",width : 60,dataIndex : 'amount'}, 
 	    	 {header : "回收数量",width : 60,dataIndex : 'recyclingAmount'}, 
+	    	 {header : "申请单类型",width : 180,dataIndex : 'formType', hidden : true},
 	    	 {header : "回收清洗筐",width : 240,dataIndex : 'basketName'},
 			 {header : "加急数量",width : 110,dataIndex : 'urgentAmount',hidden:sstsConfig.isHideUrgentAmount === undefined || sstsConfig.isHideUrgentAmount},
 			 {header : "发货数量",width : 110,dataIndex : 'sendOutAmount'},
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java
===================================================================
diff -u -r18201 -r18775
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java	(.../TousseOperate.java)	(revision 18201)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java	(.../TousseOperate.java)	(revision 18775)
@@ -59,6 +59,11 @@
 	 */
 	private BigDecimal tousseDefinitionId;
 
+	/**
+	 * 申请单的类型
+	 */
+	private String formType;
+
 	public TousseOperate() {
 	}
 
@@ -364,6 +369,14 @@
 		this.tousseDefinitionId = tousseDefinitionId;
 	}
 
+	public String getFormType() {
+		return formType;
+	}
+
+	public void setFormType(String formType) {
+		this.formType = formType;
+	}
+
 	@Override
 	public String toString() {
 		return "TousseOperate{" +
@@ -398,6 +411,7 @@
 				", urgentAmount=" + urgentAmount +
 				", sendOutAmount=" + sendOutAmount +
 				", tousseType='" + tousseType + '\'' +
+				", formType='" + formType + '\'' +
 				", tousseDefinitionId=" + tousseDefinitionId +
 				'}';
 	}
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
===================================================================
diff -u -r18757 -r18775
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java	(.../RaRoomControlHelper.java)	(revision 18757)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java	(.../RaRoomControlHelper.java)	(revision 18775)
@@ -47,7 +47,7 @@
         if (!TousseDefinition.PACKAGE_TYPE_DRESSING.equals(tousseType) && !"一次性物品".equals(tousseType)) {
             dressing = "rr.recyclingTime as \"recyclingTime\",po.basketName as \"basketName\",po.recyclingAmount as \"recyclingAmount\",";
         }
-        return "select distinct ip.id as \"id\",po.tousseName as \"tousseName\",po.tousseType as \"tousseType\",case when ri.urgentAmount is not null then ri.urgentAmount else po.urgentAmount end AS \"urgentAmount\",po.sendOutAmount as \"sendOutAmount\"," +
+        return "select distinct ip.id as \"id\",po.tousseName as \"tousseName\",po.tousseType as \"tousseType\",ip.type as \"formType\",case when ri.urgentAmount is not null then ri.urgentAmount else po.urgentAmount end AS \"urgentAmount\",po.sendOutAmount as \"sendOutAmount\"," +
                 "po.amount as \"amount\",ip.depart as \"depart\"," + dressing +
                 "ip.departCoding as \"departCoding\",ip.applicationTime as \"applicationTime\"," +
                 "ip.submitTime as \"submitTime\",ip.printTime as \"printTime\"," +
@@ -70,7 +70,7 @@
             dressing = "rr.recyclingTime as \"recyclingTime\",null as \"basketName\",ri.amount as \"recyclingAmount\",";
         }
         String unionSelect = "select distinct rr.recyclingApplication_id as \"id\",ri.tousseName as \"tousseName\",ri.tousseType as \"tousseType\"," +
-                "ri.urgentAmount as \"urgentAmount\",0 as \"sendOutAmount\",0 as \"amount\",rr.depart as \"depart\"," + dressing +
+                "'回收申请单' AS \"formType\",ri.urgentAmount as \"urgentAmount\",0 as \"sendOutAmount\",0 as \"amount\",rr.depart as \"depart\"," + dressing +
                 "rr.departCode as \"departCoding\",rr.recyclingTime as \"applicationTime\",rr.recyclingTime as \"submitTime\"," +
                 "null as \"printTime\",null as \"serialNumber\",null as \"settleAccountsDepart\",replace(ri.remark,'\"',' ') as \"remark\"," +
                 "rr.operator as \"applicant\",'否' as \"diposable\",ri.tousseDefinitionId as \"tousseDefinitionId\" ";