Merge branch 'dev_nursing_records_20230214' into uat_ch_master

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

@@ -4,6 +4,7 @@ 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.*;
+import com.hungraim.ltc.pojo.entity.governance.ChSrvPlan;
 import com.hungraim.ltc.pojo.vo.account.*;
 import com.hungraim.ltc.pojo.vo.disable.PlaceOtherVO;
 import com.hungraim.ltc.util.FileUtils;
@@ -385,6 +386,15 @@ public class AccountController {
 
     }
 
+    @RequestMapping("/accountReturn")
+    public Result accountReturn(SrvTaskRespVO srvTaskRespVO) {
+        Result  result = accountService.accountReturn(srvTaskRespVO);
+        return result;
+
+    }
+
+
+
 
 
 }

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

+package com.hungraim.ltc.account.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.governance.ChSrvPlan;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+@Mapper
+public interface ChSrvPlanMapper extends BaseMapper<ChSrvPlan> {
+
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hungraim.ltc.pojo.entity.account.*;
+import com.hungraim.ltc.pojo.entity.governance.ChSrvPlan;
 import com.hungraim.ltc.pojo.vo.account.*;
 
 import com.hungraim.ltc.pojo.vo.disable.PlaceOtherVO;
@@ -67,4 +68,7 @@ public interface AccountService extends IService<ChDisabAccounts> {
     Page<PlaceOtherVO> placeOtherQuery(Page page, String name, String certiCode);
 
     void placeOtherTaskQuery();
+
+    //退回
+    Result accountReturn(SrvTaskRespVO srvTaskRespVO);
 }

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

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hungraim.ltc.account.dao.*;
@@ -16,6 +17,7 @@ import com.hungraim.ltc.pojo.entity.SysConfig.ChCfgCareService;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChCfgCostStandard;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.account.*;
+import com.hungraim.ltc.pojo.entity.governance.ChSrvPlan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskFinishItem;
 import com.hungraim.ltc.pojo.vo.account.*;
@@ -25,6 +27,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -52,6 +55,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
     private final ChCfgCostStandardMapper chCfgCostStandardMapper;
     private final ChDisabAccountsDetailMapper chDisabAccountsDetailMapper;
     private final ChDisabFreeRdInfoMapper chDisabFreeRdInfoMapper;
+    private final ChSrvPlanMapper chSrvPlanMapper;
 
 
 
@@ -986,4 +990,66 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         }
     }
 
