Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.jsp
===================================================================
diff -u -r12331 -r15836
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.jsp	(.../useRecordTotalView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.jsp	(.../useRecordTotalView.jsp)	(revision 15836)
@@ -1,3 +1,4 @@
+<%@page import="org.apache.commons.lang.StringUtils"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
@@ -6,12 +7,12 @@
 <%
 SupplyRoomConfigManager configManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
 LoginUserData userData = AcegiHelper.getLoginUser();
-String currentUserOfCoding = userData.getOrgUnitCodingFromSupplyRoomConfig();
+String currentUserOfCoding = userData.getCurrentOrgUnitCode();
 String orgName = userData.getOrgUnitNameCodingFromSupplyRoomConfig();
 String firstRoomCode = configManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
 request.setAttribute("currentOrgCode", currentUserOfCoding);
 request.setAttribute("orgName", orgName);
-if(currentUserOfCoding.equals(firstRoomCode)){
+if(StringUtils.equals(currentUserOfCoding,firstRoomCode)){
 	request.setAttribute("isFirstRoomPeople", true);
 }else{
 	request.setAttribute("isFirstRoomPeople", false);
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsView.js
===================================================================
diff -u -r15803 -r15836
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsView.js	(.../summaryUseRecordForGoodsView.js)	(revision 15803)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsView.js	(.../summaryUseRecordForGoodsView.js)	(revision 15836)
@@ -169,6 +169,8 @@
 			iconCls : 'icon_set',
 			handler : function() {
 				form.getForm().reset();
+				$Id('startTime').value = "";
+				$Id('endTime').value = "";
 			}
 		}]
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp
===================================================================
diff -u -r15803 -r15836
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp	(.../summaryUseRecordForGoodsView.jsp)	(revision 15803)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp	(.../summaryUseRecordForGoodsView.jsp)	(revision 15836)
@@ -1,3 +1,4 @@
+<%@page import="org.apache.commons.lang.StringUtils"%>
 <%@ page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
@@ -7,13 +8,13 @@
 <%
 	SupplyRoomConfigManager configManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
 	LoginUserData userData = AcegiHelper.getLoginUser();
-	String currentUserOfCoding = userData.getOrgUnitCodingFromSupplyRoomConfig();
+	String currentUserOfCoding = userData.getCurrentOrgUnitCode();
 	String orgName = userData.getOrgUnitNameCodingFromSupplyRoomConfig();
 	String firstRoomCode = configManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
 	request.setAttribute("currentOrgCode", currentUserOfCoding);
 	request.setAttribute("orgName", orgName);
 	request.setAttribute("userName", userData.getUserFullName());
-	if(currentUserOfCoding.equals(firstRoomCode)){
+	if(StringUtils.equals(currentUserOfCoding,firstRoomCode)){
 		request.setAttribute("isFirstRoomPeople", true);
 	}else{
 		request.setAttribute("isFirstRoomPeople", false);
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.js
===================================================================
diff -u -r12607 -r15836
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.js	(.../useRecordOperatorTotalView.js)	(revision 12607)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.js	(.../useRecordOperatorTotalView.js)	(revision 15836)
@@ -214,6 +214,8 @@
 				iconCls : 'icon_set',
 				handler : function() {
 					form.getForm().reset();
+					$Id('startTime').value = "";
+					$Id('endTime').value = "";
 				}
 			}]
 		});
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp
===================================================================
diff -u -r14181 -r15836
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp	(.../useRecordItemView.jsp)	(revision 14181)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp	(.../useRecordItemView.jsp)	(revision 15836)
@@ -1,3 +1,4 @@
+<%@page import="org.apache.commons.lang.StringUtils"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods,com.forgon.Constants"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
@@ -7,14 +8,14 @@
 <%
 SupplyRoomConfigManager configManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
 LoginUserData userData = AcegiHelper.getLoginUser();
-String currentUserOfCoding = userData.getOrgUnitCodingFromSupplyRoomConfig();
+String currentUserOfCoding = userData.getCurrentOrgUnitCode();
 String orgName = userData.getOrgUnitNameCodingFromSupplyRoomConfig();
 String userName = userData.getUserFullName();
 String firstRoomCode = configManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
 request.setAttribute("currentOrgCode", currentUserOfCoding);
 request.setAttribute("orgName", orgName);
 request.setAttribute("userName", userName);
-if(currentUserOfCoding.equals(firstRoomCode)){
+if(StringUtils.equals(currentUserOfCoding,firstRoomCode)){
 	request.setAttribute("isFirstRoomPeople", true);
 }else{
 	request.setAttribute("isFirstRoomPeople", false);
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp
===================================================================
diff -u -r12331 -r15836
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp	(.../useRecordOperatorTotalView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp	(.../useRecordOperatorTotalView.jsp)	(revision 15836)
@@ -1,3 +1,4 @@
+<%@page import="org.apache.commons.lang.StringUtils"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
@@ -6,13 +7,13 @@
 <%
 SupplyRoomConfigManager configManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
 LoginUserData userData = AcegiHelper.getLoginUser();
-String currentUserOfCoding = userData.getOrgUnitCodingFromSupplyRoomConfig();
+String currentUserOfCoding = userData.getCurrentOrgUnitCode();
 String orgName = userData.getOrgUnitNameCodingFromSupplyRoomConfig();
 String firstRoomCode = configManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
 request.setAttribute("currentOrgCode", currentUserOfCoding);
 request.setAttribute("orgName", orgName);
 request.setAttribute("userName", userData.getUserFullName());
-if(currentUserOfCoding.equals(firstRoomCode)){
+if(StringUtils.equals(currentUserOfCoding,firstRoomCode)){
 	request.setAttribute("isFirstRoomPeople", true);
 }else{
 	request.setAttribute("isFirstRoomPeople", false);
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js
===================================================================
diff -u -r12607 -r15836
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js	(.../useRecordTotalView.js)	(revision 12607)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordTotalView.js	(.../useRecordTotalView.js)	(revision 15836)
@@ -216,6 +216,8 @@
 				iconCls : 'icon_set',
 				handler : function() {
 					form.getForm().reset();
+					$Id('startTime').value = "";
+					$Id('endTime').value = "";
 				}
 			}]
 		});
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
===================================================================
diff -u -r14181 -r15836
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 14181)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 15836)
@@ -312,6 +312,8 @@
 				iconCls : 'icon_set',
 				handler : function() {
 					form.getForm().reset();
+					$Id('startTime').value = "";
+					$Id('endTime').value = "";
 				}
 			}]
 		});