服务计划

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/ChAprTaskPushMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/CfgParaMapper.java

 package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPush;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
-@Repository
+/**
+ * 基础参数配置Mapper
+ *
+ * @author czz
+ */
 @Mapper
-public interface ChAprTaskPushMapper extends BaseMapper<ChAprTaskPush> {
-}
\ No newline at end of file
+@Repository
+public interface CfgParaMapper extends BaseMapper<ChCfgPara> {
+
+}

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.dao.*;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
 import com.hungraim.ltc.pojo.entity.disable.*;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
 import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
 import com.hungraim.ltc.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.vo.disable.DistrictTreeVo;
@@ -17,10 +18,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class DisableServiceImpl implements DisableService {
@@ -45,6 +43,8 @@ public class DisableServiceImpl implements DisableService {
     private DisableInfoMapper disableInfoMapper;
     @Autowired
     private AprTaskMapper aprTaskMapper;
+    @Autowired
+    private CfgParaMapper cfgParaMapper;
 
     /**
      * 获取机构ids
@@ -98,34 +98,36 @@ public class DisableServiceImpl implements DisableService {
 
     @Override
     public void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) {
-        ChDisableApply chDisableApply = disableApplyMapper.selectById(applyId);
         Date date = new Date();
+        //更新审核状态
+        ChDisableApply chDisableApply = disableApplyMapper.selectById(applyId);
+        chDisableApply.setCheckName(checkName);//审核人
+        chDisableApply.setApplyStatus(applyStatus);//申请状态
+        chDisableApply.setCheckRemark(checkRemark);//审核备注
+        chDisableApply.setCheckTime(date);//审核时间
+        disableApplyMapper.updateById(chDisableApply);
+        //添加失能审核历史
         ChDisableApplyHis chDisableApplyHis = new ChDisableApplyHis();
         BeanUtils.copyProperties(chDisableApply, chDisableApplyHis);
-        chDisableApplyHis.setCheckName(checkName);
-        chDisableApplyHis.setApplyStatus(applyStatus);
-        chDisableApplyHis.setCheckRemark(checkRemark);
-        chDisableApplyHis.setCheckTime(date);
+        disableApplyHisMapper.insert(chDisableApplyHis);
+        //审核通过
         if (applyStatus.equals(Short.valueOf("2"))) {
-            // 审核通过
-            chDisableApply.setCheckName(checkName);
-            chDisableApply.setApplyStatus(applyStatus);
-            chDisableApply.setCheckRemark(checkRemark);
-            chDisableApply.setCheckTime(date);
-            disableApplyMapper.updateById(chDisableApply);
-
             //添加失能人员信息
             ChDisableInfo chDisableInfo = new ChDisableInfo();
             BeanUtil.copyProperties(chDisableApply, chDisableInfo);
             disableInfoMapper.insert(chDisableInfo);
-
             //添加失能评定信息
             ChAprTask chAprTask = new ChAprTask();
+            ChCfgPara chCfgPara = cfgParaMapper.selectOne(new QueryWrapper<ChCfgPara>().eq("ORGAN_ID", chAprTask.getOrganId()));
+            if (chCfgPara != null && chCfgPara.getCfgArgTime() != null) {
+                Calendar cd = Calendar.getInstance();
+                cd.setTime(date);
+                cd.add(Calendar.DATE, chCfgPara.getCfgArgTime().intValue());
+                chAprTask.setLastAprDate(cd.getTime());//鉴定截至日期
+            }
             BeanUtil.copyProperties(chDisableApply, chAprTask);
             aprTaskMapper.insert(chAprTask);
-
         }
-        disableApplyHisMapper.insert(chDisableApplyHis);
     }
 
     @Override

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

@@ -266,13 +266,18 @@ public class TaskController {
      * @param refuseRemark 拒绝备注
      */
     @RequestMapping("/taskGroupByGroup")
-    public Result taskGroupByGroup(String groupNumber, Integer status, Integer refuseReason, String refuseRemark) {
+    public Result taskGroupByGroup(String groupNumber, Integer status, Short refuseReason, String refuseRemark) {
         if (StringUtils.isBlank(groupNumber)) {
             return Result.failed("组号不能为空!");
         }
         if (status == null || status < 0 || status > 5) {
             return Result.failed("状态异常!");
         }
+        if (status == 4 || status == 5) {
+            if (refuseReason == null) {
+                return Result.failed("拒绝原因不能为空!");
+            }
+        }
         Result<Object> objectResult = taskService.taskGroupByGroup(groupNumber, status, refuseReason, refuseRemark);
         if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
             //失败
@@ -290,13 +295,18 @@ public class TaskController {
      * @param refuseRemark 拒绝备注
      */
     @RequestMapping("/taskGroup")
-    public Result taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark) {
+    public Result taskGroup(Integer pushId, Integer status, Short refuseReason, String refuseRemark) {
         if (status == null || status < 0 || status > 5) {
             return Result.failed("状态异常!");
         }
         if (pushId == null) {
             return Result.failed("任务组id不能为空!");
         }
+        if (status == 4 || status == 5) {
+            if (refuseReason == null) {
+                return Result.failed("拒绝原因不能为空!");
+            }
+        }
         Result<Object> objectResult = taskService.taskGroup(pushId, status, refuseReason, refuseRemark);
         if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
             //失败

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

@@ -18,36 +18,11 @@ import java.util.List;
 @Service
 public interface TaskService {
 
-    /**
-     * 评定任务分配列表
-     *
-     * @param organId       适用机构代码
-     * @param provincial    所在省
-     * @param city          所在市
-     * @param area          所在区域
-     * @param street        所在街道
-     * @param realName      失能人员姓名
-     * @param certiCode     失能人员身份证号码
-     * @param taskName      评定人员姓名
-     * @param taskTel       评定人员手机号码
-     * @param daysRemaining 评定剩余天数
-     * @param status        任务状态
-     * @param isReturn      是否退回
-     * @param pageNum       当前页
-     * @param pageSize      每页几条数据
-     */
     IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
                                                    String street, String realName, String certiCode, String taskName, String taskTel,
                                                    String daysRemaining, String status, String isReturn, String area,
                                                    int pageNum, int pageSize);
 
-    /**
-     * 评定报告录入列表
-     *
-     * @param name      失能人员姓名
-     * @param certiCode 失能人员身份证号码
-     * @param tel       失能人员手机号码
-     */
     List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
 
     List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader);
@@ -60,7 +35,7 @@ public interface TaskService {
 
     List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
 
-    Result<Object> taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark);
+    Result<Object> taskGroup(Integer pushId, Integer status, Short refuseReason, String refuseRemark);
 
     List<ChCfgSrvDisableLevel> cfgSrvDisableLevelList();
 
@@ -68,7 +43,7 @@ public interface TaskService {
 
     List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber);
 
-    Result<Object> taskGroupByGroup(String groupNumber, Integer status, Integer refuseReason, String refuseRemark);
+    Result<Object> taskGroupByGroup(String groupNumber, Integer status, Short refuseReason, String refuseRemark);
 
     TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
 

assessment/assessment-service/src/main/resources/mapper/ChAprTaskPushMapper.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.dao.ChAprTaskPushMapper">
-  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPush">
-    <id column="TASK_PUSH_ID" jdbcType="DECIMAL" property="taskPushId"/>
-    <result column="TASK_POOL_ID" jdbcType="VARCHAR" property="taskPoolId"/>
-    <result column="TIME" jdbcType="TIMESTAMP" property="time"/>
-    <result column="EVALUATE_ADDRESS_ID" jdbcType="DECIMAL" property="evaluateAddressId"/>
-    <result column="GROUP_NUMBER" jdbcType="VARCHAR" property="groupNumber"/>
-    <result column="ORDER_NUMBER" jdbcType="DECIMAL" property="orderNumber"/>
-    <result column="TASK_ID" jdbcType="DECIMAL" property="taskId"/>
-    <result column="PLANNED_ARRIVAL_TIME" jdbcType="TIMESTAMP" property="plannedArrivalTime"/>
-    <result column="PLANNED_DEPARTURE_TIME" jdbcType="TIMESTAMP" property="plannedDepartureTime"/>
-    <result column="DISTANCE_STATION_KILOMETERS" jdbcType="DECIMAL" property="distanceStationKilometers"/>
-    <result column="DISTANCE_STATION_TRAVEL_TIME" jdbcType="DECIMAL" property="distanceStationTravelTime" />
-    <result column="TOTAL_DISTANCE" jdbcType="DECIMAL" property="totalDistance" />
-    <result column="LENGTH_OF_TIME" jdbcType="DECIMAL" property="lengthOfTime" />
-    <result column="SEND_ID" jdbcType="DECIMAL" property="sendId" />
-    <result column="EMP_ID" jdbcType="DECIMAL" property="empId" />
-    <result column="STATUS" jdbcType="DECIMAL" property="status" />
-    <result column="FCD" jdbcType="TIMESTAMP" property="fcd" />
-    <result column="FCU" jdbcType="DECIMAL" property="fcu" />
-    <result column="LCD" jdbcType="TIMESTAMP" property="lcd" />
-    <result column="LCU" jdbcType="DECIMAL" property="lcu" />
-    <result column="SETOUT_DATE" jdbcType="TIMESTAMP" property="setoutDate" />
-    <result column="TASK_GROUP_NO" jdbcType="VARCHAR" property="taskGroupNo" />
-    <result column="ROUTE_START_LOCATION" jdbcType="VARCHAR" property="routeStartLocation" />
-    <result column="ROUTE_END_LOCATION" jdbcType="VARCHAR" property="routeEndLocation" />
-    <result column="ROUTE_START_TIME" jdbcType="TIMESTAMP" property="routeStartTime" />
-    <result column="ROUTE_END_TIME" jdbcType="TIMESTAMP" property="routeEndTime" />
-    <result column="STOP_LOCATION" jdbcType="VARCHAR" property="stopLocation" />
-    <result column="DATA_FROM" jdbcType="DECIMAL" property="dataFrom" />
-    <result column="ACCEPT_TIME" jdbcType="TIMESTAMP" property="acceptTime" />
-    <result column="ACCEPT_EMP" jdbcType="DECIMAL" property="acceptEmp" />
-    <result column="ACCEPT_ORGAN_NAME" jdbcType="DECIMAL" property="acceptOrganName" />
-    <result column="REFUSE_REASON" jdbcType="DECIMAL" property="refuseReason" />
-    <result column="REFUSE_REMARK" jdbcType="VARCHAR" property="refuseRemark" />
-    <result column="REFUSE_TIME" jdbcType="TIMESTAMP" property="refuseTime" />
-    <result column="REFUSE_EMP" jdbcType="DECIMAL" property="refuseEmp" />
-    <result column="REFUSE_ORGAN_NAME" jdbcType="DECIMAL" property="refuseOrganName" />
-    <result column="ASSIGN_TIME" jdbcType="TIMESTAMP" property="assignTime" />
-    <result column="ASSIGN_EMP" jdbcType="DECIMAL" property="assignEmp" />
-    <result column="ASSIGN_ORGAN_NAME" jdbcType="DECIMAL" property="assignOrganName" />
-    <result column="IS_MANUAL" jdbcType="DECIMAL" property="isManual" />
-    <result column="FINISH_TIME" jdbcType="TIMESTAMP" property="finishTime" />
-    <result column="FINISH_EMP" jdbcType="DECIMAL" property="finishEmp" />
-    <result column="FINISH_ORGAN_NAME" jdbcType="DECIMAL" property="finishOrganName" />
-    <result column="TASK_APPOINTMENT_DATE" jdbcType="TIMESTAMP" property="taskAppointmentDate" />
-    <result column="APPOINTMENT_REMARK" jdbcType="VARCHAR" property="appointmentRemark" />
-  </resultMap>
-</mapper>
\ No newline at end of file

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

+package com.hungraim.ltc.pojo.vo.governance;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hungraim.ltc.pojo.entity.PageInfo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 服务计划列表VO
+ */
+@Data
+public class SrvTaskVO extends PageInfo implements Serializable {
+    //id
+    private Integer sendId;
+    //失能人员ID
+    private Integer disableInfoId;
+    //适用机构
+    private String organName;
+    //机构idsrv
+    private Integer srvOrganId;
+    //机构代码
+    private String organId;
+    //所在省市
+    private String provincial;
+    private String city;
+    private String area;
+    //失能人员姓名
+    private String name;
+    //失能人员身份证号码
+    private String certiCode;
+    //待遇类型
+    private String treatmentTyte;
+    //联系人姓名
+    private String opername;
+    //年龄
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthday;
+    //性别
+    private String gender;
+    //失能人员身份证号码
+    private String opercertiCode;
+    //失能人员手机号
+    private String tel;
+    //失能人员固话
+    private String fixedtel;
+    //申请服务方式
+    private String srvModeName;
+    //诊断疾病
+    private String disease;
+    private String diseTypeS;
+    //申请时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date effTime;
+    //申请来源 网厅：0，核心：1，手机端:2,待遇申请:3
+    private String datafrom;
+    //审核状态
+    private String applyStatus;
+    //分配状态
+    private String status;
+}

governance/src/main/java/com/hungraim/ltc/governance/controller/SrvTaskController.java

+package com.hungraim.ltc.governance.controller;
+
+import com.hungraim.ltc.governance.service.SrvTaskService;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
+import com.hungraim.ltc.util.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 服务计划Controller
+ */
+@RestController
+@RequestMapping("/api.governance/srvTask")
+@Slf4j
+public class SrvTaskController {
+
+    @Autowired
+    private SrvTaskService srvTaskService;
+
+    /**
+     * 服务计划列表
+     */
+    @RequestMapping("/getSrvTaskList")
+    public Result<List<ChSrvTask>> getSrvTaskList() {
+        List<ChSrvTask> tasks = srvTaskService.getSrvTaskList();
+        return Result.success(tasks);
+    }
+}

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

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

governance/src/main/java/com/hungraim/ltc/governance/service/SrvTaskService.java

+package com.hungraim.ltc.governance.service;
+
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 服务计划Service
+ *
+ * @author czz
+ */
+@Service
+public interface SrvTaskService {
+    List<ChSrvTask> getSrvTaskList();
+}

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

+package com.hungraim.ltc.governance.service.impl;
+
+import com.hungraim.ltc.governance.dao.SrvTaskMapper;
+import com.hungraim.ltc.governance.service.SrvTaskService;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 服务计划ServiceImpl
+ */
+@Service
+public class SrvTaskServiceImpl implements SrvTaskService {
+    @Autowired
+    private SrvTaskMapper srvTaskMapper;
+
+    @Override
+    public List<ChSrvTask> getSrvTaskList() {
+        return srvTaskMapper.getSrvTaskList();
+    }
+}

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.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.governance.dao.SrvTaskMapper">
+    <!--查询服务分配信息列表-->
+    <select id="getSrvTaskList" resultType="com.hungraim.ltc.pojo.vo.governance.SrvTaskVO">
+        select
+            --所在省市
+            disable.DISTRICT_PROVINCIAL,
+            disable.DISTRICT_CITY,
+            disable.DISTRICT_AREA,
+            --失能人员姓名
+            disable.REAL_NAME,
+            --手机号码
+            disable.TEL,
+            --年龄
+            disable.BIRTHDAY,
+            --性别
+            disable.GENDER,
+            --诊断疾病
+            disable.DISEASE,
+            --接受服务地址
+            disable.acpt_srv_PROVINCIAL,
+            disable.acpt_srv_CITY,
+            disable.acpt_srv_AREA,
+            disable.acpt_srv_road_type,
+            --评定等级
+            --评定完成日期
+            --服务方式
+            --护理机构名称
+            --护理服务人员
+            --任务时间
+            --任务状态
+            task.STATUS
+        from CH_SRV_TASK task
+                 left join CH_DISABLE_INFO disable on task.DISAB_INFO_ID = disable.DISAB_INFO_ID
+    </select>
+</mapper>
\ No newline at end of file