+    //退回
+    @Override
+    public Result accountReturn(SrvTaskRespVO srvTaskRespVO){
+        Long taskDetailId = srvTaskRespVO.getTaskDetailId();
+        String disabInfoId = srvTaskRespVO.getDisabInfoId();
+        String srvModeName = srvTaskRespVO.getSrvModeName();
+        String srvPlanTime = srvTaskRespVO.getSrvDate();
+        Date date = DateUtils.strToDate(srvPlanTime);
+        String srvOrganId = srvTaskRespVO.getSrvOrganId();
+        ChDisabDetailAccounts chDisabDetailAccounts = chDisabAccountsDetailMapper.queryDisabDetailAccounts(String.valueOf(srvOrganId), DateUtils.dateToStrYm(date), disabInfoId, srvModeName);
+        Short status = chDisabDetailAccounts.getStatus();
+        if(status != 0){
+            return Result.failed("此任务已提交申报，不可再操作，请联系管理员");
+        }
+        LambdaQueryWrapper<ChSrvPlan> queryWrapper= new LambdaQueryWrapper<>();
+        queryWrapper.eq(ChSrvPlan::getTaskDetailId,taskDetailId);
+        queryWrapper.eq(ChSrvPlan::getIsStatus, (short) 4);
+        List<ChSrvPlan> srvPlanList = chSrvPlanMapper.selectList(queryWrapper);
+        int size = srvPlanList.size();
+        // 大于1说明还有已完成的任务,不退回,只更新状态 等于1结算退回费用
+        try {
+            ChSrvPlan chSrvPlan = new ChSrvPlan();
+            chSrvPlan.setIsStatus(0L);
+            chSrvPlan.setPlanID(srvTaskRespVO.getPlanId());
+            chSrvPlanMapper.updateById(chSrvPlan);
+            if(size == 1){
+                BigDecimal accountsAllCost = chDisabDetailAccounts.getAccountsAllCost();
+                BigDecimal accountsOverallCost = chDisabDetailAccounts.getAccountsOverallCost();
+                BigDecimal accountsPersonalCost = chDisabDetailAccounts.getAccountsPersonalCost();
+                BigDecimal allCost = new BigDecimal(0);
+                BigDecimal  overCost= new BigDecimal(0);
+                BigDecimal  personCost = new BigDecimal(0);
+                if ("养老".equals(srvModeName)) {
+                    allCost = BigDecimal.valueOf(50);
+                    overCost = BigDecimal.valueOf(35);
+                    personCost = BigDecimal.valueOf(15);
+                    //  医疗机构护理，原则上收治医疗护理需求为主的重度失能人员一级及以下医疗机构其限额为 80 元/人/天，由长期护理保险基金支付 70%，个人支付 30%;
+                } else if ("医疗".equals(srvModeName) && "1".equals(srvTaskRespVO.getLevelCode())) {
+                    allCost = BigDecimal.valueOf(80);
+                    overCost = BigDecimal.valueOf(56);
+                    personCost = BigDecimal.valueOf(24);
+                    // 二级及以上医疗机构其限额为 100 元/人/天,由长期护理保险基金支付 70%，个人支付 30%;
+                } else if ("医疗".equals(srvModeName) && (!"1".equals(srvTaskRespVO.getLevelCode()))) {
+                    allCost = BigDecimal.valueOf(100);
+                    overCost = BigDecimal.valueOf(70);
+                    personCost = BigDecimal.valueOf(30);
+                }
+                BigDecimal allCostSubtract = accountsAllCost.subtract(allCost);
+                BigDecimal overCostSubtract = accountsOverallCost.subtract(overCost);
+                BigDecimal personCostSubtract = accountsPersonalCost.subtract(personCost);
+                chDisabDetailAccounts.setAccountsAllCost(allCostSubtract);
+                chDisabDetailAccounts.setAccountsOverallCost(overCostSubtract);
+                chDisabDetailAccounts.setAccountsPersonalCost(personCostSubtract);
+                chDisabAccountsDetailMapper.updateById(chDisabDetailAccounts);
+            }
+        } catch (Exception e) {
+            log.error("==============accountReturn error:{}",e);
+            return  Result.failed("服务器异常");
+        }
+        return Result.success();
+    }
+
 }

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

@@ -73,6 +73,7 @@
         where  plan.DISAB_INFO_ID  = #{req.disabInfoId}
          and plan.SRV_ORGAN_ID  = #{req.srvOrganId}
          and plan.MODE_ID  = #{req.modeId}
+         and to_char(plan.SRV_PLAN_TIME,'yyyy-MM')  = #{req.accountsTime}
         and plan.IS_STATUS ='4'
         order by plan.SRV_PLAN_TIME desc
     </select>

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChSrvTaskDetailMapper.java

 package com.hungraim.ltc.dao;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
 import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetail2Vo;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
+
 
 /**
  * @author mq
@@ -22,6 +26,15 @@ public interface ChSrvTaskDetailMapper extends BaseMapper<ChSrvTaskDetail> {
      */
     Page<ChSrvTaskDetail2Vo> chSrvTaskDetailQuery(Page<ChSrvTaskDetail2Vo> page, Long empId);
 
+    int  deleteFinshItem(long taskDetailId);
+
+    String selectBySrvTaskId(String srvTaskId);
+
+    int updateByTaskDetailId(String taskDetailId);
+
+    ChDisabDetailAccounts selectAccountsDetail(String disabInfoId, String srvDateStr);
+
+    void updateChDisabDetailAccounts(Long accountsId, BigDecimal accountsAllCostsub, BigDecimal accountsOverallCostsub, BigDecimal accountsPersonalCostsub);
 }
 
 

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

