Преглед на файлове

BUGFIX
1、解决新增零星账单的费用生成月度账单会带出的问题

liangwenxuan преди 2 седмици
родител
ревизия
7567a5256b

+ 3 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/DailyExpensesServiceImpl.java

@@ -118,9 +118,11 @@ public class DailyExpensesServiceImpl implements DailyExpensesService {
                         .in(ExpenseOrderDO::getType, 1, 2));
                 if(CollectionUtil.isNotEmpty(expenseOrderDOS)){
                     expenseOrder = expenseOrderDOS.get(0);
-                    dailyExpenses.setIsGenerateBill(BooleanEnum.TRUE.getValue());
                 }
             }
+            if(expenseOrder != null){
+                dailyExpenses.setIsGenerateBill(BooleanEnum.TRUE.getValue());
+            }
             dailyExpenses.setType(isSingleOrder ? 4 : 1);  //1.入院账单 4.零星账单
             dailyExpenses.setElderId(elderId);
             dailyExpenses.setAttributionBillTime(createReqVO.getAttributionBillTime());