Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r37112 -r37135
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37112)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37135)
@@ -375,9 +375,21 @@
 					}
 					var settleAccountDeptCodeUseRecord = '';
 					var settleAccountDeptNameUseRecord = '';
-					if (top.Ext.getCmp('departNameOfpatient')) {
-						settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
-						settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+					if(useRecordTiSettlementDepart == '资产归属和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+						if(goodsInfo.assetsBelongCode && goodsInfo.assetsBelongCode !== ''){
+							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 (top.Ext.getCmp('departNameOfpatient')) {
+							settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
+							settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+						}
 					}
 					//高值耗材(非一次性物品的高值耗材)
 					var record = new addTousseInstance({
@@ -719,9 +731,21 @@
 
 					var settleAccountDeptCodeUseRecord = '';
 					var settleAccountDeptNameUseRecord = '';
-					if (top.Ext.getCmp('departNameOfpatient')) {
-						settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || '';
-						settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || '';
+					if(useRecordTiSettlementDepart == '资产归属和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+						if(goodsInfo.assetsBelongCode && goodsInfo.assetsBelongCode !== ''){
+							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 (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 -r37105 -r37135
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 37105)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 37135)
@@ -1334,6 +1334,30 @@
 								anchor: '100%',
 								allowBlank: true
 							}]
+						}, {
+							layout: 'form',
+							labelWidth: 180,
+							columnWidth: .25,
+							hidden: !sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction,
+							items: [{
+								xtype: 'combo',
+								fieldLabel: '使用记录结算科室取值范围',
+								id: 'useRecordTiSettlementDepart',
+								name: 'useRecordTiSettlementDepart',
+								valueField: 'value',
+								displayField: 'value',
+								mode: 'local',
+								anchor: '100%',
+								editable: false,
+								store: new Ext.data.SimpleStore({
+									fields: ['value'],
+									data: [['资产归属和病人所在科室'], ['仅病人所在科室']]
+								}),
+								forceSelection: true,
+								allowBlank: true,
+								value:'仅病人所在科室',
+								triggerAction: 'all'
+							}]
 						}
 					]
 				}, {
@@ -3785,6 +3809,12 @@
 							return;
 						}
 					}
+					
+					//SZSDSRMYY-130:使用记录结算科室取值范围
+					var useRecordTiSettlementDepart = '';
+					if(sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+						useRecordTiSettlementDepart = Ext.getCmp("useRecordTiSettlementDepart").getValue();
+					}
 
 					//KSDQDYRMYY-13
 					var isEnableTousseOpRecipient = '否';
@@ -4013,6 +4043,7 @@
 							dashboardsScreenSaver:dashboardsScreenSaver,
 							tousseCamImgVidRetentionTime:tousseCamImgVidRetentionTime,
 							ftCamImgVidRetentionTime:ftCamImgVidRetentionTime,
+							useRecordTiSettlementDepart:useRecordTiSettlementDepart,
 							invoiceModeTousseRange:invoiceModeTousseRange,
 							kardexContainerHost:kardexContainerHost,
 							kardexContainerPort:kardexContainerPort,
@@ -4302,6 +4333,10 @@
 				Ext.getCmp('tousseCamImgVidRetentionTime').setValue(supplyRoomConfig.tousseCamImgVidRetentionTime || '');
 				Ext.getCmp('ftCamImgVidRetentionTime').setValue(supplyRoomConfig.ftCamImgVidRetentionTime || '');
 			}
+			//SZSDSRMYY-130:使用记录结算科室取值范围
+			if(sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){
+				Ext.getCmp('useRecordTiSettlementDepart').setValue(supplyRoomConfig.useRecordTiSettlementDepart || '仅病人所在科室');
+			}
 			var isFtOnlyImplantConvert = (supplyRoomConfig.isFtOnlyImplantConvert == true || supplyRoomConfig.isFtOnlyImplantConvert == 'true')?'是':'否';
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
===================================================================
diff -u -r37108 -r37135
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 37108)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 37135)
@@ -54,6 +54,7 @@
 	SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
 	boolean isEnableTousseOpRecipient = supplyRoomConfig.getIsEnableTousseOpRecipient();
 	boolean isEnableTousseOpDestLocation = supplyRoomConfig.getIsEnableTousseOpDestLocation();
+	String useRecordTiSettlementDepart = supplyRoomConfig.getUseRecordTiSettlementDepart();
 %>
 
 <html>
@@ -98,6 +99,7 @@
 	}
 	var isEnableTousseOpRecipient = <%=isEnableTousseOpRecipient%>;
 	var isEnableTousseOpDestLocation = <%=isEnableTousseOpDestLocation%>;
+	var useRecordTiSettlementDepart = '<%=useRecordTiSettlementDepart%>'
 	//质量监测
 	var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
 	var moduleNameArr = new Array("<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INFECTIONPART%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_OTHERPART%>");