@@ -9,17 +9,22 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.api.AttachFeignService;
 import com.hungraim.ltc.dao.*;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvEmpType;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.riskLevel.ChSrvempRiskLevel;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganEmp;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailDelete;
-import com.hungraim.ltc.pojo.vo.disable.*;
+import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetail2Vo;
+import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpExportVo;
+import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo;
+import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpVo;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
 import com.hungraim.ltc.service.OrganService;
 import com.hungraim.ltc.service.SrvOrganEmpService;
 import com.hungraim.ltc.util.AttachType;
+import com.hungraim.ltc.util.DateUtils;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
 import lombok.AllArgsConstructor;
@@ -29,8 +34,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -183,16 +189,90 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
         chSrvTaskDetailDelete.setDeleteDate(new Date());
         chSrvTaskDetailDelete.setDeleteName(userName);
         chSrvTaskDetailDeleteMapper.insert(chSrvTaskDetailDelete);
+        if( 4 == chSrvTaskDetail.getStatus()) {
+            // 开始时间
+            Date srvStartTime = chSrvTaskDetail.getSrvStartTime();
+            String srvStartTimeStr = DateUtils.dateTimeToStr(srvStartTime);
+            // 结束时间
+            Date srvEndTime = chSrvTaskDetail.getSrvEndTime();
+            String srvEndTimeStr = DateUtils.dateTimeToStr(srvEndTime);
+            Long min = dateDiff(srvStartTimeStr, srvEndTimeStr, "yyyy-MM-dd HH:mm:ss", "min");
+            if(min>=90){
+                Date srvDate = chSrvTaskDetail.getSrvDate();
+                String srvDateStr = DateUtils.dateToStrYm(srvDate);
+                Long srvTaskId = chSrvTaskDetail.getSrvTaskId();
+                String disabInfoId = chSrvTaskDetailMapper.selectBySrvTaskId(String.valueOf(srvTaskId));
+                ChDisabDetailAccounts chDisabDetailAccounts = chSrvTaskDetailMapper.selectAccountsDetail(disabInfoId, srvDateStr);
+                Short status = chDisabDetailAccounts.getStatus();
+                if(status != 0){
+                    // 已申报不能进行删除
+                    return -1;
+                }
+                BigDecimal accountsAllCost = chDisabDetailAccounts.getAccountsAllCost();
+                BigDecimal accountsPersonalCost = chDisabDetailAccounts.getAccountsPersonalCost();
+                BigDecimal accountsOverallCost = chDisabDetailAccounts.getAccountsOverallCost();
+                BigDecimal accountsAllCostsub = accountsAllCost.subtract(new BigDecimal(75));
+                BigDecimal accountsOverallCostsub = accountsOverallCost.subtract(new BigDecimal(60));
+                BigDecimal accountsPersonalCostsub = accountsPersonalCost.subtract(new BigDecimal(15));
+                Long accountsId = chDisabDetailAccounts.getAccountsId();
+                chSrvTaskDetailMapper.updateChDisabDetailAccounts(accountsId,accountsAllCostsub,accountsOverallCostsub,accountsPersonalCostsub);
+            }
+        }
+        chSrvTaskDetailMapper.deleteFinshItem(taskDetailId);
+        return   chSrvTaskDetailMapper.updateByTaskDetailId(String.valueOf(chSrvTaskDetail.getTaskDetailId()));
 
+    }
 
