Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js
===================================================================
diff -u -r41458 -r41474
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js	(.../useRecordViewForm.js)	(revision 41458)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js	(.../useRecordViewForm.js)	(revision 41474)
@@ -618,6 +618,22 @@
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
 							}
 						}
+					} else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+						if(goodsInfo.doctorAccountDepart && goodsInfo.doctorAccountDepart !== ''){
+							settleAccountDeptNameUseRecord = goodsInfo.doctorAccountDepart;
+							settleAccountDeptCodeUseRecord = goodsInfo.doctorAccountDepartCode;
+						}else {
+							if (top.Ext.getCmp('doctorAccountDepart')) {
+								settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
+								settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
+							}
+							if(settleAccountDeptNameUseRecord == ''){
+								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() || '';