Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r17307 -r17997
--- ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 17307)
+++ ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 17997)
@@ -4,6 +4,7 @@
 	<portalPage pageIndex="1" pageId="normal" itemStyleClass="ui-state-default">
 		<portalItem title="科室申领" itemId="recyclingApplication" operationIds="SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=todoList" />
 		<portalItem title="科室申领" itemId="recyclingApplicationVersion2" operationIds="SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.jsp" />
+		<portalItem title="科室申领" itemId="recyclingApplicationVersion3" operationIds="SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp" />
 		<portalItem title="申请单查询" itemId="recyclingApplicationQuery" operationIds="SSTS_RecycApplication_Create,SSTS_RecycApplication_Update,SSTS_RecycApplication_Select,SSTS_RecycApplication_Delete,SSTS_ForeignTousseApplication_Create,SSTS_ForeignTousseApplication_Update,SSTS_ForeignTousseApplication_Select,SSTS_ForeignTousseApplication_Delete" imgUrl="/themes/portalPage/img/tabs_invoceDetail.png" itemLinkUrl="/disinfectsystem/recyclingApplication/goodsApplicationView.jsp?listType=all" />
 		<portalItem title="科室互借" itemId="borrowRecord" operationIds="SSTS_borrowRecord_Create,SSTS_borrowRecord_Update,SSTS_borrowRecord_Select,SSTS_borrowRecord_Delete" imgUrl="/themes/portalPage/img/tabs_borrowRecord.png" itemLinkUrl="/disinfectsystem/borrowRecord/borrowRecordView.jsp" />
 		<portalItem title="借物管理" itemId="borrowManager" operationIds="SSTS_borrow_Create,SSTS_borrow_Update,SSTS_borrow_Select,SSTS_borrow_Delete" imgUrl="/themes/portalPage/img/3517.png" itemLinkUrl="/disinfectsystem/borrow/borrowingTousseView.jsp" />
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r17797 -r17997
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17797)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17997)
@@ -2130,6 +2130,7 @@
 		}
 
 		String findSql = String.format(" from %s %s ", TousseDefinition.class.getSimpleName(),whereSql);
+		logger.debug("findSql:" + findSql);
 		if(limit > 0){
 			list = objectDao.findByHql(findSql,start,limit);
 			totalCount = objectDao.countObjectBySql(TousseDefinition.class.getSimpleName(),whereSql);
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r17791 -r17997
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 17791)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 17997)
@@ -90,8 +90,8 @@
   isHideHospitalNumber: true,
   //是否隐藏加急数量
   isHideUrgentAmount: true,
