Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r41152 -r41426
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 41152)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 41426)
@@ -262,7 +262,15 @@
 	}
 	//主刀医生核算科室
 	if(obj.getCmp('doctorAccountDepart') && patientInfo.doctorAccountDepart){
-		obj.getCmp('doctorAccountDepart').setValue(patientInfo.doctorAccountDepart);
+		departJsonStore.each(function (record) {
+			var nameOfDepartJsonStore = record.get("name");
+			if (nameOfDepartJsonStore == patientInfo.doctorAccountDepart) {
+				obj.getCmp('doctorAccountDepart').setRawValue(patientInfo.doctorAccountDepart);
+				//设置主刀医生核算科室的编码
+				obj.getCmp('doctorAccountDepartCode').setValue(record.get("id"));
+				return false;
+			}
+		});
 	}
 	//HDQRMYY-59：记帐号
 	if(obj.getCmp('patientSerialNumber') && patientInfo.serialNumber){
Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
===================================================================
diff -u -r40460 -r41426
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 40460)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41426)
@@ -182,16 +182,28 @@
 									settleAccountDeptNameUseRecord = goodsInfo.assetsBelong;
 									settleAccountDeptCodeUseRecord = goodsInfo.assetsBelongCode;
 								}else {
+									if (Ext4.getCmp('doctorAccountDepart')) {
+										settleAccountDeptNameUseRecord = Ext4.getCmp('doctorAccountDepart').getRawValue() || '';
+										settleAccountDeptCodeUseRecord = Ext4.getCmp('doctorAccountDepartCode').getValue() || '';
+									}
+									if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
+										if (Ext4.getCmp('departNameOfpatient')) {
+											settleAccountDeptNameUseRecord = Ext4.getCmp('departNameOfpatient').getRawValue() || '';
+											settleAccountDeptCodeUseRecord = Ext4.getCmp('departCodeOfpatient').getValue() || '';
+										}
+									}
+								}
+							}else {
+								if (Ext4.getCmp('doctorAccountDepart')) {
+									settleAccountDeptNameUseRecord = Ext4.getCmp('doctorAccountDepart').getRawValue() || '';
+									settleAccountDeptCodeUseRecord = Ext4.getCmp('doctorAccountDepartCode').getValue() || '';
+								}
+								if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
 									if (Ext4.getCmp('departNameOfpatient')) {
 										settleAccountDeptNameUseRecord = Ext4.getCmp('departNameOfpatient').getRawValue() || '';
 										settleAccountDeptCodeUseRecord = Ext4.getCmp('departCodeOfpatient').getValue() || '';
 									}
 								}
-							}else {
-								if (Ext4.getCmp('departNameOfpatient')) {
-									settleAccountDeptNameUseRecord = Ext4.getCmp('departNameOfpatient').getRawValue() || '';
-									settleAccountDeptCodeUseRecord = Ext4.getCmp('departCodeOfpatient').getValue() || '';
-								}
 							}
 							function addTousse() {
 								var record = new TousseInstance({
@@ -348,6 +360,10 @@
 		if (patientInfo.patientArea) {
 			Ext4.getCmp('patientArea').setRawValue(patientInfo.patientArea);
 		}
+		if (patientInfo.doctorAccountDepart) {
+			Ext4.getCmp('doctorAccountDepart').setRawValue(patientInfo.doctorAccountDepart);
+			Ext4.getCmp('doctorAccountDepartCode').setRawValue(patientInfo.doctorAccountDepartCode);
+		}
 	}
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r41210 -r41426
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41210)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41426)
@@ -447,16 +447,28 @@
 							settleAccountDeptNameUseRecord = goodsInfo.assetsBelong;
 							settleAccountDeptCodeUseRecord = goodsInfo.assetsBelongCode;
 						} else {
+							if (top.Ext.getCmp('doctorAccountDepart')) {
+								settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
+								settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
+							}
+							if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
+								if (top.Ext.getCmp('departNameOfpatient')) {
+									settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+									settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+								}
+							}
+						}
+					} else {
+						if (top.Ext.getCmp('doctorAccountDepart')) {
+							settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
+							settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
+						}
+						if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
 							if (top.Ext.getCmp('departNameOfpatient')) {
 								settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
 							}
 						}
-					} else {
-						if (top.Ext.getCmp('departNameOfpatient')) {
-							settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
-							settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
-						}
 					}
 					//高值耗材(非一次性物品的高值耗材)
 					var record = new addTousseInstance({
@@ -903,16 +915,28 @@
 							settleAccountDeptNameUseRecord = goodsInfo.assetsBelong;
 							settleAccountDeptCodeUseRecord = goodsInfo.assetsBelongCode;
 						} else {
+							if (top.Ext.getCmp('doctorAccountDepart')) {
+								settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
+								settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
+							}
+							if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
+								if (top.Ext.getCmp('departNameOfpatient')) {
+									settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+									settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+								}
+							}
+						}
+					} else {
+						if (top.Ext.getCmp('doctorAccountDepart')) {
+							settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
+							settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
+						}
+						if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
 							if (top.Ext.getCmp('departNameOfpatient')) {
 								settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
 							}
 						}
-					} else {
-						if (top.Ext.getCmp('departNameOfpatient')) {
-							settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
-							settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
-						}
 					}
 
 					if (goodsInfo.tousseType != '一次性物品' && goodsInfo.tousseType != '高值耗材') {