Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
===================================================================
diff -u -r40428 -r41116
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 40428)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 41116)
@@ -2,10 +2,8 @@
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance" %>
-<%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container" %>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@page import="com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption"%>
-<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
 <%@page import="com.forgon.disinfectsystem.common.Constants"%>
 <%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%>
@@ -53,6 +51,7 @@
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/commonUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/TousseInstanceTableManager.js?version=${svnRevision}"></script>
@@ -61,7 +60,6 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/SterilisationTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ExpirationDateInfoTableManager.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForReviewViewForm.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>
 <script type="text/javascript">
@@ -90,20 +88,11 @@
 var isPrintUserFullName = '<%=supplyRoomConfigManager.getSystemParamsObj().isPrintUserFullName()%>';
 var hospitalName = '<%=request.getAttribute("hospitalName")%>';
 var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>';
-//扫描篮筐允许的篮筐状态集合
-var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 </script>
 <script type="text/javascript">
 	var userName = '<%=request.getAttribute("userName")%>';
-	var parm_s_type ="质量监测";
-	var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
 	//质量监测重新装配
 	var taskType_qualityMonitor = '<%=PackingTask.TASK_QUALITY_MONITOR%>';
-	// 质量监测责任环节数组
-	var moduleNameArr = new Array("<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INFECTIONPART%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_OTHERPART%>");
-	// 外来器械包类型
-	var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
-	var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
 	var ERROR_CODE_SUCCESS = <%=Constants.ERROR_CODE_SUCCESS%>;
 	var ERROR_CODE_NOT_FOUND = <%=Constants.ERROR_CODE_NOT_FOUND%>;
 	var ERROR_CODE_LOST = <%=Constants.ERROR_CODE_LOST%>;
@@ -132,11 +121,6 @@
 <object id="LODOP" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0> 
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
 </object>
-
-<!-- 质量监测 -->
-<script type="text/javascript" src="${ctx }/dwr/interface/QualityMonitoringInstanceTableManager.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js?version=${svnRevision}"></script>
-
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js?version=${svnRevision}"></script>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css?version=${svnRevision}"></link>