Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r38172 -r38526
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 38172)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 38526)
@@ -1,6 +1,7 @@
 var warningWindow; //系统告警win
 var unReturnWarningWindow; //未归还告警win
 var instrumentRepairWindow;
+var borrobwRemindWindow;
 var packingMenu ;
 var invoicePlanMenu;
 var comboToussePackingMenu ;
@@ -465,6 +466,11 @@
     if (sstsConfig.isShowUnReturnWarning){
         showUnReturnWarning();
     }
+
+	//ZSWY-233:借物单弹窗提醒
+	if (!SSTS_Borrow_Unload){
+        setTimeoutForBorrowRemindWin(); 
+    }
 	showUpToNeckSatisfactionSurveyWinTips();
 	
 	if (sstsConfig.biologicalMonitoringWarning && currentOrgUnitIsFirstSupplyRoom) {  //开启生物监测结束后的提示功能，目前只开发给当前科室为一级供应室的用户
@@ -2143,6 +2149,66 @@
         }
     });
 }
+
+//ZSWY-233:每隔一段时间提醒
+function setTimeoutForBorrowRemindWin(){
+	if(Ext.getCmp('borrobwRemindWindow')){
+		showBorrowRemindWin(true);
+	}else {
+		showBorrowRemindWin(false);
+	}
+	setTimeout(function(){
+		setTimeoutForBorrowRemindWin();
+	}, 1000 * 60 * borrowRemindFrequency);
+}
+
+//ZSWY-233:借物单弹窗提醒
+function showBorrowRemindWin(winIsShow){
+	Ext4.Ajax.request({
+        dataType : "json",
+        async: false,
+        url: WWWROOT + "/disinfectSystem/baseData/borrowCardinalityController/borrowRemind.mhtml",
+        success: function(response) {
+            var result = Ext4.decode(response.responseText);
+            if(result.data && result.data.length > 0){
+                var borrobwRemindGrid = new Ext.grid.GridPanel({
+                    store: new Ext.data.Store({
+                        reader : new Ext.data.JsonReader({
+                            fields : ["applicationTime", "applicant", "depart", "applicant", "applicant"]
+                        })
+                    }),
+                    columns: [
+                        {header: "申请时间", width: 130, dataIndex: 'applicationTime'},
+                        {header: "申请人", width: 80,dataIndex: 'applicant'},
+						{header: "申请科室", width: 120,dataIndex: 'depart'},
+						{header: "物品简要", width: 150,dataIndex: 'lendGoodsBrief'},
+                        {header: "查看", width: 70,dataIndex: 'warningItemType',renderer : goBorrow}
+                    ],
+                    stripeRows: true,
+                    viewConfig: {forceFit: true},
+                    height : 140
+                });
+                borrobwRemindGrid.getStore().loadData(result.data);
+				if(winIsShow){
+					borrobwRemindWindow.show();
+				}else {
+					borrobwRemindWindow = new Ext.Window({
+						autoHeight:true,
+						id:'borrobwRemindWindow',
+						title : '借物提醒',
+						width : 580,
+						draggable:true,
+						modal:true,
+						closeAction:'close',
+						items:[borrobwRemindGrid]
+					});
+					borrobwRemindWindow.show();
+				}
+            }
+        }
+    });
+}
+
 var tousseGoodsStockWarningWin;
 //FSSDERMYY-12：显示器械包库存告警
 function showTousseGoodsStockWarningWin(){
@@ -2564,7 +2630,11 @@
  */
 function goBorrow(v, p, record){
     var mess = "查看详细";
-    return "<a href=\"#\" onclick=\"addTab('borrowManager','借物管理',WWWROOT + '/disinfectsystem/borrow/borrowingTousseView.jsp');unReturnWarningWindow.close();return false;\">"+mess+"</a>";
+	if(record.data.applicationTime){
+		return "<a href=\"#\" onclick=\"addTab('borrowManager','借物管理',WWWROOT + '/disinfectsystem/borrow/borrowingTousseView.jsp');borrobwRemindWindow.close();return false;\">"+mess+"</a>";
+	}else {
+		return "<a href=\"#\" onclick=\"addTab('borrowManager','借物管理',WWWROOT + '/disinfectsystem/borrow/borrowingTousseView.jsp');unReturnWarningWindow.close();return false;\">"+mess+"</a>";
+	}
 }
 
 //打开在线帮助文档
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r38414 -r38526
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 38414)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 38526)
@@ -1918,7 +1918,18 @@
 		SSTS_ChineseMedicineApparatus_manager = false
 	}
 </operation:authorize>
