Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
===================================================================
diff -u -r40481 -r40740
--- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js	(.../config.js)	(revision 40481)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js	(.../config.js)	(revision 40740)
@@ -191,7 +191,7 @@
   //登录弹框选择科室
   defaultShowOrgChange:true,
   //器械包定义扩展信息列
-  expandColoumnsConfigOfTousseView:[{"coloumnName":"weightScore","displayText":"权重分"},{"coloumnName":"technicalDifficulty","displayText":"技术难度"},
+  expandColoumnsConfigOfTousseView:[{"coloumnName":"weightScore","displayText":"权重分"},{"coloumnName":"technicalDifficulty","displayText":"技术难度"}],
   //科室申领界面显示科室分组按钮
   isShowDeptGroup:true,
   //允许修改回收单的申请科室
@@ -200,6 +200,8 @@
   extendedFunctionalityOfGoodsDepartShareConfig:["invoiceSign"],
   //回收界面点击消毒物品的回收数量单元格的响应方式
   respondModeWhenClickRecycleAmounCellOfDisinfectedItem:1,
+  //启用定期修改登录密码功能
+  enablePeriodicLoginPasswordChange:true,
   //定时废弃过期包的数量
   maxAutoWasteAmountOneTimeTask:10000
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r40737 -r40740
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 40737)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 40740)
@@ -1449,6 +1449,22 @@
 								value: '通过管理权限进行修改',
 								triggerAction: 'all'
 							}]
+						}, {
+							layout: 'form',
+							labelWidth: fontSize == 12 ? 180 : 210,
+							columnWidth: .25,
+							hidden: !sstsConfig.enablePeriodicLoginPasswordChange,
+							items: [{
+								xtype: 'numberfield',
+								fieldLabel: '密码重置周期(天)',
+								id: 'userPasswordResetCycle',
+								name: 'userPasswordResetCycle',
+								minValue: 1,
+								maxValue: 9999,
+								allowNegative: false,
+								anchor: '100%',
+								allowBlank: true
+							}]
 						}
 					]
 				}, {
@@ -4246,6 +4262,12 @@
 						defineFormModificationMode = Ext.getCmp("defineFormModificationMode").getValue();
 					}
 
+					//QYSRMYY-76:密码重置周期(天)
+					var userPasswordResetCycle = '';
+					if(sstsConfig.enablePeriodicLoginPasswordChange){
+						userPasswordResetCycle = Ext.getCmp("userPasswordResetCycle").getValue();
+					}
+
 					//KSDQDYRMYY-13
 					var isEnableTousseOpRecipient = '否';
 					var isEnableTousseOpDestLocation = '否';
@@ -4524,6 +4546,7 @@
 							noOptionCleanMethodSolution:noOptionCleanMethodSolution,
 							deviceMaintenanceUpdateMode:deviceMaintenanceUpdateMode,
 							defineFormModificationMode:defineFormModificationMode,
+							userPasswordResetCycle:userPasswordResetCycle,
 							borrowRemind: borrowRemind,
 							borrowRemindFrequency: borrowRemindFrequency,
 							kardexContainerHost: kardexContainerHost,
@@ -4873,6 +4896,11 @@
 				Ext.getCmp("defineFormModificationMode").setValue(supplyRoomConfig.defineFormModificationMode);
 			}
 
+			//QYSRMYY-76:密码重置周期(天)
+			if(sstsConfig.enablePeriodicLoginPasswordChange){
+				Ext.getCmp("userPasswordResetCycle").setValue(supplyRoomConfig.userPasswordResetCycle);
+			}
+
 			//ZSWY-233:借物单弹窗提醒
 			if(sstsConfig.enableCardinalityManagementOfBorrow){
 				Ext.getCmp('borrowRemind').setValue(supplyRoomConfig.borrowRemind );
Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r40644 -r40740
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40644)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40740)
@@ -692,7 +692,11 @@
 		return
 	}
 
-	needModifyPwd();
+	if(sstsConfig.enablePeriodicLoginPasswordChange){
+		isModifiedPwdByUser();
+	}else {
+		needModifyPwd();
+	}
 	hideBox3();
 }
 
@@ -725,6 +729,24 @@
 	}
 }
 
+//QYSRMYY-76：检查用户密码是否过期功能
+function isModifiedPwdByUser(){
+	if(sstsConfig.enablePeriodicLoginPasswordChange){
+		$.ajax({
+			type:'post',
+			dataType:'json',
+			url :  '${ctx}/systemmanage/user/userAction!isModifiedPwdByUser.do',
+			success : function(result) {
+				if(result.passwdIsExpired){
+					showModifyPWDWindowByUnmodified();
+					return
+				}
+				needModifyPwd();
+			}
+		});
+	}
+}
+
 //得到随机的颜色值
 function randomColor() {
 	var r = Math.floor(Math.random() * 256);
@@ -1028,7 +1050,11 @@
 		if(sstsConfig.loginTwoFactorAuthenticationType == 1){
 			alertBox3()
 		}else {
-			needModifyPwd();
+			if(sstsConfig.enablePeriodicLoginPasswordChange){
+				isModifiedPwdByUser();
+			}else {
+				needModifyPwd();
+			}
 		}
 	}