Merge branch 'uat_ch_master' into uat_20230303_失能评定排序_mq

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

@@ -165,8 +165,8 @@ public class AccountController {
      *
      */
     @GetMapping("/srvOrganAccountExport")
-    public void srvOrganAccountExport(String accountsId,HttpServletResponse response){
-        Workbook workbook = accountService.srvOrganAccountExport(accountsId);
+    public void srvOrganAccountExport(SrvOrganListReq req,HttpServletResponse response){
+        Workbook workbook = accountService.srvOrganAccountExport(req);
         // 命名表格
         String fileName = "srvOrganAccount.xlsx";
         FileUtils.exportResponse(workbook,fileName,response);

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

@@ -6,6 +6,7 @@ import com.hungraim.ltc.pojo.entity.account.*;
 import com.hungraim.ltc.pojo.vo.account.AccountExportDetailListResp;
 import com.hungraim.ltc.pojo.vo.account.OrganAccountsVO;
 import com.hungraim.ltc.pojo.vo.account.SrvOrganListReq;
+import com.hungraim.ltc.util.DateUtils;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -19,7 +20,7 @@ public interface ChDisabAccountsDetailMapper extends BaseMapper<ChDisabDetailAcc
     List<OrganAccountsVO> getOrganAccountsList(String taskDetailId);
 
 
-    List<AccountExportDetailListResp> searchSrvOrganAccountDetailExport(String accountsId);
+    List<AccountExportDetailListResp> searchSrvOrganAccountDetailExport(SrvOrganListReq req);
 
     List<ChDisabDetailAccounts> queryAccountByCondition(@Param("taskDetailIds") List<String> taskDetailIds);
 
@@ -35,6 +36,8 @@ public interface ChDisabAccountsDetailMapper extends BaseMapper<ChDisabDetailAcc
     int updateByAccountsId(String accountsId,Integer accountsStatus);
 
 
+    ChDisabDetailAccounts queryDisabDetailAccounts(String srvOrganId, String accountsTime,String disabInfoId,String srvModeName);
+
 
 
 

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

@@ -29,7 +29,7 @@ public interface AccountService extends IService<ChDisabAccounts> {
 
     ExpenseVo expenseSettlement(ExpenseSettlementReq req) throws ParseException;
 
-    Workbook srvOrganAccountExport(String accountsId);
+    Workbook srvOrganAccountExport(SrvOrganListReq req);
 
 
 

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

@@ -456,8 +456,8 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
 
 
     @Override
-    public Workbook srvOrganAccountExport(String accountsId) {
-        List<AccountExportDetailListResp> srvOrganAccountExportList = chDisabAccountsDetailMapper.searchSrvOrganAccountDetailExport(accountsId);
+    public Workbook srvOrganAccountExport(SrvOrganListReq req) {
+        List<AccountExportDetailListResp> srvOrganAccountExportList = chDisabAccountsDetailMapper.searchSrvOrganAccountDetailExport(req);
         ExportParams exportParams = new ExportParams();
         exportParams.setType(ExcelType.XSSF);    //对应xlsx
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, AccountExportDetailListResp.class, srvOrganAccountExportList);
@@ -610,39 +610,45 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
             List<OrganAccountsVO> accountsList = chDisabAccountsDetailMapper.getOrganAccountsList(taskDetailId);
             for (OrganAccountsVO accountsVO : accountsList) {
                 ChDisabDetailAccounts chDisabDetailAccounts = new ChDisabDetailAccounts();
-                chDisabDetailAccounts.setSrvOrganId(accountsVO.getSrvOrganId());
+                String srvOrganId = accountsVO.getSrvOrganId();
+                // 结算时间为任务时间
+                Date accountsTime = DateUtils.strToDate(accountsVO.getSrvDate());
+                String disabInfoId = accountsVO.getDisabInfoId();
                 //要判断是养老还是医疗，因为费用不一样
                 BigDecimal limit = BigDecimal.valueOf(0);
                 BigDecimal overallPercent = BigDecimal.valueOf(0.7);
                 BigDecimal personalPercent = BigDecimal.valueOf(0.3);
+                String srvModeName = accountsVO.getSrvModeName();
                 // 养老机构护理，其限额为 50 元/人/天  由长期护理保险基金支付 70% 个人支付 30%
-                if ("养老".equals(accountsVO.getSrvModeName())) {
+                if ("养老".equals(srvModeName)) {
                     limit = BigDecimal.valueOf(50);
                     //  医疗机构护理，原则上收治医疗护理需求为主的重度失能人员一级及以下医疗机构其限额为 80 元/人/天，由长期护理保险基金支付 70%，个人支付 30%;
-                    // && accountsVO.getDisableLevelName().contains("重度")
-                } else if ("医疗".equals(accountsVO.getSrvModeName()) && "1".equals(accountsVO.getLevelCode())) {
+                } else if ("医疗".equals(srvModeName) && "1".equals(accountsVO.getLevelCode())) {
                     limit = BigDecimal.valueOf(80);
                     // 二级及以上医疗机构其限额为 100 元/人/天,由长期护理保险基金支付 70%，个人支付 30%;
-                } else if ("医疗".equals(accountsVO.getSrvModeName()) && (!"1".equals(accountsVO.getLevelCode()))) {
+                } else if ("医疗".equals(srvModeName) && (!"1".equals(accountsVO.getLevelCode()))) {
                     limit = BigDecimal.valueOf(100);
                 } else {
-                    return;
+                   break;
                 }
+                // 根据护理机构、结算月份、失能人员id和服务方式查询表里是否有值
+               // ChDisabDetailAccounts chDisabDetailAccountsDTO = chDisabAccountsDetailMapper.queryDisabDetailAccounts(srvOrganId, DateUtils.dateToStrYm(accountsTime), disabInfoId, srvModeName);
+
                 chDisabDetailAccounts.setAccountsAllCost(limit);
                 BigDecimal overallCost = limit.multiply(overallPercent);
                 chDisabDetailAccounts.setAccountsOverallCost(overallCost);
                 BigDecimal personalCost = limit.multiply(personalPercent);
                 chDisabDetailAccounts.setAccountsPersonalCost(personalCost);
                 chDisabDetailAccounts.setModeName(accountsVO.getSrvModeName());
+                chDisabDetailAccounts.setSrvOrganId(srvOrganId);
                 chDisabDetailAccounts.setEmpId(accountsVO.getEmpId());
                 chDisabDetailAccounts.setCreationTime(new Date());
-                // 结算时间为任务时间
-                chDisabDetailAccounts.setAccountsTime(DateUtils.strToDate(accountsVO.getSrvDate()));
+                chDisabDetailAccounts.setAccountsTime(accountsTime);
                 chDisabDetailAccounts.setAccountsStartTime(DateUtils.getFirstDayOfMonth(DateUtils.strToDate(accountsVO.getSrvDate())));
                 chDisabDetailAccounts.setAccountsEndTime(DateUtils.getlastDayOfMonth(DateUtils.strToDate(accountsVO.getSrvDate())));
-                chDisabDetailAccounts.setTaskDetailId(accountsVO.getTaskDetailId());
+              //  chDisabDetailAccounts.setTaskDetailId(accountsVO.getTaskDetailId());
                 chDisabDetailAccounts.setMedicalArea(accountsVO.getMedicalArea());
-                chDisabDetailAccounts.setDisabInfoId(accountsVO.getDisabInfoId());
+                chDisabDetailAccounts.setDisabInfoId(disabInfoId);
                 chDisabDetailAccounts.setStatus((short)0);
                 chDisabDetailAccounts.setReissueAmount(BigDecimal.valueOf(0));
                 chDisabDetailAccounts.setDeductionAmount(BigDecimal.valueOf(0));
@@ -783,7 +789,8 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         BigDecimal overallCost = chDisabAccountDTO.getOverallCost();
         BigDecimal personalCost = chDisabAccountDTO.getPersonalCost();
         Short accountsStatus = chDisabAccountDTO.getAccountsStatus();
-        if (accountsStatus > 2) {
+        if (accountsStatus > 1) {
+            log.info("{},已完成审核",accountsDetailId);
             return -1;
         }
         // 暂缓

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

@@ -184,19 +184,43 @@
 
     <select id="searchSrvOrganAccountDetailExport" resultType="com.hungraim.ltc.pojo.vo.account.AccountExportDetailListResp">
         select
-            t3.SRV_ORGAN_NAME srvOrganName,
-            to_char(t1.ACCOUNTS_TIME,'yyyy-MM') accountsTime,
-            t1.ACCOUNTS_ALL_COST accountsAllCost,
-            t1.ACCOUNTS_OVERALL_COST accountsOverallCost,
-            t1.ACCOUNTS_PERSONAL_COST accountsPersonalCost,
-            to_char(t1.ACCOUNTS_START_TIME,'yyyy-MM-dd') accountsStartTime,
-            to_char(t1.ACCOUNTS_END_TIME,'yyyy-MM-dd') accountsEndTime
-        from   CH_DISAB_ACCOUNTS_DETAIL t1
-                   left join ch_disable_info t2 on t1.disab_info_id = t2.disab_info_id
-                   LEFT JOIN CH_SRV_ORGAN t3 ON t1.SRV_ORGAN_ID = t3.SRV_ORGAN_ID
-        where t1.ACCOUNTS_ID = #{accountsId}
-
-
+        t3.ORGAN_NAME organName,
+        d.MODE_NAME modeName,
+        to_char(d.ACCOUNTS_START_TIME,'yyyy-MM-dd') accountsStartTime,
+        to_char(d.ACCOUNTS_END_TIME,'yyyy-MM-dd') accountsEndTime,
+        to_char(d.ACCOUNTS_TIME,'yyyy-MM') accountsTime,
+        emp.EMP_NAME empName,
+        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,
+        d.DEDUCTION_AMOUNT deductionAmount,
+        d.REISSUE_AMOUNT reissueAmount,
+        d.ACCOUNTS_DETAIL_ID accountsDetailId,
+        d.STATUS
+        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
+        LEFT JOIN CH_FND_ORGAN t3 ON o.ORGAN_ID = t3.ORGAN_ID
+        left join ch_srv_organ_emp emp on d.emp_id = emp.emp_id
+        <where>
+        1=1
+        <if test="accountsId != null and  accountsId != ''">
+            and d.ACCOUNTS_ID = #{accountsId}
+        </if>
+        <if test="accountsStatus != null and accountsStatus != ''">
+            and d.status = #{accountsStatus}
+        </if>
+        <if test="srvOrganId != null and srvOrganId != ''">
+            and d.SRV_ORGAN_ID = #{srvOrganId}
+        </if>
+        <if test="accountsTime != null and accountsTime != ''">
+            AND to_char(d.ACCOUNTS_TIME,'yyyy-MM') = #{accountsTime}
+        </if>
+        </where>
     </select>
 
     <select id="getOtherPlaceList" resultType="com.hungraim.ltc.pojo.vo.account.OrganAccountsVO">
@@ -250,6 +274,13 @@
         where d.ACCOUNTS_ID =  #{accountsId}
     </update>
 
+    <select id="queryDisabDetailAccounts" resultType="com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts">
+        select * from CH_DISAB_ACCOUNTS_DETAIL d where d.SRV_ORGAN_ID =#{srvOrganId}
+        and to_char(d.ACCOUNTS_TIME,'yyyy-MM') = #{accountsTime}
+        and d.DISAB_INFO_ID =#{disabInfoId}
+        and d.MODE_NAME = #{srvModeName}
+    </select>
+
 
 </mapper>
 

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -166,18 +166,17 @@ public class DisableServiceImpl implements DisableService {
             //医保统筹区
             ChDisableApply chDisableApply = disableApplyMapper.selectById(chDisableInfo.getApplyId());
             disableUpdateDetailVo.setMedicalArea(chDisableApply.getMedicalArea());
-//            try {
-//                // TODO 需要确认信息表的附件类型
-//                Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(disabInfoId), AttachType.DISABLE.getUploadType());
-//                if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
-//                    disableUpdateDetailVo.setFileDataList(listResult.getData());
-//                } else {
-//                    log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
-//                }
-//            } catch (Exception e) {
-//                log.error(e.getMessage());
-//                e.printStackTrace();
-//            }
+            try {
+                Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(chDisableInfo.getApplyId()), AttachType.DISABLE.getUploadType());
+                if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+                    disableUpdateDetailVo.setFileDataList(listResult.getData());
+                } else {
+                    log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
+                }
+            } catch (Exception e) {
+                log.error(e.getMessage());
+                e.printStackTrace();
+            }
             return disableUpdateDetailVo;
         }
         return null;

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/SrvOrganEmpServiceImpl.java

@@ -148,6 +148,9 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
 
         for (SrvOrganEmpExportVo record : srvOrganEmpExportList) {
             StringBuilder stringBuilder = new StringBuilder();
+            if(record == null){
+                break;
+            }
             if(StringUtils.isEmpty(record.getProvincial())){
                 stringBuilder.append("--");
             }else if( record.getProvincial().equals(record.getCity())){

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -121,6 +121,7 @@
                a.REASONS_REVIEW             reasonsReview,
                a.REASONS_REMARK             reasonsRemark,
                a.MEDICAL_AREA               medicalArea,
+               a.REVIEW_FREQUENCY     reviewFrequency,
                a.BANK_CARD_NO bankCardNo
         from CH_DISABLE_APPLY a
                  LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

@@ -82,11 +82,14 @@ public class TaskController {
      * @param tel       失能人员手机号码
      */
     @RequestMapping("/taskReportList")
-    public Result<List<TaskReportVO>> taskReportList(String name, String certiCode, String tel) {
-        List<TaskReportVO> taskReportList = taskService.taskReportList(name, certiCode, tel);
-        return Result.success(taskReportList);
+    public Result<Page<TaskReportVO>> taskReportList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,String name, String certiCode, String tel) {
+        Page<TaskReportVO> page = new Page<>(pageNum, pageSize);
+        page = taskService.taskReportList(page,name, certiCode, tel);
+        log.info("评定报告录入："+JSONObject.toJSONString(page));
+        return Result.success(page);
     }
 
+
     /**
      * 查询评定报告附件列表
      *
@@ -141,15 +144,15 @@ public class TaskController {
     /**
      * 评定报告新增
      * @param reportDetailVo
-     //* @param taskId         评定任务id
-     //* @param person1        鉴定人员1id
-     //* @param person2        鉴定人员2id
-     //* @param person3        鉴定人员3id
-     //* @param evaluateTime   评估时间 格式:2020-11-12
-     //* @param disableLevelId 失能等级id
-     //* @param polNo          保单号
-     //* @param remark         备注
-     //* @param fileDataList   附件
+    //* @param taskId         评定任务id
+    //* @param person1        鉴定人员1id
+    //* @param person2        鉴定人员2id
+    //* @param person3        鉴定人员3id
+    //* @param evaluateTime   评估时间 格式:2020-11-12
+    //* @param disableLevelId 失能等级id
+    //* @param polNo          保单号
+    //* @param remark         备注
+    //* @param fileDataList   附件
      */
     @RequestMapping("/addReport")
     public Result addReport(ReportDetailVO reportDetailVo) {
@@ -235,14 +238,8 @@ public class TaskController {
         if (vo.getRemark() == null) {
             vo.setRemark("");
         }
-        Date evaluateDate;
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            evaluateDate = sdf.parse(vo.getEvaluateTime());
-        } catch (ParseException e) {
-            return Result.failed("评估时间格式不正确!");
-        }
-        taskService.updateReport(vo.getReportId(), vo.getPerson1(), vo.getPerson2(), vo.getPerson3(), evaluateDate, vo.getDisableLevelId(), vo.getPolNo(), vo.getRemark(), vo.getFileDataList(),vo.getChAprReportFractions());
+
+        taskService.updateReport(vo);
         return Result.success();
     }
 
@@ -511,7 +508,7 @@ public class TaskController {
         String json="";
         String optType="1";//操作类型	0-鉴定机构管理人员操作，1-鉴定人员操作；
         //List<Map<String,Object>> aprList= (List<Map<String, Object>>) request.getSession().getAttribute("aprList");//鉴定机构
-       // String aprEmpId=String.valueOf(aprList.get(0).get("empId"));//操作人id
+        // String aprEmpId=String.valueOf(aprList.get(0).get("empId"));//操作人id
         //String aprOrganId=String.valueOf(aprList.get(0).get("organId"));       //操作机构id
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String optTime=sdf.format(new Date());//操作时间YYYY-MM-DD HH24:MM:SS
@@ -520,7 +517,7 @@ public class TaskController {
 
         Result<Object> objectResult= taskService.taskRefuseCause( queryDto.getTaskId(), optType, queryDto.getOrganId(), queryDto.getEmpId(), optTime, queryDto.getRefuseReason(), queryDto.getRefuseRemark(), queryDto.getStatus(), queryDto.getTaskGroupNo(), queryDto.getTaskPushId());
 
-    if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
+        if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
             //失败
             return Result.failed(objectResult.getMsg());
         }
@@ -755,7 +752,7 @@ public class TaskController {
      */
     @GetMapping("/queryAssessAccountsDetail")
     public Result<List<ChAssessDetailAccountsResp>> queryAssessAccountsDetail(String assessAccountsId) {
-            List<ChAssessDetailAccountsResp> chAssessDetailAccounts = taskService.queryAssessAccountsDetail(assessAccountsId);
+        List<ChAssessDetailAccountsResp> chAssessDetailAccounts = taskService.queryAssessAccountsDetail(assessAccountsId);
         return Result.success(chAssessDetailAccounts);
     }
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java

@@ -42,7 +42,7 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
     /**
      * 评定报告录入列表
      */
-    List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
+    Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel);
 
     TaskReportVO getReportById(String reportId);
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.assessment.*;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
+import com.hungraim.ltc.pojo.vo.ReportUpdateVO;
 import com.hungraim.ltc.pojo.vo.account.AssessAccountsListResp;
 import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.util.Result;
@@ -27,13 +28,13 @@ public interface TaskService {
                                                   String street, String realName, String certiCode, String taskName, String taskTel,
                                                   String daysRemaining, String taskStatus, String isReturn, String area);
 
-    List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
+    Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel);
 
     List<AprEmpVO> aprEmpList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);
 
     Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList,List<ChAprReportFraction> chAprReportFractions);
 
-    void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList,List<ChAprReportFraction> chAprReportFractions);
+    void updateReport(ReportUpdateVO vo);
 
     TaskReportVO getReportById(String reportId);
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -16,6 +16,7 @@ import com.hungraim.ltc.pojo.entity.assessment.*;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
+import com.hungraim.ltc.pojo.vo.ReportUpdateVO;
 import com.hungraim.ltc.pojo.vo.account.AssessAccountsExportResp;
 import com.hungraim.ltc.pojo.vo.account.AssessAccountsListResp;
 import com.hungraim.ltc.pojo.vo.assessment.*;
@@ -33,6 +34,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -105,8 +108,8 @@ public class TaskServiceImpl implements TaskService {
      * @param tel       失能人员手机号码
      */
     @Override
-    public List<TaskReportVO> taskReportList(String name, String certiCode, String tel) {
-        return taskMapper.taskReportList(name, certiCode, tel);
+    public Page<TaskReportVO> taskReportList(Page<TaskReportVO> page,String name, String certiCode, String tel) {
+        return taskMapper.taskReportList(page,name, certiCode, tel);
     }
 
     /**
@@ -316,72 +319,70 @@ public class TaskServiceImpl implements TaskService {
     }
     /**
      * 评定报告修改
-     *
-     * @param reportId       评定报告id
-     * @param person1        鉴定人员1id
-     * @param person2        鉴定人员2id
-     * @param person3        鉴定人员3id
-     * @param evaluateDate   评估时间
-     * @param disableLevelId 失能等级id
-     * @param polNo          保单号
-     * @param remark         备注
-     * @param fileDataList   附件
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList,List<ChAprReportFraction> chAprReportFractions) {
+    public void updateReport(ReportUpdateVO vo) {
+        Date evaluateDate = null;
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            evaluateDate = sdf.parse(vo.getEvaluateTime());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         //update鉴定报告
-        ChAprReport chAprReport = aprReportMapper.selectById(reportId);
-        chAprReport.setDisableLevelId(disableLevelId);
-        chAprReport.setPolNo(polNo);
-        chAprReport.setRemark(remark);
+        ChAprReport chAprReport = aprReportMapper.selectById(vo.getReportId());
+        chAprReport.setDisableLevelId(vo.getDisableLevelId());
+        chAprReport.setPolNo(vo.getPolNo());
+        chAprReport.setRemark(vo.getRemark());
         chAprReport.setEvaluateTime(evaluateDate);
+        chAprReport.setEvaluateType(vo.getEvaluateType());
         aprReportMapper.updateById(chAprReport);
         //附件上传
-        this.updateAttachs(fileDataList, chAprReport.getReportId().longValue());
+        this.updateAttachs(vo.getFileDataList(), chAprReport.getReportId().longValue());
         //修改鉴定报告人员(有就update,没有就insert)
-        List<ChAprPersonInfo> personInfos = personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", reportId).orderByDesc("info_id"));
-        if (person1 != null) {
+        List<ChAprPersonInfo> personInfos = personInfoMapper.selectList(new QueryWrapper<ChAprPersonInfo>().eq("report_id", vo.getReportId()).orderByDesc("info_id"));
+        if (vo.getPerson1() != null) {
             if (personInfos.size() >= 1) {
                 ChAprPersonInfo personInfo = personInfos.get(0);
-                personInfo.setEmpId(person1);
+                personInfo.setEmpId(vo.getPerson1());
                 personInfoMapper.updateById(personInfo);
             } else {
                 ChAprPersonInfo personInfo = new ChAprPersonInfo();
                 personInfo.setReportId(chAprReport.getReportId());
-                personInfo.setEmpId(person1);
+                personInfo.setEmpId(vo.getPerson1());
                 personInfo.setFcd(new Date());
                 personInfoMapper.insert(personInfo);
             }
         }
-        if (person2 != null) {
+        if (vo.getPerson2() != null) {
             if (personInfos.size() >= 2) {
                 ChAprPersonInfo personInfo = personInfos.get(1);
-                personInfo.setEmpId(person2);
+                personInfo.setEmpId(vo.getPerson2());
                 personInfoMapper.updateById(personInfo);
             } else {
                 ChAprPersonInfo personInfo = new ChAprPersonInfo();
                 personInfo.setReportId(chAprReport.getReportId());
-                personInfo.setEmpId(person2);
+                personInfo.setEmpId(vo.getPerson2());
                 personInfo.setFcd(new Date());
                 personInfoMapper.insert(personInfo);
             }
         }
-        if (person3 != null) {
+        if (vo.getPerson3() != null) {
             if (personInfos.size() >= 3) {
                 ChAprPersonInfo personInfo = personInfos.get(2);
-                personInfo.setEmpId(person3);
+                personInfo.setEmpId(vo.getPerson3());
                 personInfoMapper.updateById(personInfo);
             } else {
                 ChAprPersonInfo personInfo = new ChAprPersonInfo();
                 personInfo.setReportId(chAprReport.getReportId());
-                personInfo.setEmpId(person3);
+                personInfo.setEmpId(vo.getPerson3());
                 personInfo.setFcd(new Date());
                 personInfoMapper.insert(personInfo);
             }
         }
-        if(!chAprReportFractions.isEmpty() && chAprReportFractions.size()>0){
-            for (ChAprReportFraction chAprReportFraction: chAprReportFractions) {
+        if(!vo.getChAprReportFractions().isEmpty() && vo.getChAprReportFractions().size()>0){
+            for (ChAprReportFraction chAprReportFraction: vo.getChAprReportFractions()) {
                 chAprReportFraction.setReportId(chAprReport.getReportId());
                 if(chAprReportFraction.getChAprReportFractionId()==null){
                     chAprReportFractionMapper.insert(chAprReportFraction);

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -168,6 +168,7 @@
         info.CERTI_CODE certiCode,
         report.pol_no polNo,
         report.remark remark,
+        report.EVALUATE_TYPE evaluateType,
         info.birthday birthday,
         (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
         (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
@@ -190,7 +191,8 @@
         report.PUBLICITY_START_TIME publicityStartTime,
         report.PUBLICITY_END_TIME  publicityEndTime,
         report.PUBLICITY_TIME  publicityTime,
-        report.EFF_TIME effTime
+        report.EFF_TIME effTime,
+        report.evaluate_type
         FROM ch_apr_report report
         LEFT JOIN CH_APR_TASK task ON report.TASK_ID = task.TASK_ID
         LEFT JOIN CH_DISABLE_INFO info ON task.disable_info_id = info.disab_info_id
@@ -238,6 +240,8 @@
         emp.AGE age,
         emp.certi_code certiCode,
         emp.tel tel,
+        (select type.APREMP_NAME from CH_CFG_APREMP_TYPE type where type.APREMP_TYPE_ID = emp.APREMP_TYPE_ID_F) aprempTypeF,
+        (select type.APREMP_NAME from CH_CFG_APREMP_TYPE type where type.APREMP_TYPE_ID = emp.APREMP_TYPE_ID_S) aprempTypeS,
         emp.Group_leader groupLeader
         FROM ch_apr_emp emp
         LEFT JOIN ch_apr_organ organ ON emp.apr_organ_id = organ.apr_organ_id
@@ -470,6 +474,7 @@
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_CITY = dis.DISTRICT_CODE) districtCity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
         organ.organ_name organName,
+        o.organ_name fndOrganName,
         organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
         emp.real_name realName,
         DECODE(emp.gender, 'M','男','F', '女','N', '不确定') gender,
@@ -480,6 +485,7 @@
         FROM ch_apr_emp emp
         LEFT JOIN ch_apr_organ organ ON emp.apr_organ_id = organ.apr_organ_id
         LEFT JOIN ch_srv_organ srvOrgan ON organ.organ_id = srvOrgan.srv_organ_id
+        LEFT JOIN ch_fnd_organ o ON o.organ_id = srvOrgan.organ_id
         <where>
             <if test="provincial != null and provincial != ''">
                 and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) = #{provincial}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChAprEmp.java

@@ -52,5 +52,14 @@ public class ChAprEmp {
     private java.util.Date effTime;
     private Integer aprOrganId;
     private Integer lcu;
+    private String accName;
+    private String bankAccName;
+    private String bankNo;
+    private String bankAccCode;
+    private String bankDistrictProvincial;
+    private String bankDistrictCity;
+    private String bankDistrictWebsite;
+    private String remark;
+
 
 }

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

@@ -22,6 +22,7 @@ public class ReportUpdateVO {
     Integer disableLevelId;
     String polNo;
     String remark;
+    Integer evaluateType;
     List<ChFndAttach> fileDataList;
     List<ChAprReportFraction> chAprReportFractions;
 }

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

@@ -16,14 +16,17 @@ public class AccountExportDetailListResp {
     @Excel(name = "适用机构名称",width = 20)
     private String organName;
 
-
-
     /**
      * 护理机构名称
      */
     @Excel(name = "护理机构名称",width = 20)
     private String srvOrganName;
 
+    @Excel(name = "失能人员",width = 20)
+    private String realName;
+
+    @Excel(name = "护理人员",width = 20)
+    private String empName;
     /**
      * 结算月份
      */
@@ -42,8 +45,6 @@ public class AccountExportDetailListResp {
     @Excel(name = "费用结束时间",width = 20)
     private String accountsEndTime;
 
-
-
     /**
      * 总费用
      */
@@ -62,6 +63,14 @@ public class AccountExportDetailListResp {
     @Excel(name = "个人支付")
     private String accountsPersonalCost;
 
+    @Excel(name = "已补费用")
+    private String reissueAmount;
+
+    @Excel(name = "已扣费用")
+    private String deductionAmount;
+
+
+
 
 
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/AprEmpExportVO.java

@@ -15,7 +15,7 @@ import lombok.Data;
 @Data
 public class AprEmpExportVO {
     @Excel(name = "适用机构",width = 20)
-    private String srvOrganName;
+    private String fndOrganName;
 
     @Excel(name = "所在省市",width = 20)
     private String districtProvincial;

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/AprEmpVO.java

@@ -33,4 +33,10 @@ public class AprEmpVO {
     private String tel;
     //是否组长0组长，1非组长
     private String groupLeader;
+
+    private String aprempTypeF;
+
+    private String aprempTypeS;
+
+
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskReportVO.java

@@ -72,6 +72,8 @@ public class TaskReportVO {
     private String riskLevel;
     //评估类型
     private Integer evaluateType;
+    //评估类型名称
+    private String evaluateTypeName;
 
     //公示开始时间
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExamineInfoVO.java

@@ -75,6 +75,10 @@ public class DisableExamineInfoVO {
     private Short addressType;
 
     //***失能人员医疗及失能信息
+    /**
+     * 是否首次申请 初次申请，争议复评，定期复评，变更评定
+     */
+    private Long reviewFrequency;
     //诊断疾病
     private String disease;
     private Integer diseTypeF;

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExportVO.java

@@ -42,8 +42,8 @@ public class DisableExportVO implements Serializable {
     @Excel(name = "申请时间" ,width = 20)
     private String effTime;
 
-    @Excel(name = "申请来源")
-    private String dataFrom;
+ /*   @Excel(name = "申请来源")
+    private String dataFrom;*/
 
     private String provincial;
 

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/DisableInfoTaskVO.java

@@ -28,5 +28,7 @@ public class DisableInfoTaskVO implements Serializable {
     private String permitId;
     private String tel;
     private Integer taskStatus;
+    private String disableLevelName;
+    private Integer srvOrganId;
 
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskDetailVO.java

@@ -91,4 +91,7 @@ public class SrvTaskDetailVO {
      * 任务状态
      */
     private String status;
+
+
+    private String disableLevelName;
 }

gateway-service/src/main/java/com/hungraim/ltc/gateway/config/ResourceServerConfig.java

@@ -52,7 +52,7 @@ public class ResourceServerConfig {
             .jwtAuthenticationConverter(jwtAuthenticationConverter());
         http.authorizeExchange()
             .pathMatchers("/api/oauth/token","/api.system/role/getRoleResource",
-                    "/api.system/resource/getManinMenu","/oauth/*","/api/oauth/genKeyPair").permitAll()
+                    "/api.system/resource/getManinMenu","/oauth/*","/api/oauth/genKeyPair","/api.system/user/updatePassword").permitAll()
             .anyExchange().access(authorizationManager)
             .and()
             .exceptionHandling()

governance/src/main/java/com/hungraim/ltc/GovernanceApplication.java

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
@@ -13,6 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient
 @EnableFeignClients
 @EnableTransactionManagement
+@EnableScheduling
 public class GovernanceApplication {
     public static void main(String[] args) {
         SpringApplication.run(GovernanceApplication.class, args);

governance/src/main/java/com/hungraim/ltc/governance/dao/SrvSendMapper.java

@@ -44,12 +44,13 @@ public interface SrvSendMapper extends BaseMapper<ChSrvSend> {
             "        s.certi_code," +
             "        s.DISE_TYPE_S," +
             "        i.finish_time," +
-            "        i.re_apr_time" +
+            "        i.re_apr_time,l.disable_level_name,a.srv_organ_id " +
             "   from ch_disable_info s" +
             "   left join ch_apr_task i" +
             "     on s.last_task_id = i.task_id" +
             "   left join ch_apr_report o" +
-            "     on i.task_id = o.task_id  " +
+            "     on i.task_id = o.task_id  left join CH_CFG_SRV_DISABLE_LEVEL l on l.disable_level_id = o.disable_level_id " +
+            "   left join ch_disable_apply a on a.apply_id = s.apply_id " +
             "   where s.disab_info_id=#{disableInfoId}")
     DisableInfoTaskVO selectBydisableInfoId(Integer disableInfoId);
 

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.xml

@@ -104,6 +104,7 @@
         emp.emp_name empName,
         --任务时间
         detail.SRV_DATE srvDate,
+        level1.DISABLE_LEVEL_NAME disableLevelName,
         --任务状态
         detail.status status
         from ch_srv_task_detail detail--服务计划
@@ -146,6 +147,7 @@
                 and mode1.mode_id = #{modeId}
             </if>
         </where>
+        order by detail.SRV_DATE desc
     </select>
 
     <!--查询服务计划信息-->

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -18,6 +18,7 @@ import com.hungraim.ltc.system.service.impl.SystemUserRoleServiceImpl;
 import com.hungraim.ltc.system.service.impl.SystemUserServiceImpl;
 import com.hungraim.ltc.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
@@ -301,6 +302,43 @@ public class UserController {
         return Result.success("更新成功");
     }
 
+    @PostMapping("/updatePassword")
+    public Result updatePassword(String oldPassword,String newPassword,@RequestHeader("Authorization") String token){
+        log.info("oldPassword:"+oldPassword+",newPassword:"+newPassword);
+        if(StringUtils.isBlank(newPassword) || StringUtils.isBlank(oldPassword)){
+            Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+
+        //校验旧密码是否匹配
+        Integer userId = TokenParsingUtil.TokenParsing(token, "userId");
+        if(userId == null){
+            return Result.failed("未获取到用户信息！");
+        }
+        SystemUser userinfo = userInfoService.getById(userId);
+        if(userinfo == null){
+            return Result.failed("未获取到用户信息！");
+        }
+        BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
+
+        String userinfoPassword = userinfo.getPassword();
+
+        if(!bCryptPasswordEncoder.matches(oldPassword, userinfoPassword)){
+            return Result.failed("旧密码不匹配！");
+        }
+
+
+        if (CheckStrength.checkPasswordStrength(newPassword) < 4) {
+            return Result.failed("密码太简单，请设置复杂密码！");
+        }
+
+
+        SystemUser user = new SystemUser();
+        user.setPassword(new BCryptPasswordEncoder().encode(newPassword));
+        user.setUserId(userId.longValue());
+        userInfoService.updateById(user);
+
+        return Result.success();
+    }
 
 
 }