-
-        chSrvTaskDetail.setSrvStartTime(null);
-        chSrvTaskDetail.setSrvEndTime(null);
-        chSrvTaskDetail.setSrvStartPic(null);
-        chSrvTaskDetail.setSrvEndPic(null);
-        chSrvTaskDetail.setSrvStartPic2(null);
-        chSrvTaskDetail.setStatus((short)0);
-        return chSrvTaskDetailMapper.updateById(chSrvTaskDetail);
+    /**
+     * 计算2个时间相差的天数、小时、分钟、秒
+     * @param startTime 开始时间
+     * @param endTime 截止时间
+     * @param format 时间格式 yyyy-MM-dd HH:mm:ss
+     * @param str 返回的数据为：day-天、hour-小时、min-分钟、second-秒
+     * @return
+     */
+    public static Long dateDiff(String startTime, String endTime,  String format, String str) {
+        // 按照传入的格式生成一个simpledateformate对象
+        SimpleDateFormat sd = new SimpleDateFormat(format);
+        long nd = 1000 * 24 * 60 * 60;// 一天的毫秒数
+        long nh = 1000 * 60 * 60;// 一小时的毫秒数
+        long nm = 1000 * 60;// 一分钟的毫秒数
+        long ns = 1000;// 一秒钟的毫秒数
+        long diff;
+        long day = 0;
+        long hour = 0;
+        long min = 0;
+        long second = 0;
+        // 获得两个时间的毫秒时间差异
+        try {
+            diff = sd.parse(endTime).getTime() - sd.parse(startTime).getTime();
+            // 计算差多少天
+            day = diff / nd;
+            // 计算差多少小时
+            hour = diff / nh ;
+            // 计算差多少分钟
+            min = diff / nm ;
+            // 计算差多少秒
+            second = diff / ns;
+            // 输出结果
+            System.out.println("时间相差：" + day + "天" +
+                    (hour - day * 24) + "小时"
+                    + (min - day * 24 * 60) + "分钟" +
+                    second + "秒。");
+            /*System.out.println("hour=" + hour + ",min=" + min);*/
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        if (str.equalsIgnoreCase("day")) {
+            return day;
+        } else if(str.equalsIgnoreCase("hour")) {
+            return hour;
+        } else if(str.equalsIgnoreCase("min")) {
+            return min;
+        } else {
+            return second;
+        }
     }
 
 }

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

@@ -75,6 +75,33 @@
         LEFT JOIN  CH_SRV_ORGAN_EMP m ON m.EMP_ID = k.SRV_EMP_ID
         LEFT JOIN CH_SRV_ORGAN T5 ON T5.SRV_ORGAN_ID = m.SRV_ORGAN_ID
     WHERE m.EMP_ID = #{empId}
-    order by t.STATUS desc
+    order by t.TASK_DETAIL_ID  desc
   </select>
+
+
+  <update id="updateByTaskDetailId">
+  UPDATE CH_SRV_TASK_DETAIL SET SRV_START_TIME=null,SRV_END_TIME=null,SRV_START_PIC=null,SRV_END_PIC=null,
+  SRV_START_PIC2=null,STATUS=0
+WHERE TASK_DETAIL_ID =  #{taskDetailId}
+
+  </update>
+
+  <update id = "updateChDisabDetailAccounts">
+   UPDATE CH_DISAB_ACCOUNTS_DETAIL d SET  d.ACCOUNTS_ALL_COST = #{accountsAllCostsub}, d.ACCOUNTS_OVERALL_COST =  #{accountsOverallCostsub},
+   d.ACCOUNTS_PERSONAL_COST =  #{accountsPersonalCostsub}
+   WHERE  d.ACCOUNTS_ID =  #{accountsId}
+  </update>
+
+  <select id="selectBySrvTaskId" resultType="java.lang.String">
+    select DISAB_INFO_ID   from   CH_SRV_TASK where SRV_TASK_ID = #{srvTaskId} and rownum = 1
+  </select>
+
+<select id="selectAccountsDetail" resultType="com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts">
+  select * from  CH_DISAB_ACCOUNTS_DETAIL  d where d.DISAB_INFO_ID = #{disabInfoId} and to_char(d.ACCOUNTS_TIME,'yyyy-MM') = #{srvDateStr}
+</select>
+
+  <delete id="deleteFinshItem">
+    delete from   CH_SRV_TASK_FINISH_ITEM where  TASK_DETAIL_ID = #{taskDetailId}
+  </delete>
+
 </mapper>
\ No newline at end of file