Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java
===================================================================
diff -u -r31086 -r31406
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java	(.../UseRecord.java)	(revision 31086)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/useRecord/UseRecord.java	(.../UseRecord.java)	(revision 31406)
@@ -865,6 +865,7 @@
 		jsonObject.put("dataType", getDataType());
 		jsonObject.put("reviewOperateUserCode", getReviewOperateUserCode());
 		jsonObject.put("departCodeOfpatient", getDepartCodeOfpatient());
+		jsonObject.put("ascriptionDepartment", getAscriptionDepartment());
 		jsonObject.put("recyclingStatus", getRecyclingStatus());
 		jsonObject.put("manualSetRecyclingStatusUser", getManualSetRecyclingStatusUser());
 		jsonObject.put("manualSetRecyclingStatusTime", getManualSetRecyclingStatusTime());
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r31394 -r31406
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 31394)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 31406)
@@ -2886,9 +2886,23 @@
                 var departCodeOfpatientValue = action.result.data.departCodeOfpatient;
                 if(departCodeOfpatientValue){
                 	top.Ext.getCmp('departNameOfpatient').setValue(departCodeOfpatientValue);
+                }else{
+                	// 病人所在科室的名称有值，病人所在科室编码没值的情况
+                	 var ascriptionDepartment = action.result.data.ascriptionDepartment;
+                	 if(ascriptionDepartment){
+                		 departJsonStore.each(function(record){
+                			 var nameOfDepartJsonStore = record.get("name");
+                			 if(nameOfDepartJsonStore == ascriptionDepartment){
+                				 top.Ext.getCmp('departNameOfpatient').setValue(ascriptionDepartment);
+                				 //设置病人所在科室的编码
+                				 top.Ext.getCmp('departCodeOfpatient').setValue(record.get("id"));
+                				 return false;
+                			 }
+                		 });
+                	 }
                 }
                 top.Ext.getCmp('tempBarcode').focus(true);
-				
+                
 				// 保存原始数据,只需要保存需要修改的属性
 				setOriginalFormParams(form, [ 'id', 'washHandNurse','circuitNurse', 'operationRoom','treatmentNum', 
 				                              'hospitalNum', 'patientName','patientAge', 'patientSex', 'roomNumber',