Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r30473 -r32499
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 30473)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 32499)
@@ -973,18 +973,15 @@
         },{
             xtype : 'hidden',
             id : 'operatorCode3',
-            name : 'operatorCode',
-            value : $Id('userLoginName').value
+            name : 'operatorCode'
         },{
             xtype : 'hidden',
             id : 'reviewerCode3',
-            name : 'reviewerCode',
-            value : reviewerCode
+            name : 'reviewerCode'
         },{
             xtype : 'hidden',
             id : 'sterileCode3',
-            name : 'sterileCode',
-            value : sterileUserCode
+            name : 'sterileCode'
         },{
         	xtype:'hidden',
         	id : 'comboToussePackageType',
@@ -1016,7 +1013,6 @@
             name : 'operator',
             labelAlign:'right',
             componentCls:'formItemMgn',
-            value : $Id('userName').value,
             allowBlank : false,
             readOnly : true,
             anchor : '80%'
@@ -1050,9 +1046,7 @@
             name : "reviewer",
             id : "reviewer3",
             labelAlign:'right',
-            hidden: sstsConfig.hideReviewerField,
             anchor : '80%',
-            value : jobType_review_name,
             readOnly: true
         },{
             xtype : 'textfield',
@@ -1085,7 +1079,6 @@
             margin :'5 0 0 0',
             allowBlank : true,
             anchor : '80%',
-            value : jobType_sterile_name,
             readOnly: true
         }, {
             xtype : "combo",
@@ -1376,6 +1369,59 @@
     	reviewerBarcode3.disable();
     	reviewerBarcode3.hide();
     }
