Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r35104 -r35989
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 35104)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 35989)
@@ -523,13 +523,19 @@
 var ACTION_TYPE_EARLY_RETURN  = '<%=ForeignTousseApplication.ACTION_TYPE_EARLY_RETURN%>';  //提前归还
 
 <%
-	Map<String, Map<String, String>> taskGroupPackingConfig = (Map<String, Map<String, String>>)session.getAttribute("packingConfig");
-   	if(taskGroupPackingConfig != null){
-   		Map<String,String> packingConfig = taskGroupPackingConfig.get(request.getParameter("taskGroup"));
-   	    if (packingConfig != null) {
-   	    	String vd = packingConfig.get("inspector");
+    boolean lastProcessorSharedByAllTaskGroups = CssdUtils.getSystemSetConfigByNameBool("lastProcessorSharedByAllTaskGroups",false);
+    Map<String,String> packingConfig = null;
+    if(lastProcessorSharedByAllTaskGroups){
+         packingConfig = (Map<String,String>)session.getAttribute("packingConfig");;
+    }else{
+        Map<String, Map<String, String>> taskGroupPackingConfig = (Map<String, Map<String, String>>)session.getAttribute("packingConfig");
+        if(taskGroupPackingConfig != null){
+            packingConfig = taskGroupPackingConfig.get(request.getParameter("taskGroup"));
+        }
+    }
+   	if (packingConfig != null) {
 %>
-	inspector = '<%=packingConfig.get("inspector")%>';
+inspector = '<%=packingConfig.get("inspector")%>';
 	inspectorCode = '<%=packingConfig.get("inspectorCode")%>';
 	operator = '<%=packingConfig.get("operator")%>';
     operatorCode = '<%=packingConfig.get("operatorCode")%>';
@@ -540,30 +546,43 @@
     wrapper = '<%=packingConfig.get("wrapper")%>';
     wrapperCode = '<%=packingConfig.get("wrapperCode")%>';
 <%
-    	}
    	}
 %>
 //装配界面的配包人是否默认为上一次装配的配包人(未配置或配置为false以外的值表示是,为false表示否)
 var packingPageOperatorDefaultLastOperator = sstsConfig.packingPageOperatorDefaultLastOperator;
 //装配界面的审核人是否默认为上一次装配的审核人(未配置或配置为false以外的值表示是,为false表示否)
 var packingPageReviewerDefaultLastReviewer = sstsConfig.packingPageReviewerDefaultLastReviewer;
-
+//装配界面的检查人是否默认为上一次装配的检查人(未配置或配置为false以外的值表示是,为false表示否)
+var packingPageInspectorDefaultLastInspector = sstsConfig.packingPageInspectorDefaultLastInspector;
+//装配界面的包装人是否默认为上一次装配的包装人(未配置或配置为false以外的值表示是,为false表示否)
+var packingPageWrapperDefaultLastWrapper = sstsConfig.packingPageWrapperDefaultLastWrapper;
+//装配界面的灭菌人是否默认为上一次装配的灭菌人(未配置或配置为false以外的值表示是,为false表示否)
+var packingPageSterileUserDefaultLastSterileUser = sstsConfig.packingPageSterileUserDefaultLastSterileUser;
 //未补充丢失、报损是否可以装配
 var allowPackingWhenUnSupplementMaterial = getBoolValueFromJs("sstsConfig.allowPackingWhenUnSupplementMaterial",false);
 
-var jobType_inspector_name = inspector;
-
+var jobType_inspector_name = '';
 var jobType_pack_name = '';
 var jobType_review_name = '';
-var jobType_sterile_name = sterileUserName;
+var jobType_sterile_name = '';
+var jobType_wrapper_name = '';
+
 if(packingPageOperatorDefaultLastOperator != false){
 	jobType_pack_name = operator;
 }
 if(packingPageReviewerDefaultLastReviewer != false){
 	jobType_review_name = reviewer;
 }
-var jobType_wrapper_name = wrapper;
-
+if(packingPageInspectorDefaultLastInspector != false){
+	jobType_inspector_name = inspector;
+}
+if(packingPageWrapperDefaultLastWrapper != false){
+	jobType_wrapper_name = wrapper;
+}
+if(packingPageSterileUserDefaultLastSterileUser != false){
+	jobType_sterile_name = sterileUserName;
+}
+console.log(sterileUserName)
 var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
 //教学图片
 var teachingPicture = false;