Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r40302 -r40813
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 40813)
@@ -1497,7 +1497,7 @@
     		}); */
     }
     // 装配按钮处理
-    function splitForeignTousse_packingTousseBtnClick(btn){
+    function splitForeignTousse_packingTousseBtnClick(btn, isConfirm){
     	if (!foreignToussePanel.form.isValid()) {
             showResult('请正确填写表单各值' , null , sstsConfig.messagePauseTimeOnPackingPage);
             btn.enable();
@@ -1589,6 +1589,29 @@
                 return
             }
         }
+
+		//DGSETYY-122：装配时追加申请科室和病区无关联提醒
+        if(sstsConfig.enableDepartmentToWardAssociation && sstsConfig.enablePatientAreaSetting && !isConfirm){
+            Ext4.Ajax.request({
+                url: WWWROOT + '/disinfectSystem/core/orgUnitPatientAreaRelationController/checkPackingTaskApplyOrgUnitPatientAreaRelation.mhtml',
+                params: {
+                    packingTaskIds:ids
+                },
+                success: function (result) {
+                    var jsonObj = Ext4.JSON.decode(result.responseText);
+                    if(jsonObj.success){
+                        splitForeignTousse_packingTousseBtnClick(btn, true);
+                    }else {
+                        top.Ext4.MessageBox.confirm("请确认", jsonObj.message, function (btn) {
+                            if (btn == 'yes') {
+                                splitForeignTousse_packingTousseBtnClick(btn, true);
+                            }
+                        });
+                    }
+                }
+            });
+            return;
+        }
         
         operator = top.Ext4.getCmp('operator2').getValue();
         operatorCode = top.Ext4.getCmp('operatorCode2').getValue();
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r40728 -r40813
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40728)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40813)
@@ -3646,6 +3646,21 @@
 			}
 		}
 	});
+
+	var patientAreaStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/core/httpOptionController/getHttpOptionList.mhtml?optionListId=patientArea',
+			reader: {
+				type: 'json',
+				root: 'data'
+			}
+		},
+		fields: [
+			{ name: 'id' },
+			{ name: 'value' }
+		]
+	});
 	var heightVal = 26;
 	var setHeight;
 	if(top.screen.height > 863){
@@ -4234,11 +4249,27 @@
 								xtype : 'textfield',
 								fieldLabel : patientAreaName,
 								maxLength : '50',
-								id : 'patientArea',
-								name : 'patientArea',
+								id : sstsConfig.enableDepartmentToWardAssociation ? 'patientArea2' : 'patientArea',
+								name : sstsConfig.enableDepartmentToWardAssociation ? 'patientArea2' : 'patientArea',
 								width : '33.3%',
 								allowBlank : true,
+								hidden:sstsConfig.enableDepartmentToWardAssociation,
 								flex : 1
+							},{
+								xtype: 'combo',
+								fieldLabel: patientAreaName,
+								valueField: 'value',
+								displayField: 'value',
+								id: sstsConfig.enableDepartmentToWardAssociation ? 'patientArea' : 'patientArea2',
+								name: sstsConfig.enableDepartmentToWardAssociation ? 'patientArea' : 'patientArea2',
+								triggerAction: 'all',
+								forceSelection: false,
+								editable: false,
+								allowBlank: true,
+								store: patientAreaStore,
+								hidden:!sstsConfig.enableDepartmentToWardAssociation,
+								width : '33.3%',
+								flex : 1
 							}]
 						},{
 							layout : 'form',