+	//GDSZYY-116：聚合包获取审核人和装配人
+	Ext4.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/packingAction!queryPackingConfigSession.do',
+		params : {
+			type : '聚合包装配'
+		},success : function(response, options) {
+			var result = Ext4.decode(response.responseText);
+			if(result.success){
+				var jobType_pack_name_forComBo = result.data.operator || '';
+				var jobType_pack_code_forComBo = result.data.operatorCode || '';
+				var jobType_review_name_forComBo = result.data.reviewer || '';
+				var jobType_review_code_forComBo = result.data.reviewerCode || '';
+				var jobType_sterile_name_forComBo = result.data.sterilizationUser || '';
+				var jobType_sterile_code_forComBo = result.data.sterilizationUserCode || '';
+
+				if(packingPageOperatorDefaultLastOperator != false){
+					var operator3 = top.Ext4.getCmp("operator3");
+					var operatorCode3 = top.Ext4.getCmp("operatorCode3");
+					if(operator3.getValue() == ''){
+						if(jobType_pack_name_forComBo == ''){
+							operator3.setValue($Id('userName').value);
+							operatorCode3.setValue($Id('userLoginName').value);
+						}else {
+							operator3.setValue(jobType_pack_name_forComBo);
+							operatorCode3.setValue(jobType_pack_code_forComBo);
+						}
+					}
+				}
+				
+				if(packingPageReviewerDefaultLastReviewer != false){
+					var reviewer3 = top.Ext4.getCmp("reviewer3");
+					var reviewerCode3 = top.Ext4.getCmp("reviewerCode3");
+					if(reviewer3.getValue() == ''){
+						if(jobType_review_name_forComBo !== ''){
+							reviewer3.setValue(jobType_review_name_forComBo);
+							reviewerCode3.setValue(jobType_review_code_forComBo);
+						}
+					}
+				}
+
+				if(sstsConfig.showSterileField == true){
+					var sterileUser3 = top.Ext4.getCmp("sterileUser3");
+					var sterileCode3 = top.Ext4.getCmp("sterileCode3");
+					if(sterileUser3.getValue() == ''){
+						if(jobType_review_name_forComBo !== ''){
+							sterileUser3.setValue(jobType_sterile_name_forComBo);
+							sterileCode3.setValue(jobType_sterile_code_forComBo);
+						}
+					}
+				}
+			}
+		}
+	});
     
     // 装配按钮处理
     function onPackingBtnClick(btn){
Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r32155 -r32499
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 32155)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 32499)
@@ -799,28 +799,23 @@
         },{
             xtype : 'hidden',
             id : 'operatorCode2',
-            name : 'operatorCode',
-            value : (isShowDefaultPackerOfSplitForeignTousse ? $Id('userLoginName').value : "")
+            name : 'operatorCode'
         },{
             xtype : 'hidden',
             id : 'reviewerCode2',
-            name : 'reviewerCode',
-            value : reviewerCode
+            name : 'reviewerCode'
         },{
             xtype : 'hidden',
             id : 'wrapperCode2',
-            name : 'wrapperCode2',
-            value : wrapperCode
+            name : 'wrapperCode2'
         },{
             xtype : 'hidden',
             id : 'sterileCode2',
-            name : 'sterileCode',
-            value : sterileUserCode
+            name : 'sterileCode'
         },{
             xtype : 'hidden',
             id : 'inspectorCode2',
-            name : 'inspectorCode2',
-            value : inspectorCode
+            name : 'inspectorCode2'
         },{
         	xtype:'hidden',
         	id : 'foreignToussePackageType',
@@ -853,7 +848,6 @@
             name : 'operator',
             labelAlign:'right',
             componentCls:'formItemMgn',
-            value : (isShowDefaultPackerOfSplitForeignTousse ? $Id('userName').value : ""),
             allowBlank : false,
             readOnly : true,
             anchor : '80%'
@@ -867,7 +861,6 @@
             id : "reviewerBarcode2",
             labelAlign:'right',
             componentCls:'formItemMgn',
-            hidden: sstsConfig.hideReviewerField,
             allowBlank : true,
             listeners : {
                 specialkey : function(thiz, e){
@@ -887,9 +880,7 @@
             name : "reviewer",
             id : "reviewer2",
             labelAlign:'right',
-            hidden: sstsConfig.hideReviewerField,
             anchor : '80%',
-            value : jobType_review_name,
             readOnly: true
         },{
             xtype : 'textfield',
@@ -955,7 +946,6 @@
             margin :'5 0 0 0',
             allowBlank : true,
             anchor : '80%',
-            value : jobType_sterile_name,
             readOnly: true
         },{
             xtype : 'textfield',
@@ -988,7 +978,6 @@
             margin :'5 0 0 0',
             allowBlank : true,
             anchor : '80%',
-            value : jobType_inspector_name,
             readOnly: true
         }/*, {
             xtype : "combo",
@@ -1239,6 +1228,80 @@
     	reviewerBarcode2.disable();
     	reviewerBarcode2.hide();
     }
+
+    //GDSZYY-116：聚合包获取审核人和装配人
+	Ext4.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/packingAction!queryPackingConfigSession.do',
+		params : {
+			type : '普通装配'
+		},success : function(response, options) {
+			var result = Ext4.decode(response.responseText);
+			if(result.success){
+				var jobType_pack_name = result.data.operator || '';
+				var jobType_pack_code = result.data.operatorCode || '';
+				var jobType_review_name = result.data.reviewer || '';
+				var jobType_review_code = result.data.reviewerCode || '';
+				var jobType_sterile_name = result.data.sterilizationUser || '';
+				var jobType_sterile_code = result.data.sterilizationUserCode || '';
+                var jobType_inspector_name = result.data.inspector || '';
+				var jobType_inspector_code = result.data.inspectorCode || '';
+                var jobType_wrapper_name = result.data.wrapper || '';
+				var jobType_wrapperCode_code = result.data.wrapperCode || '';
+
+                //配包人
+                if(isShowDefaultPackerOfSplitForeignTousse){
+                    top.Ext4.getCmp('operatorCode2').setValue($Id('userLoginName').value);
+                    top.Ext4.getCmp('operator2').setValue($Id('userName').value);
+                }else {
+                    if(packingPageOperatorDefaultLastOperator != false){
+                        var operator2 = top.Ext4.getCmp("operator2");
+                        var operatorCode3 = top.Ext4.getCmp("operatorCode3");
+                        if(operator2.getValue() == ''){
+                            operator2.setValue(jobType_pack_name);
+                            operatorCode3.setValue(jobType_pack_code);
+                        }
+                    }
+                }
+                //审核人
+                if(packingPageReviewerDefaultLastReviewer != false){
+                    var reviewer2 = top.Ext4.getCmp("reviewer2");
+                    var reviewerCode2 = top.Ext4.getCmp("reviewerCode2");
+                    if(reviewer2.getValue() == ''){
+                        reviewer2.setValue(jobType_review_name);
+                        reviewerCode2.setValue(jobType_review_code);
+                    }
+                }
+                //灭菌人
+                if(sstsConfig.showSterileField == true){
+                    var sterileUser2 = top.Ext4.getCmp("sterileUser2");
+                    var sterileCode2 = top.Ext4.getCmp("sterileCode2");
+                    if(sterileUser2.getValue() == ''){
+                        sterileUser2.setValue(jobType_sterile_name);
+                        sterileCode2.setValue(jobType_sterile_code);
+                    }
+                }
+                //检查人
+                if(sstsConfig.showInspectorInSplitForeignTousseDialog == true){
+                    var inspector2 = top.Ext4.getCmp("inspector2");
+                    var inspectorCode = top.Ext4.getCmp("inspectorCode");
+                    if(inspector2.getValue() == ''){
+                        inspector2.setValue(jobType_inspector_name);
+                        inspectorCode.setValue(jobType_inspector_code);
+                    }
+                }
+                //包装人
+                if(sstsConfig.showWrapperField == true){
+                    var wrapperBarcode2 = top.Ext4.getCmp("wrapperBarcode2");
+                    var wrapperCode2 = top.Ext4.getCmp("wrapperCode2");
+                    if(wrapperBarcode2.getValue() == ''){
+                        inspector2.setValue(jobType_wrapper_name);
+                        wrapperCode2.setValue(jobType_wrapperCode_code);
+                    }
+                }
+			}
+		}
+	});
+    
     // 加载外来器械信息
     findForeignTousseAndApplicationInfo(invoicePlanId,tousseID,packTaskId);