Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r41426 -r41433
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41426)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41433)
@@ -447,6 +447,16 @@
 							settleAccountDeptNameUseRecord = goodsInfo.assetsBelong;
 							settleAccountDeptCodeUseRecord = goodsInfo.assetsBelongCode;
 						} else {
+							if (top.Ext.getCmp('departNameOfpatient')) {
+								settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+								settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+							}
+						}
+					} else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+						if(goodsInfo.doctorAccountDepartCode && goodsInfo.doctorAccountDepartCode !== ''){
+							settleAccountDeptNameUseRecord = goodsInfo.doctorAccountDepart;
+							settleAccountDeptCodeUseRecord = goodsInfo.doctorAccountDepartCode;
+						}else {
 							if (top.Ext.getCmp('doctorAccountDepart')) {
 								settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
@@ -459,16 +469,10 @@
 							}
 						}
 					} else {
-						if (top.Ext.getCmp('doctorAccountDepart')) {
-							settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
-							settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
+						if (top.Ext.getCmp('departNameOfpatient')) {
+							settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+							settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
 						}
-						if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
-							if (top.Ext.getCmp('departNameOfpatient')) {
-								settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
-								settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
-							}
-						}
 					}
 					//高值耗材(非一次性物品的高值耗材)
 					var record = new addTousseInstance({
@@ -915,6 +919,16 @@
 							settleAccountDeptNameUseRecord = goodsInfo.assetsBelong;
 							settleAccountDeptCodeUseRecord = goodsInfo.assetsBelongCode;
 						} else {
+							if (top.Ext.getCmp('departNameOfpatient')) {
+								settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+								settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+							}
+						}
+					} else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+						if(goodsInfo.doctorAccountDepartCode && goodsInfo.doctorAccountDepartCode !== ''){
+							settleAccountDeptNameUseRecord = goodsInfo.doctorAccountDepart;
+							settleAccountDeptCodeUseRecord = goodsInfo.doctorAccountDepartCode;
+						}else {
 							if (top.Ext.getCmp('doctorAccountDepart')) {
 								settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
@@ -927,16 +941,10 @@
 							}
 						}
 					} else {
-						if (top.Ext.getCmp('doctorAccountDepart')) {
-							settleAccountDeptNameUseRecord = top.Ext.getCmp('doctorAccountDepart').getRawValue() || '';
-							settleAccountDeptCodeUseRecord = top.Ext.getCmp('doctorAccountDepartCode').getValue() || '';
+						if (top.Ext.getCmp('departNameOfpatient')) {
+							settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+							settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
 						}
-						if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
-							if (top.Ext.getCmp('departNameOfpatient')) {
-								settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
-								settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
-							}
-						}
 					}
 
 					if (goodsInfo.tousseType != '一次性物品' && goodsInfo.tousseType != '高值耗材') {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r41033 -r41433
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 41033)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 41433)
@@ -1927,7 +1927,7 @@
 								editable: false,
 								store: new Ext.data.SimpleStore({
 									fields: ['value'],
-									data: [['资产归属和病人所在科室'], ['仅病人所在科室']]
+									data: [['资产归属和病人所在科室'], ['仅病人所在科室'], ['主刀医生核算科室和病人所在科室']]
 								}),
 								forceSelection: true,
 								allowBlank: true,
Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
===================================================================
diff -u -r41426 -r41433
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41426)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 41433)
@@ -182,6 +182,16 @@
 									settleAccountDeptNameUseRecord = goodsInfo.assetsBelong;
 									settleAccountDeptCodeUseRecord = goodsInfo.assetsBelongCode;
 								}else {
+									if (Ext4.getCmp('departNameOfpatient')) {
+										settleAccountDeptNameUseRecord = Ext4.getCmp('departNameOfpatient').getRawValue() || '';
+										settleAccountDeptCodeUseRecord = Ext4.getCmp('departCodeOfpatient').getValue() || '';
+									}
+								}
+							}else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+								if(goodsInfo.doctorAccountDepartCode && goodsInfo.doctorAccountDepartCode !== ''){
+									settleAccountDeptNameUseRecord = goodsInfo.doctorAccountDepart;
+									settleAccountDeptCodeUseRecord = goodsInfo.doctorAccountDepartCode;
+								}else {
 									if (Ext4.getCmp('doctorAccountDepart')) {
 										settleAccountDeptNameUseRecord = Ext4.getCmp('doctorAccountDepart').getRawValue() || '';
 										settleAccountDeptCodeUseRecord = Ext4.getCmp('doctorAccountDepartCode').getValue() || '';
@@ -194,16 +204,10 @@
 									}
 								}
 							}else {
-								if (Ext4.getCmp('doctorAccountDepart')) {
-									settleAccountDeptNameUseRecord = Ext4.getCmp('doctorAccountDepart').getRawValue() || '';
-									settleAccountDeptCodeUseRecord = Ext4.getCmp('doctorAccountDepartCode').getValue() || '';
+								if (Ext4.getCmp('departNameOfpatient')) {
+									settleAccountDeptNameUseRecord = Ext4.getCmp('departNameOfpatient').getRawValue() || '';
+									settleAccountDeptCodeUseRecord = Ext4.getCmp('departCodeOfpatient').getValue() || '';
 								}
-								if(settleAccountDeptNameUseRecord == '' || settleAccountDeptCodeUseRecord == ''){
-									if (Ext4.getCmp('departNameOfpatient')) {
-										settleAccountDeptNameUseRecord = Ext4.getCmp('departNameOfpatient').getRawValue() || '';
-										settleAccountDeptCodeUseRecord = Ext4.getCmp('departCodeOfpatient').getValue() || '';
-									}
-								}
 							}
 							function addTousse() {
 								var record = new TousseInstance({
@@ -360,10 +364,6 @@
 		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/buttjoint/useRecord/useRecordViewForm.js
===================================================================
diff -u -r40947 -r41433
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js	(.../useRecordViewForm.js)	(revision 40947)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js	(.../useRecordViewForm.js)	(revision 41433)
@@ -422,6 +422,22 @@
 								settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
 							}
 						}
+					} else if(useRecordTiSettlementDepart == '主刀医生核算科室和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+						if(goodsInfo.doctorAccountDepartCode && goodsInfo.doctorAccountDepartCode !== ''){
+							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 == '' || 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() || '';