Merge remote-tracking branch 'origin/dev_nursing_records_20230214' into dev_ch_master

account/account-service/src/main/java/com/hungraim/ltc/account/controller/AccountController.java

@@ -3,8 +3,7 @@ package com.hungraim.ltc.account.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.account.service.AccountService;
-import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
-import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccountsResp;
+import com.hungraim.ltc.pojo.entity.account.*;
 import com.hungraim.ltc.pojo.vo.account.*;
 import com.hungraim.ltc.util.FileUtils;
 import com.hungraim.ltc.util.Result;
@@ -100,8 +99,12 @@ public class AccountController {
 
 
 
-
-    @RequestMapping("/organAccountTaskExecute")
+    /**
+     * 任务执行
+     *
+     * @return
+     */
+    @PostMapping("/organAccountTaskExecute")
     public Result organAccountTaskExecute(AccountTaskReqVO accountTaskReqVO){
         List<AccountTaskExecuteReqVO> accountTaskExecuteReqVOS = accountTaskReqVO.getAccountTaskList();
         accountService.organAccountTaskExecute(accountTaskExecuteReqVOS);
@@ -164,17 +167,136 @@ public class AccountController {
     /**
      * 查询机构结算信息列表明细
      *
-     * @param id 结算id
+     * @param accountsId 结算id
      * @return
      */
     @GetMapping("/queryOrganAccountsDetail")
-    public Result<List<ChDisabDetailAccountsResp>>   queryOrganAccountsDetail(String id) {
-        List<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(id);
+    public Result<Page<ChDisabDetailAccountsResp>>   queryOrganAccountsDetail(Integer pageNum, Integer pageSize, String accountsId) {
+        if (StringUtils.isBlank(accountsId)) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        Page<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(pageNum,pageSize,accountsId,null);
+        return Result.success(chAssessDetailAccounts);
+    }
+
+
+    /**
+     * 基金申报列表查询
+     * @param
+     * @return
+     */
+    @GetMapping("/queryAccountsDeclareList")
+    public Result<Page<ChDisabDetailAccountsResp>>   queryAccountsDeclareList(Integer pageNum, Integer pageSize) {
+        Page<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(pageNum,pageSize,null,0);
+        return Result.success(chAssessDetailAccounts);
+    }
+
+    /**
+     * 暂缓列表查询
+     * @param
+     * @return
+     */
+    @GetMapping("/queryDelayAccountList")
+    public Result<Page<ChDisabDetailAccountsResp>>   queryDelayAccountList(Integer pageNum, Integer pageSize) {
+        Page<ChDisabDetailAccountsResp> chAssessDetailAccounts = accountService.queryOrganAccountsDetail(pageNum,pageSize,null,2);
         return Result.success(chAssessDetailAccounts);
     }
 
+    /**
+     * 暂缓
+     * @param  status  1 恢复   2 暂缓
+     * @return
+     */
+    @PostMapping("/delayAccountCommit")
+    public Result<Page<ChDisabDetailAccountsResp>> delayAccountCommit(Long accountsDetailId, Short status) {
+        int result = accountService.delayAccountCommit(accountsDetailId, status);
+        if (result > 0) {
+            return Result.success();
+        } else {
+            return Result.failed();
+        }
+    }
 
 
+    /**
+     * 基金申报提交
+     * @param
+     * @return
+     */
+    @PostMapping("/accountsFreeCommit")
+    public Result accountsFreeCommit(Long accountsDetailId) {
+        int result = accountService.accountsFreeCommit(accountsDetailId);
+        if (result > 0) {
+            return Result.success();
+        } else {
+            return Result.failed();
+        }
+    }
+
+    /**
+     * 查询护理记录
+     *
+     * @param taskDetailId 结算详情id
+     * @return
+     */
+    @GetMapping("/queryNursingRecords")
+    public Result<Page<NursingRecordsRespVO>>   queryNursingRecords(Integer pageNum, Integer pageSize, String taskDetailId) {
+        Page<NursingRecordsRespVO> nursingRecordsRespVOList = accountService.queryNursingRecords(pageNum,pageSize,taskDetailId);
+        return Result.success(nursingRecordsRespVOList);
+    }
+
+
+    @GetMapping("/queryOverallCostRecords")
+    public Result<OverallEduceDecreaseCostRespVO>   queryOverallCostRecords(OverallCostReqVO req) {
+        String certiCode = req.getCertiCode();
+        if (StringUtils.isBlank(certiCode)) {
+            return Result.failed("查询条件证件号不能为空");
+        }
+        OverallEduceDecreaseCostRespVO overallCostRecords = accountService.queryOverallCostRecords(req);
+        return Result.success(overallCostRecords);
+    }
+
+
+
+    /**
+     * 费用扣减提交
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/overallCostSubmit")
+    public Result  overallCostSubmit(OverallCostSubmitReqVO req) {
+        int result = accountService.overallCostSubmit(req);
+        if(result > 0){
+            return Result.success();
+        }else{
+            return Result.failed();
+        }
+    }
+
+    /**
+     * 删除护理机构
+     *
+     * @param accountsDetailId  结算详情id
+     */
+    @DeleteMapping("/deleteAccountsDetail")
+    public Result deleteAccountsDetail(Long accountsDetailId) {
+        if (null == accountsDetailId) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        int result = accountService.deleteAccountsDetail(accountsDetailId);
+        if(result > 0){
+            return Result.success();
+        }else{
+            return Result.failed();
+        }
+    }
+
+    @GetMapping("/queryOverallCostList")
+    public Result<Page<OverallCostListRespVO>>   queryOverallCostList(OverallCostReqVO req) {
+        Page<OverallCostListRespVO> overallCostRecords = accountService.queryOverallCostList(req);
+        return Result.success(overallCostRecords);
+    }
 
     /**
      * 机构结算管理提交复核

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

@@ -2,12 +2,11 @@ package com.hungraim.ltc.account.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
-import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts;
-import com.hungraim.ltc.pojo.vo.account.*;
+import com.hungraim.ltc.pojo.entity.account.*;
+import com.hungraim.ltc.pojo.vo.account.AccountExportDetailListResp;
+import com.hungraim.ltc.pojo.vo.account.OrganAccountsVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -19,15 +18,22 @@ public interface ChDisabAccountsDetailMapper extends BaseMapper<ChDisabDetailAcc
     List<OrganAccountsVO> getOrganAccountsList(String taskDetailId);
 
 
-    Page<SrvOrganAccountListResp> searchSrvOrganAccountList(Page page, List<Long> organIds, SrvOrganListReq req);
-
-
     List<AccountExportDetailListResp> searchSrvOrganAccountDetailExport(String accountsId);
 
     List<ChDisabDetailAccounts> queryAccountByCondition(@Param("taskDetailIds") List<String> taskDetailIds);
 
     List<OrganAccountsVO> getOtherPlaceList(String programId);
 
+    Page<ChDisabDetailAccountsResp> queryOrganAccountsDetail(Page page,String accountsId,Integer status);
+
+    Page<NursingRecordsRespVO> queryNursingRecords(Page page, String taskDetailId);
+
+    OverallEduceDecreaseCostRespVO queryOverallCostRecords(OverallCostReqVO req);
+
+    Page<OverallCostListRespVO> queryOverallCostList(Page page, OverallCostReqVO req);
+
+    int updateByAccountsId(String accountsId);
+
 
 
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
 import com.hungraim.ltc.pojo.vo.account.AccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganAccountListResp;
 import com.hungraim.ltc.pojo.vo.account.SrvOrganListReq;
 import com.hungraim.ltc.pojo.vo.account.SrvOrganListResp;
 import org.apache.ibatis.annotations.Mapper;
@@ -52,5 +53,10 @@ public interface ChDisabAccountsMapper extends BaseMapper<ChDisabAccounts> {
 
 
 
-    ChDisabAccounts queryAccountByCondition(String accountsTime, String modeName, String srvOrganId);
+    ChDisabAccounts queryAccountByCondition(String accountsTime, String modeName, String srvOrganId,Integer isDelay);
+
+
+    Page<SrvOrganAccountListResp> searchSrvOrganAccountList(Page page, List<Long> organIds, SrvOrganListReq req);
+
+
 }
\ No newline at end of file

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

-package com.hungraim.ltc.account.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts;
-import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccountsResp;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * @author mq
- */
-@Mapper
-@Repository
-public interface ChDisabDetailAccountsMapper extends BaseMapper<ChDisabDetailAccounts> {
-    List<ChDisabDetailAccountsResp> queryOrganAccountsDetail(String accountsId);
-}

account/account-service/src/main/java/com/hungraim/ltc/account/service/AccountService.java

@@ -31,7 +31,16 @@ public interface AccountService extends IService<ChDisabAccounts> {
 
 
 
-    List<ChDisabDetailAccountsResp> queryOrganAccountsDetail(String id);
+    Page<ChDisabDetailAccountsResp> queryOrganAccountsDetail(Integer pageNum, Integer pageSize,String accountsId,Integer status);
+
+
+    Page<NursingRecordsRespVO> queryNursingRecords(Integer pageNum, Integer pageSize, String taskDetailId);
+
+    OverallEduceDecreaseCostRespVO queryOverallCostRecords(OverallCostReqVO req);
+
+    Page<OverallCostListRespVO> queryOverallCostList(OverallCostReqVO req);
+
+    int  overallCostSubmit(OverallCostSubmitReqVO req);
 
     int updateChDisabAccounts(int id);
 
@@ -39,4 +48,10 @@ public interface AccountService extends IService<ChDisabAccounts> {
     void organAccountTaskExecute(List<AccountTaskExecuteReqVO> accountTaskExecuteReqVOS);
 
     void otherPlaceHandler(String programId);
+
+    int deleteAccountsDetail(Long accountsDetailId);
+
+    int accountsFreeCommit(Long accountsDetailId);
+
+    int delayAccountCommit(Long accountsDetailId,Short status);
 }

account/account-service/src/main/resources/mapper/ChDisabAccountsMapper.xml

@@ -17,15 +17,59 @@
   </sql>
 
 
-
-
     <select id="queryAccountByCondition" resultType="com.hungraim.ltc.pojo.entity.account.ChDisabAccounts">
         select * from CH_DISAB_ACCOUNTS t where   t.MODE_NAME = #{modeName}
         and to_char(t.ACCOUNTS_TIME,'yyyy-MM') = #{accountsTime}
        and   t.SRV_ORGAN_ID = #{srvOrganId}
-
+       <if test="isDelay !=null">
+         and t.IS_DELAY = 2
+       </if>
     </select>
 
 
 
+    <select id="searchSrvOrganAccountList" resultType="com.hungraim.ltc.pojo.vo.account.SrvOrganAccountListResp">
+        SELECT
+        t1.ACCOUNTS_ID,
+        t3.ORGAN_ID,
+        t3.ORGAN_NAME,
+        t2.SRV_ORGAN_ID,
+        t2.SRV_ORGAN_NAME,
+        t1.ACCOUNTS_TIME,
+        t1.ACCOUNTS_STATUS,
+        t1.ALL_COST,
+        t1.OVERALL_COST,
+        t1.PERSONAL_COST,
+        t1.SVR_START_TIME,
+        t1.MODE_NAME,
+        to_char(t1.SVR_START_TIME,'yyyy-MM-dd') svrStartTime,
+        to_char(t1.SVR_END_TIME,'yyyy-MM-dd') svrEndTime,
+        t1.TOTAL_ALLOCATED_EXPENSES   totalAllocatedExpenses,
+        t1.REISSUE_AMOUNT_TOTAL reissueAmountTotal,
+        t1.DEDUCTION_AMOUNT_TOTAL deductionAmountTotal
+        FROM
+        CH_DISAB_ACCOUNTS t1
+        LEFT JOIN CH_SRV_ORGAN t2 ON t1.SRV_ORGAN_ID = t2.SRV_ORGAN_ID
+        LEFT JOIN CH_FND_ORGAN t3 ON t2.ORGAN_ID = t3.ORGAN_ID
+        <where>
+            t1.ACCOUNTS_STATUS !=0
+            <if test='organIds != null and organIds.size()>0'>
+                AND t3.ORGAN_ID IN
+                <foreach collection="organIds" open="(" close=")" item="organId" separator=",">
+                    #{organId}
+                </foreach>
+            </if>
+            <if test='req.srvOrganId != null'>
+                AND t2.SRV_ORGAN_ID = #{req.srvOrganId}
+            </if>
+            <if test='req.accountsTime != null'>
+                AND t1.ACCOUNTS_TIME = #{req.accountsTime}
+            </if>
+            <if test="req.accountsStatus != null and  req.accountsStatus != ''">
+                and t1.ACCOUNTS_STATUS = #{req.accountsStatus}
+            </if>
+        </where>
+    </select>
+
+
 </mapper>
\ No newline at end of file

account/account-service/src/main/resources/mapper/ChDisabDetailAccountsMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hungraim.ltc.account.dao.ChDisabDetailAccountsMapper">
-
-    <select id="queryOrganAccountsDetail" resultType="com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccountsResp">
-      select
-  d.MODE_NAME modeName,
-  to_char(d.ACCOUNTS_START_TIME,'yyyy-MM-dd HH24:mi:ss') accountsStartTime,
-  to_char(d.ACCOUNTS_END_TIME,'yyyy-MM-dd HH24:mi:ss') accountsEndTime,
-  to_char(d.ACCOUNTS_TIME,'yyyy-MM') accountsTime,
-  d.ACCOUNTS_ALL_COST accountsAllCost,
-  d.ACCOUNTS_OVERALL_COST accountsOverallCost,
-  d.ACCOUNTS_PERSONAL_COST accountsPersonalCost,
-   (select district_name from ch_fnd_district dis where apply.MEDICAL_AREA = dis.district_code)  medicalArea,
-  o.SRV_ORGAN_NAME  srvOrganName,
-  info.REAL_NAME realName
-from  CH_DISAB_ACCOUNTS_DETAIL  d
-left join  CH_DISABLE_INFO info on d.DISAB_INFO_ID = info.DISAB_INFO_ID
-  left join  CH_DISABLE_APPLY apply on info.APPLY_ID=apply.APPLY_ID
-  left join CH_SRV_ORGAN  o on d.SRV_ORGAN_ID = o.SRV_ORGAN_ID
-where d.ACCOUNTS_ID = #{accountsId}
-    </select>
-</mapper>
\ No newline at end of file

account/account-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

@@ -18,13 +18,13 @@
      left join ch_srv_organ_emp emp on plan.emp_id = emp.emp_id
      left join CH_SRV_ORGAN organ on organ.SRV_ORGAN_ID = plan.SRV_ORGAN_ID
          <where>
-             <if test="req.status != null">
+             <if test="req.status != null  and req.status != ''">
                 and plan.IS_STATUS = #{req.status}
              </if>
-             <if test="req.realName != null">
+             <if test="req.realName != null  and req.realName != ''">
                  AND info.real_name LIKE CONCAT('%',CONCAT(#{req.realName},'%'))
              </if>
-             <if test="req.srvOrganName != null">
+             <if test="req.srvOrganName != null  and req.srvOrganName != ''">
                  AND organ.SRV_ORGAN_NAME   LIKE CONCAT('%',CONCAT(#{req.srvOrganName},'%'))
              </if>
          </where>

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabAccounts.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -33,7 +34,7 @@ public class ChDisabAccounts implements Serializable {
     /**
      * 实拨总费用
      */
-    private String totalAllocatedExpenses;
+    private BigDecimal totalAllocatedExpenses;
 
     /**
      * 创建时间
@@ -52,7 +53,7 @@ public class ChDisabAccounts implements Serializable {
     /**
      * 应拨总费用
      */
-    private String totalExpensesPayable;
+    private BigDecimal totalExpensesPayable;
 
     /**
      * 是否结算(0未结算，1已结算)
@@ -60,7 +61,7 @@ public class ChDisabAccounts implements Serializable {
     private Short chooseSettle;
 
     /**
-     * 状态（0-待提交；1-待审核；2-已审核；3-已失效；）
+     * 状态（1 待审核  2 已审核  3 已结算）
      */
     private Short accountsStatus;
 
@@ -90,17 +91,33 @@ public class ChDisabAccounts implements Serializable {
     /**
      * 总费用合计
      */
-    private String allCost;
+    private BigDecimal allCost;
 
     /**
      * 统筹支出
      */
-    private String overallCost;
+    private BigDecimal overallCost;
 
     /**
      * 个人支出
      */
-    private String  personalCost;
+    private BigDecimal  personalCost;
+    /**
+     *扣减金额合计
+     */
+    private BigDecimal deductionAmountTotal;
+
+    /**
+     *补发金额
+     */
+    private BigDecimal reissueAmountTotal;
+
+    /**
+     * 是否暂缓    2 暂缓
+     */
+    private Short isDelay;
+
+
 
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabDetailAccounts.java

@@ -52,9 +52,16 @@ public class ChDisabDetailAccounts implements Serializable {
      */
     private BigDecimal accountsAllCost;
 
+    /**
+     * 统筹费用
+     */
     private BigDecimal accountsOverallCost;
 
+    /**
+     * 个人支付
+     */
     private BigDecimal accountsPersonalCost;
+
     /**
      * 服务方式
      */
@@ -64,16 +71,50 @@ public class ChDisabDetailAccounts implements Serializable {
      * 费用开始日期
      */
     private Date  accountsStartTime;
+
     /**
      * 费用结束日期
      */
     private Date accountsEndTime;
 
+    /**
+     * 任务详情id
+     */
     private String taskDetailId;
 
+    /**
+     * 护理人员id
+     */
+    private Long empId;
+
+    /**
+     * 统筹区
+     */
     private String medicalArea;
 
-    private String itemIds;
+    /**
+     *交易类型  1、补发  2、扣减
+     */
+    private int dealType;
+
+    /**
+     *扣减金额
+     */
+    private BigDecimal deductionAmount;
+
+    /**
+     *补发金额
+     */
+    private BigDecimal reissueAmount;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 状态（1 恢复状态  2 暂缓状态  3）
+     */
+    private Short status;
 
 
     private static final long serialVersionUID = 1L;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabDetailAccountsResp.java

@@ -35,6 +35,8 @@ public class ChDisabDetailAccountsResp implements Serializable {
      */
     private String  modeName;
 
+    private String empName;
+
     /**
      * 费用开始日期
      */
@@ -51,5 +53,15 @@ public class ChDisabDetailAccountsResp implements Serializable {
 
     private String realName;
 
+    private String taskDetailId;
+
+    private String deductionAmount;
+
+    private String reissueAmount;
+
+    private String accountsDetailId;
+
+    private Integer status;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/NursingRecordsRespVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import lombok.Data;
+
+/**
+ * @author zwl
+ * @ClassName NursingRecordsRespVO
+ * @description
+ * @date 2023/2/14 10:10
+ **/
+@Data
+public class NursingRecordsRespVO {
+
+    /**
+     * 护理机构
+     **/
+    private String srvOrganName;
+    /**
+     * 服务方式
+     **/
+    private String modeName;
+
+    /**
+     *执行日期
+     **/
+    private String executionTime;
+    /**
+     *任务名称
+     **/
+    private String itemName;
+
+
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/OverallCostListRespVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import lombok.Data;
+
+/**
+ * @author zwl
+ * @ClassName OverallCostListRespVO
+ * @description
+ * @date 2023/2/14 21:10
+ **/
+
+@Data
+public class OverallCostListRespVO {
+
+    /**
+     *失能人员姓名
+     */
+    private String realName;
+
+
+    /**
+     *身份证号
+     */
+    private String certiCode;
+
+    /**
+     *医保统筹区
+     */
+    private String medicalArea;
+
+    /**
+     * 费用开始时间
+     */
+    private String svrStartTime;
+
+    /**
+     * 费用结束时间
+     */
+    private String svrEndTime;
+
+    /**
+     *交易类型  1、补发  2、扣减
+     */
+    private int dealType;
+
+    /**
+     *扣减金额
+     */
+    private String deductionAmount;
+
+    /**
+     *补发金额
+     */
+    private String reissueAmount;
+
+    private String amountOfMoney;
+
+
+    private String accountsDetailId;
+
+    private String accountsOverallCost;
+
+    private String srvOrganName;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/OverallCostReqVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import com.hungraim.ltc.pojo.vo.BaseReq;
+import lombok.Data;
+
+/**
+ * @author zwl
+ * @ClassName OverallCostReqVO
+ * @description
+ * @date 2023/2/14 15:11
+ **/
+
+@Data
+public class OverallCostReqVO  extends BaseReq {
+
+    /**
+     *失能人员姓名
+     */
+    private String realName;
+
+    /**
+     *身份证号
+     */
+    private String certiCode;
+
+    /**
+     * 护理机构名称
+     */
+   private String srvOrganName;
+
+   private String accountsTime;
+
+   private Integer dealType;
+
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/OverallCostSubmitReqVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import lombok.Data;
+
+/**
+ * @author zwl
+ * @ClassName OverallCostSubmitReqVO
+ * @description
+ * @date 2023/2/14 16:56
+ **/
+@Data
+public class OverallCostSubmitReqVO {
+
+    /**
+     * 结算详情Id
+     */
+    private Long accountsDetailId;
+
+
+    private Long accountsId;
+
+    /**
+     * 交易类型  1、补发  2、扣减
+     */
+    private int dealType;
+
+    /**
+     * 金额
+     */
+    private String amountOfMoney;
+
+
+    /**
+     * 备注
+     */
+    private String remarks;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/OverallEduceDecreaseCostRespVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import lombok.Data;
+
+/**
+ * @author zwl
+ * @ClassName OverallEduceDecreaseCostRespVO
+ * @description
+ * @date 2023/2/14 15:11
+ **/
+
+@Data
+public class OverallEduceDecreaseCostRespVO {
+
+
+    /**
+     *失能人员姓名
+     */
+    private String realName;
+
+
+    /**
+     *身份证号
+     */
+    private String certiCode;
+
+    /**
+     *医保统筹区
+     */
+    private String medicalArea;
+
+    /**
+     * 费用开始时间
+     */
+    private String svrStartTime;
+
+    /**
+     * 费用结束时间
+     */
+    private String svrEndTime;
+
+    /**
+     *交易类型  1、补发  2、扣减
+     */
+    private int dealType;
+
+    /**
+     *扣减金额
+     */
+    private String deductionAmount;
+
+    /**
+     *补发金额
+     */
+    private String reissueAmount;
+
+
+    private String accountsDetailId;
+
+    private String accountsOverallCost;
+
+    private String srvOrganName;
+
+    private Long accountsId;
+
+
+
+
+}

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

@@ -49,9 +49,9 @@ public class OrganAccountsVO {
      */
     private String medicalArea;
     /**
-     * 护理服务人员
+     * 护理服务人员Id
      */
-    private String empName;
+    private Long empId;
     /**
      * 任务时间
      */
@@ -70,10 +70,7 @@ public class OrganAccountsVO {
      * 机构等级
      */
     private String levelCode;
-    /**
-     * 失能等级
-     */
-    private String disableLevelName;
+
     /**
      * 总费用
      */

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

@@ -5,6 +5,7 @@ import lombok.Data;
 import org.checkerframework.checker.units.qual.C;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -81,5 +82,15 @@ public class SrvOrganAccountListResp {
      */
     private String totalAllocatedExpenses;
 
+    /**
+     *扣减金额总合计
+     */
+    private String deductionAmountTotal;
+
+    /**
+     *补发总金额
+     */
+    private String reissueAmountTotal;
+
 
 }

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

@@ -39,4 +39,6 @@ public class SrvOrganListReq extends BaseReq {
     @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
     private Date accountsTime;
 
+    private String accountsStatus;
+
 }

common/common-core/src/main/java/com/hungraim/ltc/util/DateUtils.java

@@ -3,7 +3,6 @@ package com.hungraim.ltc.util;
 
 import cn.hutool.core.util.StrUtil;
 
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
@@ -879,27 +878,42 @@ public class DateUtils {
      *
      * @return
      */
-    public static String getlastMonth(){
-        SimpleDateFormat ym=new SimpleDateFormat(DATE_PATTERN_yyyy_MM_dd);
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.MONTH,-1);
-        String lastMonth =ym.format(calendar.getTime());
-        return lastMonth;
+    public static Date getlastDayOfMonth(Date date){
+        Calendar cale = Calendar.getInstance();
+        cale.setTime(date);
+        cale.add(Calendar.MONTH, 1);
+        cale.set(Calendar.DAY_OF_MONTH, 0);
+        return cale.getTime();
     }
+
+
     /**
-     * 获取当前月份的上个月
+     * 获取月份的第一天
      *
      * @return
      */
-    public static Date getlastMonth(String str){
-        DateFormat fmt =new SimpleDateFormat(DATE_PATTERN_yyyy_MM_dd);
-        Date date = null;
-        try {
-            date = fmt.parse(str);
-        } catch (ParseException e) {
-            e.printStackTrace();
+    public static   Date getFirstDayOfMonth(Date date) {
+        Calendar cale = Calendar.getInstance();
+        cale.setTime(date);
+        cale.add(Calendar.MONTH, 0);
+        cale.set(Calendar.DAY_OF_MONTH, 1);
+        return cale.getTime();
+
+    }
+
+    public static Boolean inCurrentMonth(Date date) {
+        Calendar cal1 = Calendar.getInstance();
+        Calendar cal2 = Calendar.getInstance();
+       //set the given date in date of the instance and current date in the other
+        cal1.setTime(date);
+        cal2.setTime(new Date());
+       //now compare the dates using methods on Calendar
+        if (cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR)) {
+            if (cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH)) {
+                return true;
+            }
         }
-        return date;
+        return false;
     }
 
 }