Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r35239 -r35329 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 35239) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 35329) @@ -3581,9 +3581,16 @@ } //使用记录转申请单”功能改进可根据表格列“结算科室”自动拆成多张申请单SZSDSRMYY-95 String settleAccountDeptCodeUseRecord = ""; - if(StringUtils.isNotBlank(tousseInstance.getSettleAccountDeptCodeUseRecord())){ - //表格列“结算科室”中选择的科室已经设置了默认结算科室,则取值默认结算科室中设定的值;SZSDSRMYY-95 - settleAccountDeptCodeUseRecord = getApplyDepartDefaultSettleDepart(tousseInstance.getSettleAccountDeptCodeUseRecord()); + boolean enableTheSettlementDepartmentIsDepartOfPatientFunction = + ConfigUtils.getSystemSetConfigByNameBool("enableTheSettlementDepartmentIsDepartOfPatientFunction"); + if(enableTheSettlementDepartmentIsDepartOfPatientFunction){ + if(StringUtils.isNotBlank(tousseInstance.getSettleAccountDeptCodeUseRecord())){ + //表格列“结算科室”中选择的科室已经设置了默认结算科室,则取值默认结算科室中设定的值;SZSDSRMYY-95 + settleAccountDeptCodeUseRecord = getApplyDepartDefaultSettleDepart(tousseInstance.getSettleAccountDeptCodeUseRecord()); + }else{ + //“结算科室”没有设置默认结算科室,则取值申请科室的默认结算科室;SZSDSRMYY-95 + settleAccountDeptCodeUseRecord = getApplyDepartDefaultSettleDepart(useRecord.getDepartCoding()); + } } Map tousseMap = settleAccountDeptCodeTousseMap.get(settleAccountDeptCodeUseRecord); if(tousseMap == null){