|
|
@@ -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());
|