-  // 科室申请版本：1或者没有配置沿用之前的版本，2：独立出科室申领的几个申请功能
-  recyclingApplicationVersion : 2,
+  // 科室申请版本：1或者没有配置沿用之前的版本，2：独立出科室申领的几个申请功能, 3:GDSRMYY-313省医的新版本,‘申领器械包’改为‘申领物品’。把‘申领消毒物品’、‘申领敷料包’与‘申领物品’按钮合并。
+  recyclingApplicationVersion : 3,
   //隐藏外部代理灭菌的部分元素(页面属性),为true时部分隐藏,未配置或配置为其它值时与原来保持一致
   hiddenForeignProxyPartElement : true,
   //是否显示包实例科室(待灭菌与待灭菌装载的表格)
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r17950 -r17997
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 17950)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 17997)
@@ -700,20 +700,36 @@
 		}
 		itemUrl = WWWROOT + url;
 		if(item['itemId'] != 'packing' && item['itemId'] != 'reviewPacking' && item['itemId'] !='sterilizationRecord'){
-			//region 只有临床用户且配了版本2才能看到科室申领版本2的图标还有申请单图标
-			//如果当前图标是科室申领的时候,如果该用户是临床科室且配了版本2,隐藏该图标
-			if (item['itemId'] == 'recyclingApplication' && globalIsSupplyRoomUser == 'false' && sstsConfig.recyclingApplicationVersion == 2){
-					return returnContent;
+			//region 只有临床用户且配了版本2或者3才能看到科室申领版本2或者3的图标还有申请单图标
+			//如果当前图标是科室申领的时候,如果该用户是临床科室且配了版本2或者3,隐藏该图标
+			if (item['itemId'] == 'recyclingApplication' && globalIsSupplyRoomUser == 'false' && (sstsConfig.recyclingApplicationVersion == 2 || sstsConfig.recyclingApplicationVersion == 3)){
+				return returnContent;
 			}
+			// if (item['itemId'] == 'recyclingApplication' && globalIsSupplyRoomUser == 'false' && sstsConfig.recyclingApplicationVersion == 2){
+			// 		return returnContent;
+			// }
 
 			//如果图标是科室申领版本2或者查看申请单的时候,该用户不是临床科室或者没有配版本2，隐藏该图标
-			if ((item['itemId'] == 'recyclingApplicationVersion2' || item['itemId'] == 'recyclingApplicationQuery')
-				&& (globalIsSupplyRoomUser == 'true' || sstsConfig.recyclingApplicationVersion != 2)){
-					return returnContent;
+            // if ((item['itemId'] == 'recyclingApplicationVersion2' || item['itemId'] == 'recyclingApplicationQuery')
+            // 	&& (globalIsSupplyRoomUser == 'true' || sstsConfig.recyclingApplicationVersion != 2)){
+            // 		return returnContent;
+            // }
+            // 如果图标是科室申领版本2,该用户不是临床科室或者没有配版本2，隐藏该图标
+			if (item['itemId'] == 'recyclingApplicationVersion2' && (globalIsSupplyRoomUser == 'true' || sstsConfig.recyclingApplicationVersion != 2)){
+				return returnContent;
 			}
+            // 如果图标是科室申领版本3,该用户不是临床科室或者没有配版本3，隐藏该图标
+			if (item['itemId'] == 'recyclingApplicationVersion3' && (globalIsSupplyRoomUser == 'true' || sstsConfig.recyclingApplicationVersion != 3)){
+				return returnContent;
+			}
+            // 如果图标是查看申请单的时候,该用户不是临床科室或者没有配版本2或者3，隐藏该图标
+			if (item['itemId'] == 'recyclingApplicationQuery' && (globalIsSupplyRoomUser == 'true' || sstsConfig.recyclingApplicationVersion != 2 && sstsConfig.recyclingApplicationVersion != 3 )){
+				return returnContent;
+			}
 
-			//如果不是使用版本2,则隐藏申请外来器械图标
-			if (item['itemId'] == 'foreignTousseApplication' && sstsConfig.recyclingApplicationVersion != 2){
+			//如果不是使用版本2或者3,则隐藏申请外来器械图标
+			if (item['itemId'] == 'foreignTousseApplication' && sstsConfig.recyclingApplicationVersion != 2 && sstsConfig.recyclingApplicationVersion != 3){
+			// if (item['itemId'] == 'foreignTousseApplication' && sstsConfig.recyclingApplicationVersion != 2){
 				return returnContent;
 			}
 			//endregion
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r17953 -r17997
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 17953)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 17997)
@@ -1645,6 +1645,7 @@
 		}
 	},{
             text : '终止选中的物品',
+			id : 'cancelCheckedGood',
             hidden : SSTS_Invoice_End || !originalCommittedStatus || !sstsConfig.enableTerminatePartOfApplication,
             handler : function() {
                 var leftTree = top.Ext4.getCmp('tousseTreeGrid');
@@ -3220,18 +3221,18 @@
 	var cell;
 	var type = record.get('type');
 	if(type==customTousseApplicationForm) {//自定义器械包申请单
-		cell = "<a href=\"#\" onclick=\"addAndEditCustomTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"addAndEditCustomTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==disinfectGoodsApplicationForm){//消毒物品申请单
-		cell = "<a href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
-		// cell = "<a href=\"#\" onclick=\"addAndEditUntracableTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
+		// cell = "<a class= \"formDetail\" href=\"#\" onclick=\"addAndEditUntracableTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==foreignTousseApplicationForm){//外来器械包申请单
-		cell = "<a href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
 	} else if(type == tousseLeaseApplicationForm){
-		cell = "<a href=\"#\" onclick=\"addAndEditTousseLease(" + record.data.id + ");return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"addAndEditTousseLease(" + record.data.id + ");return false;\">" + v + "</a>";
 	} else if(type == foreignPorxyApplicationForm){
-		cell = "<a href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
 	} else {
-		cell = "<a href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
 	}
 	return cell;
 }
@@ -3475,7 +3476,8 @@
  */
 function createSearchTbar(searchComboConfig) {
 	var tbar2 = [];
-    if (sstsConfig.recyclingApplicationVersion == 2){
+    if (sstsConfig.recyclingApplicationVersion == 2 || sstsConfig.recyclingApplicationVersion == 3){
+    // if (sstsConfig.recyclingApplicationVersion == 2){
         tbar2.push({text: '状态筛选:'});
         tbar2.push(searchComboConfig.quickScreenCombo);
     }
@@ -3972,7 +3974,7 @@
         triggerAction: 'all',
         displayField: 'val',
         forceSelection: true,
-		hidden : sstsConfig.recyclingApplicationVersion != 2,
+		hidden : sstsConfig.recyclingApplicationVersion != 2 && sstsConfig.recyclingApplicationVersion != 3,
         value: '未完成',
         editable: false,
         listeners : {
@@ -4072,7 +4074,7 @@
 			text : '申请外来器械',
 			id : 'applyForeign',
 			iconCls : 'btn_ext_add_customTousse',
-			hidden : SSTS_ForeignTousseApplication_Create || sstsConfig.recyclingApplicationVersion == 2,
+			hidden : SSTS_ForeignTousseApplication_Create || sstsConfig.recyclingApplicationVersion == 2 || sstsConfig.recyclingApplicationVersion == 3,
 			handler : function() {
 				openForeignTousseForm("","apply");
 			}
@@ -4103,14 +4105,16 @@
 	}
 
 
-    // 省医要求:如果是科室申领,默认申请单是未提交状态(省医才有版本2)
-	if (recyclingApplicationVersion == 2 && listType != 'all'){
+    // 省医要求:如果是科室申领,默认申请单是未提交状态(省医才有版本2和版本3)
+	if ((recyclingApplicationVersion == 2 || recyclingApplicationVersion == 3) && listType != 'all'){
+	// if (recyclingApplicationVersion == 2 && listType != 'all'){
 		document.getElementById("parm_s_status").value = 'unFinish';
 	}
 
 
-	//如果不是用版本2或者是在高级视图的全部申请单打开或者不是临床科室则按原来的显示
-	if (recyclingApplicationVersion != 2 || listType == 'all' || isCssdUser == "true"){
+	//如果不是用版本2且不是版本3或者是在高级视图的全部申请单打开或者不是临床科室则按原来的显示
+	if ((recyclingApplicationVersion != 2 && recyclingApplicationVersion != 3) || listType == 'all' || isCssdUser == "true"){
+	// if (recyclingApplicationVersion != 2 || listType == 'all' || isCssdUser == "true"){
 		grid = new Ext.ux.ForgonPageGrid({
 				title : entityName + '单列表',
 				id : 'applyGrid',
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js	(revision 17997)
@@ -0,0 +1,26 @@
+Ext.onReady(function () {
+    var recyclingApplicationVersion = sstsConfig.recyclingApplicationVersion;
+    //如果使用version2且不是显示全部申请单则显示界面并绑定点击事件
+    if (recyclingApplicationVersion == 3 && listType != 'all') {
+        //取消隐藏
+        Ext.get('desktop_normal').dom.style.display = "";
+
+        //申领物品
+        Ext.get('tousseAndDisinfectAndDressingApplication').addListener('click', function (e) {
+            openApplication(invoicePlanForTousseType_Tousse, tousseApplicationForm);
+        });
+
+        //一次性物品申请单
+        Ext.get('diposableGoodsApplication').addListener('click', function (e) {
+            openApplication(invoicePlanForTousseType_Diposable, diposableGoodsApplicationForm);
+        });
+
+        //专科器械申请单
+        Ext.get('spInstrumentApplication').addListener('click', function (e) {
+            openApplication(invoicePlanForTousseType_Tousse, spInstrumentApplicationForm);
+        });
+    }
+
+
+});
+
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp	(revision 17997)
@@ -0,0 +1,77 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ include file="goodsApplicationView.jsp" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+    <script src="goodsApplicationViewVersion3.js"></script>
+    <link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/css/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/css/default.css"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/theme/style/main.css"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="${ctx}/common/common.css"/>
+    <style>
+        #desktop_normal ul {
+            margin: 50px 40px;
+            width: 975px;
+            list-style: none;
+        }
+
+        #desktop_normal ul li {
+            float: left;
+            width: 180px;
+            height: 180px;
+            margin-right: 15px;
+            line-height: 20px;
+        }
+
+        .icon-text2 {
+            background: url(${ctx}/themes/portalPage/css/images/icon_text_l.png) no-repeat scroll 0 0 transparent;
+            cursor: pointer;
+            display: inline-block;
+            height: 20px;
+            margin-top: 3px;
+            padding-left: 10px;
+        }
+
+        .icon-text2 span {
+            background: url(${ctx}/themes/portalPage/css/images/icon_text_r.png) no-repeat scroll right center transparent;
+            color: #FFFFFF;
+            display: inline-block;
+            height: 20px;
+            line-height: 20px;
+            padding: 0 10px 0 0;
+        }
+        .cursorPointer  {
+            cursor: pointer;
+        }
+
+    </style>
+</head>
+
+<body>
+<div id="desktop_normal" class="desktop" style="width:100%;height:100%;display: none;">
+    <ul id="desktopPanel_normal" class="desktopPanel" style="display:block">
+        <li id="tousseAndDisinfectAndDressingApplication" class="ui-state-default" title="申领物品">
+            <div class="imgDvi">
+                <p><span><img class="cursorPointer" width="86" height="86" src="${ctx}/themes/portalPage/img/tabs_tousse.png"></span></p>
+            </div>
+            <div class="icon-text2"><span style="padding-left: 10px;padding-right: 20px;">申领物品</span></div>
+        </li>
+        <li id="diposableGoodsApplication" class="ui-state-default" title="申请一次性物品">
+            <div class="imgDvi">
+                <p><span><img width="86" class="cursorPointer" height="86" src="${ctx}/themes/portalPage/img/tabs_disposable.png"></span></p>
+            </div>
+            <div class="icon-text2"><span>申请一次性物品</span></div>
+        </li>
+        <li id="spInstrumentApplication" class="ui-state-default" title="申请专科器械">
+            <div class="imgDvi">
+                <p><span><img width="86" class="cursorPointer" height="86" src="${ctx}/themes/portalPage/img/tousse.png"></span></p>
+            </div>
+            <div class="icon-text2"><span>申请专科器械</span></div>
+        </li>
+    </ul>
+
+</div>
+</body>
+</html>