费用结算

account/account-service/src/main/java/com/hungraim/ltc/account/dao/SrvTaskMapper.java

@@ -38,7 +38,7 @@ public interface SrvTaskMapper extends BaseMapper<ChSrvTask> {
             "  LEFT JOIN ch_srv_program t4 ON t1.program_id = t4.program_id" +
             "  LEFT JOIN ch_fnd_srv_mode t5 ON t4.srv_mode_id = t5.srv_mode_id" +
             "  LEFT JOIN ch_apr_report t6 ON t6.task_id = t1.srv_task_id" +
-            "  LEFT JOIN ch_srv_program_set t7 ON t7.set_id = t4.program_id and t7.is_conf = 1" +
+            "  LEFT JOIN ch_srv_program_set t7 ON t7.program_id = t4.program_id and t7.is_conf = 1" +
             "  LEFT JOIN ch_cfg_srv_item t8 ON t8.item_id = t7.item_id" +
             "  LEFT JOIN ch_srv_organ t9 ON t9.srv_organ_id = t4.srv_organ_id" +
             "<where> " +

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

@@ -346,8 +346,11 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
             totalVo.setCarePayable(carePayable.doubleValue());
             totalVo.setTotalAmountDue(totalAmountDue.doubleValue());
             ExpenseVo expenseVo = new ExpenseVo();
+            expenseVo.setTotal(expenseSettlementInfo.getTotal());
+            expenseVo.setCurrent(expenseSettlementInfo.getCurrent());
+            expenseVo.setSize(expenseSettlementInfo.getSize());
             expenseVo.setExpenseSettlements(vos);
-            expenseVo.setTotal(totalVo);
+            expenseVo.setTotalVo(totalVo);
             return expenseVo;
         }
         return new ExpenseVo();

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/ExpenseVo.java

@@ -7,6 +7,10 @@ import java.util.List;
 @Data
 public class ExpenseVo {
 
+    private long total;
+    private long size;
+    private long current;
+
     /**
      * 费用结算
      */
@@ -16,6 +20,6 @@ public class ExpenseVo {
     /**
      * 合计
      */
-    private ExpenseSettlementTotalVo total;
+    private ExpenseSettlementTotalVo totalVo;
 
 }