费用结算

account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java

@@ -155,6 +155,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
                 BigDecimal comp = divide.multiply(divide1).setScale(4, BigDecimal.ROUND_DOWN);//基护完成率
                 vo.setCompletionRateFoundationProtection(comp.multiply(BigDecimal.valueOf(100)).doubleValue() + "%");
                 //巡护基护完成考核
+                vo.setPatrolAndBasicProtectionCompletedAssessment("-");
                 BigDecimal patrolAndBasicProtectionCompletedAssessment = BigDecimal.valueOf(0.8);//巡护基护完成考核
                 if (FndSrvMode.PATROL.getCode().equals(bo.getSrvModeId())) {//巡护
                     long serviceTime = 0;//服务时长/毫秒
@@ -259,6 +260,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
                 BigDecimal comp2 = divide2.multiply(divide3).setScale(4, BigDecimal.ROUND_DOWN);//照护完成率
                 vo.setCareCompletionRate(comp2.multiply(BigDecimal.valueOf(100)).doubleValue() + "%");
                 //巡护照护完成考核
+                vo.setPatrolCareCompletionAssessment("-");
                 BigDecimal patrolCareCompletionAssessment = BigDecimal.valueOf(0.8);//巡护照护完成考核
                 if (FndSrvMode.PATROL.getCode().equals(bo.getSrvModeId())) {//巡护
                     long serviceTime = 0;//服务时长/毫秒
@@ -337,10 +339,10 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
                 totalAmountDue = totalAmountDue.add(BigDecimal.valueOf(vo.getTotalAmountDue()));
             }
             totalVo.setFoundationProtectionCost(foundationProtectionCost.doubleValue());
-            totalVo.setExpensesPayableFoundationProtection(foundationProtectionCost.doubleValue());
-            totalVo.setCareCosts(foundationProtectionCost.doubleValue());
-            totalVo.setCarePayable(foundationProtectionCost.doubleValue());
-            totalVo.setTotalAmountDue(foundationProtectionCost.doubleValue());
+            totalVo.setExpensesPayableFoundationProtection(expensesPayableFoundationProtection.doubleValue());
+            totalVo.setCareCosts(careCosts.doubleValue());
+            totalVo.setCarePayable(carePayable.doubleValue());
+            totalVo.setTotalAmountDue(totalAmountDue.doubleValue());
             ExpenseVo expenseVo = new ExpenseVo();
             expenseVo.setExpenseSettlements(vos);
             expenseVo.setTotal(totalVo);