+
 /**
+ * 《ZSWY-233：借物基数设置管理》权限
+ */
+ var SSTS_BorrowCardinality_manager = true;
+<operation:authorize ifAnyGranted="SSTS_BorrowCardinality_manager">
+	if (!notInWhiteList(sstsConfig, 'enableCardinalityManagementOfBorrow')) {
+		SSTS_BorrowCardinality_manager = false
+	}
+</operation:authorize>
+
+/**
  * 《材料入库管理》权限
  */
 var SSTS_MaterialGodownEntry_Manager = true;
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r38414 -r38526
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 38414)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 38526)
@@ -1145,7 +1145,8 @@
             {hidden :!(!SSTS_Handover_manager && sstsConfig.enableHandoverModule),text:"交接模块管理",href:WWWROOT+'/disinfectsystem/basedatamanager/handover/handoverView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_ResponsibilityPart_manager,text:"责任环节",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=responsibilityPart',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_DefectiveMessageRegisterType_manager,text:"缺陷信息登记类型分组",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=defectiveMessageRegisterType',hrefTarget:linkTarget,leaf:true},
-            {hidden :false,text:"设置不合格数来源",href:WWWROOT+'/disinfectsystem/reportforms/js/setUnqualifiedSourceForm.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_BorrowCardinality_manager,text:"借物基数管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cardinalManagementOfBorrow/cardinalManagementOfBorrowView.jsp',hrefTarget:linkTarget,leaf:true},
+			{hidden :false,text:"设置不合格数来源",href:WWWROOT+'/disinfectsystem/reportforms/js/setUnqualifiedSourceForm.jsp',hrefTarget:linkTarget,leaf:true},
 			{hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=positionalTitle',hrefTarget:linkTarget,leaf:true},
             {hidden :!sstsConfig.enableMultipleBranchesOfHospital,text:"院区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_chargeRecordManage_MENU,text:"收费项目设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=chargeItem&optionName=收费项目设置'),hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r36693 -r38526
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 36693)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 38526)
@@ -46,6 +46,7 @@
 		request.setAttribute("noOperationTime", supplyRoomConfigManager.getSystemParamsObj().getNoOperationTime());
 	    request.setAttribute("fontSize",userData.getFontSize() == null?"12":userData.getFontSize());
 	    request.setAttribute("departCoding",orgCoding);
+		request.setAttribute("borrowRemindFrequency",supplyRoomConfigManager.getSystemParamsObj().getBorrowRemindFrequency());
 	    String loginUserDataJsonStr = JSONObject.fromObject(userData).toString();
 	    request.setAttribute("loginUserDataJsonStr",loginUserDataJsonStr);
 		String currentOrgUnitCode = userData.getCurrentOrgUnitCode();
@@ -105,6 +106,7 @@
 <link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/theme/style/main.css?version=${svnRevision}"></link>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/icon.css?version=${svnRevision}"></link>
 <link rel="stylesheet" type="text/css" href="${ctx}/common/common.css?version=${svnRevision}"></link>
+<link rel="stylesheet" type="text/css" href="${ctx}/common/commonForExt4.css?version=${svnRevision}"></link>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <script>
 	var isFirstSupplyRoomUser = '${isFirstSupplyRoomUser}';
@@ -187,6 +189,15 @@
 		top.Ext4 = Ext4;
 	}
 	var noOperationTime = '${noOperationTime}';
+	var borrowRemindFrequency = '${borrowRemindFrequency}';
+	var SSTS_Borrow_Unload = true;
+	<operation:authorize ifAnyGranted="SSTS_Borrow_Unload">
+		SSTS_Borrow_Unload = false
+	</operation:authorize>
+
+	if(!sstsConfig.enableCardinalityManagementOfBorrow){
+		SSTS_Borrow_Unload = true;
+	}
 </script> 
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css"/>