Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

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

@@ -92,6 +92,7 @@ public class DisableServiceImpl implements DisableService {
 
     @Override
     public void addDisable(ChDisableApply chDisableApply) {
+        chDisableApply.setEffTime(new Date());
         disableApplyMapper.insert(chDisableApply);
     }
 

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

 package com.hungraim.ltc.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.service.TaskService;
@@ -207,6 +208,15 @@ public class TaskController {
     }
 
     /**
+     * 分配历史信息列表
+     */
+    @RequestMapping("/allotTaskHisList")
+    public Result<List<AllotTaskHisVO>> allotTaskHisList() {
+        List<AllotTaskHisVO> list = taskService.allotTaskHisList();
+        return Result.success(list);
+    }
+
+    /**
      * 评定任务分组管理列表
      *
      * @param name      评定人员姓名
@@ -234,20 +244,36 @@ public class TaskController {
     }
 
     /**
+     * 评定任务分组管理列表详情详情
+     *
+     * @param pushId 任务组id
+     */
+    @RequestMapping("/taskGroupInfoListInfo")
+    public Result<TaskGroupInfoListInfoVO> taskGroupInfoListInfo(String pushId) {
+        if (StringUtils.isBlank(pushId)) {
+            return Result.failed("任务组id不能为空!");
+        }
+        TaskGroupInfoListInfoVO taskGroupInfoListInfoVO = taskService.taskGroupInfoListInfo(pushId);
+        return Result.success(taskGroupInfoListInfoVO);
+    }
+
+    /**
      * 评定任务分组管理(整组操作)
      *
-     * @param groupNumber 组号
-     * @param status      分组状态 未分配(拒绝(重新分配)):0;已分配:1;已接受:2;已完成:3;拒绝（中止）:4,拒绝（终止）:5
+     * @param groupNumber  组号
+     * @param status       分组状态 未分配(拒绝(重新分配)):0;已分配:1;已接受:2;已完成:3;拒绝（中止）:4,拒绝（终止）:5
+     * @param refuseReason 拒绝原因id
+     * @param refuseRemark 拒绝备注
      */
     @RequestMapping("/taskGroupByGroup")
-    public Result taskGroupByGroup(String groupNumber, Integer status) {
+    public Result taskGroupByGroup(String groupNumber, Integer status, Integer refuseReason, String refuseRemark) {
         if (StringUtils.isBlank(groupNumber)) {
             return Result.failed("组号不能为空!");
         }
         if (status == null || status < 0 || status > 5) {
-            Result.failed("状态异常!");
+            return Result.failed("状态异常!");
         }
-        Result<Object> objectResult = taskService.taskGroupByGroup(groupNumber, status);
+        Result<Object> objectResult = taskService.taskGroupByGroup(groupNumber, status, refuseReason, refuseRemark);
         if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
             //失败
             return Result.failed(objectResult.getMsg());
@@ -258,18 +284,20 @@ public class TaskController {
     /**
      * 评定任务分组管理
      *
-     * @param pushId 任务清单id
-     * @param status 分组状态 未分配(拒绝(重新分配)):0;已分配:1;已接受:2;已完成:3;拒绝（中止）:4,拒绝（终止）:5
+     * @param pushId       任务组id
+     * @param status       分组状态 未分配(拒绝(重新分配)):0;已分配:1;已接受:2;已完成:3;拒绝（中止）:4,拒绝（终止）:5
+     * @param refuseReason 拒绝原因id
+     * @param refuseRemark 拒绝备注
      */
     @RequestMapping("/taskGroup")
-    public Result taskGroup(Integer pushId, Integer status) {
+    public Result taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark) {
         if (status == null || status < 0 || status > 5) {
-            Result.failed("状态异常!");
+            return Result.failed("状态异常!");
         }
         if (pushId == null) {
-            Result.failed("任务组不能为空!");
+            return Result.failed("任务组id不能为空!");
         }
-        Result<Object> objectResult = taskService.taskGroup(pushId, status);
+        Result<Object> objectResult = taskService.taskGroup(pushId, status, refuseReason, refuseRemark);
         if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
             //失败
             return Result.failed(objectResult.getMsg());
@@ -277,5 +305,48 @@ public class TaskController {
         return Result.success();
     }
 
+    /**
+     * 查询拒绝原因
+     *
+     * @return 拒绝原因
+     */
+    @RequestMapping("/refuseReasonList")
+    public Result<List<ChRefuseReason>> refuseReasonList() {
+        List<ChRefuseReason> refuseReasons = taskService.refuseReasonList();
+        return Result.success(refuseReasons);
+    }
+
+    /**
+     * 设置预约日期和备注
+     *
+     * @param pushId 分组id
+     * @param time   预约日期 yyyy-MM-dd
+     * @param remark 备注
+     */
+    @RequestMapping("/updatePushTimeAndRemark")
+    public Result updatePushTimeAndRemark(String pushId, String time, String remark) {
+        if (StringUtils.isBlank(pushId)) {
+            return Result.failed("分组id不能为空!");
+        }
+        if (StringUtils.isBlank(time)) {
+            return Result.failed("预约日期不能为空!");
+        }
+        if (StringUtils.isBlank(remark)) {
+            return Result.failed("备注不能为空!");
+        }
+        Date timeDate;
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            timeDate = sdf.parse(time);
+        } catch (ParseException e) {
+            return Result.failed("预约日期格式不正确!");
+        }
+        Result<Object> objectResult = taskService.updatePushTimeAndRemark(pushId, timeDate, remark);
+        if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
+            //失败
+            return Result.failed(objectResult.getMsg());
+        }
+        return Result.success();
+    }
 
 }

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPushHis;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface ChAprTaskPushHisMapper extends BaseMapper<ChAprTaskPushHis> {
+}
\ No newline at end of file

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能人员信息Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
+}

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 拒绝原因Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface RefuseReasonMapper extends BaseMapper<ChRefuseReason> {
+}

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

@@ -50,4 +50,8 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
     List<PersonInfoVO> personInfoList(String reportId);
 
     List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber);
+
+    TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
+
+    List<AllotTaskHisVO> allotTaskHisList();
 }

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPushHis;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface TaskPushHisMapper extends BaseMapper<ChAprTaskPushHis> {
+}

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

 package com.hungraim.ltc.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.util.Result;
@@ -59,7 +60,7 @@ public interface TaskService {
 
     List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
 
-    Result<Object> taskGroup(Integer pushId, Integer status);
+    Result<Object> taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark);
 
     List<ChCfgSrvDisableLevel> cfgSrvDisableLevelList();
 
@@ -67,5 +68,13 @@ public interface TaskService {
 
     List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber);
 
-    Result<Object> taskGroupByGroup(String groupNumber, Integer status);
+    Result<Object> taskGroupByGroup(String groupNumber, Integer status, Integer refuseReason, String refuseRemark);
+
+    TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
+
+    List<AllotTaskHisVO> allotTaskHisList();
+
+    Result<Object> updatePushTimeAndRemark(String pushId, Date timeDate, String remark);
+
+    List<ChRefuseReason> refuseReasonList();
 }

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

@@ -7,10 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.dao.*;
 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.vo.assessment.*;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.SerialNumberUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,7 +39,13 @@ public class TaskServiceImpl implements TaskService {
     @Autowired
     private TaskPushMapper taskPushMapper;
     @Autowired
+    private TaskPushHisMapper taskPushHisMapper;
+    @Autowired
     private CfgSrvDisableLevelMapper cfgSrvDisableLevelMapper;
+    @Autowired
+    private DisableInfoMapper disableInfoMapper;
+    @Autowired
+    private RefuseReasonMapper refuseReasonMapper;
 
     @Override
     public IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
@@ -160,27 +168,35 @@ public class TaskServiceImpl implements TaskService {
             return Result.failed("评定人员必须是组长!");
         }
         String[] taskIds = taskId.split(",");
-        Date assignTime = new Date();//任务分配日期
+        //任务分配日期
+        Date assignTime = new Date();
         for (String id : taskIds) {
             ChAprTask task = taskMapper.selectById(id);
             if (task == null) {
                 return Result.failed("无效的taskId!");
             }
+            //更新评定任务信息
             task.setAprEmpId(Integer.parseInt(empId));
             task.setAssignTime(assignTime);
-            int count = taskMapper.updateById(task);
-            if (count != 1) {
-                return Result.failed("修改失败!");
-            }
+            taskMapper.updateById(task);
+            //更新失能人员信息
+            ChDisableInfo chDisableInfo = disableInfoMapper.selectById(task.getDisableInfoId());
+            chDisableInfo.setLastTaskId(task.getTaskId());
+            disableInfoMapper.updateById(chDisableInfo);
             //生成组
             ChAprTaskPush taskPush = new ChAprTaskPush();
-            taskPush.setTime(new Date());
+            taskPush.setAssignTime(new Date());
             taskPush.setGroupNumber(SerialNumberUtils.getSerialNumber(empId));
-            taskPush.setTaskId(Long.getLong(id));
-            taskPush.setEmpId(Long.getLong(empId));
+            taskPush.setTaskId(Long.parseLong(id));
+            taskPush.setEmpId(Long.parseLong(empId));
             taskPush.setStatus((short) 1);
             taskPush.setIsManual((short) 1);
+            //生成分组历史
+            ChAprTaskPushHis pushHis = new ChAprTaskPushHis();
+            BeanUtils.copyProperties(taskPush, pushHis);
+            //插入分组数据
             taskPushMapper.insert(taskPush);
+            taskPushHisMapper.insert(pushHis);
         }
         return Result.success();
     }
@@ -191,12 +207,16 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public Result<Object> taskGroup(Integer pushId, Integer status) {
+    public Result<Object> taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark) {
         ChAprTaskPush chAprTaskPush = taskPushMapper.selectById(pushId);
         if (chAprTaskPush == null) {
             return Result.failed("不存在的组!");
         }
         chAprTaskPush.setStatus(status.shortValue());
+        if (status == 4 || status == 5 || status == 0) {
+            chAprTaskPush.setRefuseReason(refuseReason.shortValue());
+            chAprTaskPush.setRefuseRemark(refuseRemark);
+        }
         taskPushMapper.updateById(chAprTaskPush);
         return Result.success();
     }
@@ -217,7 +237,7 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public Result<Object> taskGroupByGroup(String groupNumber, Integer status) {
+    public Result<Object> taskGroupByGroup(String groupNumber, Integer status, Integer refuseReason, String refuseRemark) {
         List<ChAprTaskPush> pushList = taskPushMapper.selectList(new QueryWrapper<ChAprTaskPush>().eq("group_number", groupNumber));
         if (pushList == null || pushList.size() <= 0) {
             return Result.failed("不存在的组!");
@@ -229,9 +249,47 @@ public class TaskServiceImpl implements TaskService {
             }
         }
         for (ChAprTaskPush push : pushList) {
+            //更新任务组状态
             push.setStatus(status.shortValue());
+            if (status == 4 || status == 5 || status == 0) {
+                push.setRefuseReason(refuseReason.shortValue());
+                push.setRefuseRemark(refuseRemark);
+            }
             taskPushMapper.updateById(push);
+            //更新评定任务状态
+            ChAprTask chAprTask = taskMapper.selectById(push.getTaskId());
+            chAprTask.setTaskStatus(status);
         }
         return Result.success();
     }
+
+    @Override
+    public TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId) {
+        return taskMapper.taskGroupInfoListInfo(pushId);
+    }
+
+    @Override
+    public List<AllotTaskHisVO> allotTaskHisList() {
+        return taskMapper.allotTaskHisList();
+    }
+
+    @Override
+    public Result<Object> updatePushTimeAndRemark(String pushId, Date timeDate, String remark) {
+        ChAprTaskPush chAprTaskPush = taskPushMapper.selectById(pushId);
+        if (chAprTaskPush == null) {
+            return Result.failed("无效的分组id!");
+        }
+        chAprTaskPush.setTime(timeDate);
+        chAprTaskPush.setRefuseRemark(remark);
+        int i = taskPushMapper.updateById(chAprTaskPush);
+        if (i <= 0) {
+            return Result.failed("更新失败!");
+        }
+        return Result.success();
+    }
+
+    @Override
+    public List<ChRefuseReason> refuseReasonList() {
+        return refuseReasonMapper.selectList(new QueryWrapper<>());
+    }
 }
\ No newline at end of file

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

+package com.hungraim.ltc.pojo.entity.assessment;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * CH_APR_TASK_PUSH_HIS
+ * @author 
+ */
+@Data
+@TableName("CH_APR_TASK_PUSH_HIS")
+@KeySequence("SEQ_CH_APR_TASK_PUSH_HIS")
+public class ChAprTaskPushHis implements Serializable {
+    /**
+     * 任务推送ID（年月日+串码6）
+     */
+    @TableId(value = "his_task_push_id", type = IdType.INPUT)
+    private Long hisTaskPushId;
+
+    /**
+     * 任务池ID
+     */
+    private String taskPoolId;
+
+    /**
+     * 日期
+     */
+    private Date time;
+
+    /**
+     * 评定起点ID
+     */
+    private Long evaluateAddressId;
+
+    /**
+     * 组号
+     */
+    private String groupNumber;
+
+    /**
+     * 顺序号
+     */
+    private Long orderNumber;
+
+    /**
+     * 任务ID
+     */
+    private Long taskId;
+
+    /**
+     * 计划到达时间
+     */
+    private Date plannedArrivalTime;
+
+    /**
+     * 计划离开时间
+     */
+    private Date plannedDepartureTime;
+
+    /**
+     * 距离前站公里数
+     */
+    private BigDecimal distanceStationKilometers;
+
+    /**
+     * 距离前站行驶时间（建议单位是分钟）
+     */
+    private BigDecimal distanceStationTravelTime;
+
+    /**
+     * 车次总距离
+     */
+    private BigDecimal totalDistance;
+
+    /**
+     * 总时长
+     */
+    private BigDecimal lengthOfTime;
+
+    /**
+     * 报送主键ID
+     */
+    private Long sendId;
+
+    /**
+     * 组长ID
+     */
+    private Long empId;
+
+    /**
+     * 状态（0未分配,1已分配， 空 ,2拒绝(重新分配),3 已接受 ,4 已完成,5失效,6拒绝(中止),7拒绝(终止)）
+     */
+    private Short status;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+    /**
+     * 车次的行程起点地址
+     */
+    private String routeStartLocation;
+
+    /**
+     * 车次的行程终点地址
+     */
+    private String routeEndLocation;
+
+    /**
+     * 车次的行程出发时间
+     */
+    private Date routeStartTime;
+
+    /**
+     * 车次的行程结束时间
+     */
+    private Date routeEndTime;
+
+    /**
+     * 停靠点地址
+     */
+    private String stopLocation;
+
+    /**
+     * 上门服务日期,遇到节假日分配到工作第一天
+     */
+    private Date setoutDate;
+
+    /**
+     * 任务组id号
+     */
+    private String taskGroupNo;
+
+    /**
+     * 来源(0:定时任务 1手动)
+     */
+    private Short dataFrom;
+
+    /**
+     * 接受时间
+     */
+    private Date acceptTime;
+
+    /**
+     * 接受人
+     */
+    private Long acceptEmp;
+
+    /**
+     * 接受机构
+     */
+    private Long acceptOrganName;
+
+    /**
+     * 拒绝原因
+     */
+    private Short refuseReason;
+
+    /**
+     * 拒绝备注
+     */
+    private String refuseRemark;
+
+    /**
+     * 拒绝时间
+     */
+    private Date refuseTime;
+
+    /**
+     * 拒绝人
+     */
+    private Long refuseEmp;
+
+    /**
+     * 拒绝机构
+     */
+    private Long refuseOrganName;
+
+    /**
+     * 分配时间
+     */
+    private Date assignTime;
+
+    /**
+     * 分配人
+     */
+    private Long assignEmp;
+
+    /**
+     * 分配机构
+     */
+    private Long assignOrganName;
+
+    /**
+     * 完成时间
+     */
+    private Date finishTime;
+
+    /**
+     * 完成人
+     */
+    private Long finishEmp;
+
+    /**
+     * 完成机构
+     */
+    private Long finishOrganName;
+
+    /**
+     * 是否手动分组 （0 是，1 否）
+     */
+    private Short isManual;
+
+    /**
+     * 任务预约时间
+     */
+    private Date taskAppointmentDate;
+
+    /**
+     * 预约备注
+     */
+    private String appointmentRemark;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

+package com.hungraim.ltc.pojo.entity.assessment;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 拒绝原因基表：ch_refuse_reason
+ */
+@Data
+@TableName("CH_REFUSE_REASON")
+@KeySequence("SEQ_CH_REFUSE_REASON")
+public class ChRefuseReason {
+    /**
+     * 拒绝原因id
+     */
+    @TableId(value = "refuse_reason_id", type = IdType.INPUT)
+    private Integer refuseReasonId;
+
+    /**
+     * 拒绝原因名称
+     */
+    private String refuseReason;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChCfgPara.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * CH_CFG_PARA
+ * @author 
+ */
+@Data
+@TableName("CH_CFG_PARA")
+@KeySequence("SEQ_CH_CFG_PARA")
+public class ChCfgPara implements Serializable {
+    /**
+     * 服务配置主键id
+     */
+    @TableId(type = IdType.INPUT)
+    private Long paraId;
+
+    /**
+     * 机构代码
+     */
+    private String organId;
+
+    /**
+     * 服务配置名称
+     */
+    private String cfgName;
+
+    /**
+     * 复评周期
+     */
+    private String cfgCycle;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态   未生效：0；已生效：1；已失效：2
+     */
+    private Short status;
+
+    /**
+     * 定义人
+     */
+    private Long defineEmp;
+
+    /**
+     * 生效时间
+     */
+    private Date effTime;
+
+    /**
+     * 终止人
+     */
+    private Long endEmp;
+
+    /**
+     * 终止时间
+     */
+    private Date endTime;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+    /**
+     * 鉴定时效
+     */
+    private Long cfgArgTime;
+
+    /**
+     * 鉴定单位
+     */
+    private Short cfgArgUnit;
+
+    private Short disLimtScore;
+
+    /**
+     * 公示周期
+     */
+    private Long pulicityPeriod;
+
+    /**
+     * 公示周期单位（工作日：0；自然日：1）
+     */
+    private Short pulicityPeriodUnit;
+
+    /**
+     * 享受标准(元/天)
+     */
+    private BigDecimal enjoyStandard;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvOrganProject.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * CH_SRV_ORGAN_PROJECT
+ * @author 
+ */
+@Data
+@TableName("CH_SRV_ORGAN_PROJECT")
+@KeySequence("SEQ_CH_SRV_ORGAN_PROJECT")
+public class ChSrvOrganProject implements Serializable {
+    /**
+     * 服务项目id
+     */
+    @TableId(type = IdType.INPUT)
+    private Long projectId;
+
+    /**
+     * 护理机构ID
+     */
+    private Long srvOrganId;
+
+    /**
+     * 项目类别（3其它）
+     */
+    private Short projectCategory;
+
+    /**
+     * 服务项目名称
+     */
+    private String itemName;
+
+    /**
+     * 服务内容
+     */
+    private String serviceContent;
+
+    /**
+     * 类服务包类型(1基础护理、2日常照护项目、3其它、4巡诊)
+     */
+    private Short categoryType;
+
+    /**
+     * 频次
+     */
+    private Long itemTimes;
+
+    /**
+     * 频次类型(1:次/每月，2:必要时）
+     */
+    private Short itemTimesType;
+
+    /**
+     * 单价
+     */
+    private BigDecimal itemPrice;
+
+    /**
+     * 是否必需项(是：1；否：0)
+     */
+    private Short isConf;
+
+    /**
+     * 状态（0有效，1无效）
+     */
+    private Short status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Long defineEmp;
+
+    /**
+     * 创建时间
+     */
+    private Date effTime;
+
+    /**
+     * 终止人
+     */
+    private Long endEmp;
+
+    /**
+     * 终止时间
+     */
+    private Date endTime;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+    /**
+     * 单价类型（1：元/次，2：元/天）
+     */
+    private Short itemPriceType;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvProgramSet.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * CH_SRV_PROGRAM_SET
+ * @author zhangch
+ */
+@Data
+@TableName("CH_SRV_PROGRAM_SET")
+@KeySequence("SEQ_CH_SRV_PROGRAM_SET")
+public class ChSrvProgramSet implements Serializable {
+    /**
+     * 方案ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long setId;
+
+    /**
+     * 服务项目ID
+     */
+    private Long itemId;
+
+    /**
+     * 是否配置
+     */
+    private Short isConf;
+
+    /**
+     * 服务周期
+     */
+    private Short itemFreq;
+
+    /**
+     * 服务频次
+     */
+    private Short itemTimes;
+
+    /**
+     * 创建人
+     */
+    private Long defineEmp;
+
+    /**
+     * 创建时间
+     */
+    private Date effTime;
+
+    /**
+     * 终止人
+     */
+    private Long endEmp;
+
+    /**
+     * 终止时间
+     */
+    private Date endTime;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+    /**
+     * 服务方案ID
+     */
+    private Long programId;
+
+    /**
+     * 服务方式
+     */
+    private Long srvModeId;
+
+    /**
+     * 数据来源  网厅：0，核心：1
+     */
+    private Short dataFrom;
+
+    /**
+     * 网厅首次操作人
+     */
+    private Long webDefineEmp;
+
+    /**
+     * 网厅终止人
+     */
+    private Long webEndEmp;
+
+    /**
+     * 服务项目分类
+     */
+    private Long itemType;
+
+    /**
+     * 是否必选
+     */
+    private Short chooseFlag;
+
+    /**
+     * 付款类型
+     */
+    private Long payType;
+
+    /**
+     * 规格
+     */
+    private String spec;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 计划频次
+     */
+    private Long planningFrequency;
+
+    /**
+     * 计划频次类型(1：次/每月，2：次/每天，3：次/每周；)
+     */
+    private Short planningFrequencyType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvTask.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * CH_SRV_TASK
+ * @author 
+ */
+@Data
+@TableName("CH_SRV_TASK")
+@KeySequence("SEQ_CH_SRV_TASK")
+public class ChSrvTask implements Serializable {
+    /**
+     * 服务任务id
+     */
+    @TableId(type = IdType.INPUT)
+    private Long srvTaskId;
+
+    /**
+     * 护理人员id
+     */
+    private Long srvEmpId;
+
+    /**
+     * 护理日期
+     */
+    private Date srvDate;
+
+    /**
+     * 状态  0未分配  1已分配
+     */
+    private Short status;
+
+    /**
+     * 失能人员id
+     */
+    private Long disabInfoId;
+
+    /**
+     * 创建人
+     */
+    private Long defineEmp;
+
+    /**
+     * 创建时间
+     */
+    private Date effTime;
+
+    /**
+     * 终止人
+     */
+    private Long endEmp;
+
+    /**
+     * 终止时间
+     */
+    private Date endTime;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作时间
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+    /**
+     * 服务方案ID
+     */
+    private Long programId;
+
+    /**
+     * 数据来源 网厅：0，核心：1
+     */
+    private Short dataFrom;
+
+    /**
+     * 网厅创建人
+     */
+    private Long webDefineEmp;
+
+    /**
+     * 网厅终止人
+     */
+    private Long webEndEmp;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvTaskDetail.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * CH_SRV_TASK_DETAIL
+ * @author 
+ */
+@Data
+@TableName("CH_SRV_TASK_DETAIL")
+@KeySequence("SEQ_CH_SRV_TASK_DETAIL")
+public class ChSrvTaskDetail implements Serializable {
+    /**
+     * 服务明细id
+     */
+    @TableId(type = IdType.INPUT)
+    private Long taskDetailId;
+
+    /**
+     * 服务任务id
+     */
+    private Long srvTaskId;
+
+    /**
+     * 状态    未执行：0；执行中：1；已执行:2;已失效：3；已完成：4
+     */
+    private Short status;
+
+    /**
+     * 创建人
+     */
+    private Long defineEmp;
+
+    /**
+     * 创建时间
+     */
+    private Date effTime;
+
+    /**
+     * 终止人
+     */
+    private Long endEmp;
+
+    /**
+     * 终止时间
+     */
+    private Date endTime;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+    /**
+     * 服务开始时间
+     */
+    private Date srvStartTime;
+
+    /**
+     * 服务结束时间
+     */
+    private Date srvEndTime;
+
+    /**
+     * 服务时长
+     */
+    private Long srvTime;
+
+    /**
+     * 服务图片开始路径
+     */
+    private String srvStartPic;
+
+    /**
+     * 服务图片结束路径
+     */
+    private String srvEndPic;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 服务评分
+     */
+    private String srvScore;
+
+    /**
+     * 类型   分配：0；移动添加：1
+     */
+    private Short taskType;
+
+    /**
+     * 数据来源 网厅：0，核心：1
+     */
+    private Short dataFrom;
+
+    /**
+     * 网厅创建人
+     */
+    private Long webDefineEmp;
+
+    /**
+     * 网厅终止人
+     */
+    private Long webEndEmp;
+
+    /**
+     * 服务日期
+     */
+    private Date srvDate;
+
+    /**
+     * 服务金额
+     */
+    private Long srvAmount;
+
+    /**
+     * 自费金额
+     */
+    private Long selfAmount;
+
+    /**
+     * 经度(弃用)
+     */
+    private String longitudeCode;
+
+    /**
+     * 纬度(弃用)
+     */
+    private String latitudeCode;
+
+    /**
+     * 服务时长项目开始时间
+     */
+    private Date srvTimeStartTime;
+
+    /**
+     * 服务时长项目结束时间
+     */
+    private Date srvTimeEndTime;
+
+    /**
+     * 服务时长项目开始图片路径
+     */
+    private String srvTimeStartPic;
+
+    /**
+     * 服务时长项目结束图片路径
+     */
+    private String srvTimeEndPic;
+
+    /**
+     * 时长收费项目时长
+     */
+    private Long srvTimeCharge;
+
+    /**
+     * 时长收费任务备注
+     */
+    private String srvTimeRemark;
+
+    /**
+     * 任务完成标识 默认0
+     */
+    private String finishFlag;
+
+    /**
+     * 稽核结果（0,正常;1,异常;2,可疑）
+     */
+    private Short auditResult;
+
+    /**
+     * 稽核备注
+     */
+    private String auditRemark;
+
+    /**
+     * 稽核时间
+     */
+    private Date auditDate;
+
+    /**
+     * 违规类型（全部：0；基础护理：1；日常照护：2）
+     */
+    private Short illegalType;
+
+    /**
+     * 违规备注
+     */
+    private String illegalRemark;
+
+    /**
+     * 违规录入人ID
+     */
+    private Long illegalreEmp;
+
+    /**
+     * 违规录入姓名
+     */
+    private String illegalreName;
+
+    /**
+     * 违规录入时间
+     */
+    private Date illegalreTime;
+
+    /**
+     * 违规结算标记（0，未结算；1，已结算）
+     */
+    private Short accountSign;
+
+    /**
+     * 任务类型(1基础护理、2日常照护项目、3其它、4巡诊)
+     */
+    private Short taskDetailType;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvTaskFinishItem.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * CH_SRV_TASK_FINISH_ITEM
+ * @author 
+ */
+@Data
+@TableName("CH_SRV_TASK_FINISH_ITEM")
+@KeySequence("SEQ_CH_SRV_TASK_FINISH_ITEM")
+public class ChSrvTaskFinishItem implements Serializable {
+    /**
+     * 任务完成ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long taskFinishItemId;
+
+    /**
+     * 任务详情ID
+     */
+    private Long taskDetailId;
+
+    /**
+     * 服务项目ID
+     */
+    private Long itemId;
+
+    /**
+     * 创建人
+     */
+    private Long defineEmp;
+
+    /**
+     * 创建时间
+     */
+    private Date effTime;
+
+    /**
+     * 终止人
+     */
+    private Long endEmp;
+
+    /**
+     * 终止时间
+     */
+    private Date endTime;
+
+    /**
+     * 首次操作人
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作时间
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 数据来源  网厅：0，核心：1
+     */
+    private Short dataFrom;
+
+    /**
+     * 网厅创建人
+     */
+    private Long webDefineEmp;
+
+    /**
+     * 网厅终止人
+     */
+    private Long webEndEmp;
+
+    /**
+     * 子任务类型(0:项目 1:时长)
+     */
+    private Short childItemType;
+
+    /**
+     * 服务项目名称
+     */
+    private String itemName;
+
+    /**
+     * 单价（元）
+     */
+    private BigDecimal itemPrice;
+
+    /**
+     * 类别(1基础护理、2日常照护项目、3其它)
+     */
+    private Short categoryType;
+
+    /**
+     * 频次
+     */
+    private Long itemTimes;
+
+    /**
+     * 频次类型(1:次/每月，2:必要时）
+     */
+    private Short itemTimesType;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

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

+package com.hungraim.ltc.pojo.vo.assessment;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 分配历史信息列表VO
+ *
+ * @author czz
+ */
+@Data
+public class AllotTaskHisVO {
+    //分配历史id
+    private String hisTaskPushId;
+    //评定任务id
+    private String taskId;
+    //分配时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date assignTime;
+    //组号
+    private String groupNumber;
+    //预约日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date time;
+    //评定机构
+    private String organName;
+    //评定组长
+    private String realName;
+    //拒绝时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date refuseTime;
+    //状态
+    private String status;
+    //拒绝原因
+    private String refuseReason;
+    //备注
+    private String refuseRemark;
+}

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

+package com.hungraim.ltc.pojo.vo.assessment;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TaskGroupInfoListInfoVO {
+    /**
+     * 分组id
+     */
+    private String taskPushId;
+    /**
+     * 申请人姓名
+     */
+    private String realName;
+    /**
+     * 所在省市区
+     */
+    private String districtProvincial;
+    private String districPity;
+    private String districtArea;
+    /**
+     * 身份证号码
+     */
+    private String certiCode;
+    /**
+     * 出生年月
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthday;
+    /**
+     * 性别
+     */
+    private String gender;
+    /**
+     * 手机号
+     */
+    private String tel;
+    /**
+     * 诊断疾病
+     */
+    private String diseTypeF;
+    private String diseTypeS;
+    /**
+     * 病情描述及诊断
+     */
+    private String diseaseDesc;
+    /**
+     * 现住址
+     */
+    private String adressDistrictProvincial;
+    private String adressDistrictCity;
+    private String adressDistrictCode;
+    /**
+     * 接受评定地址
+     */
+    private String acptProvincial;
+    private String acptCity;
+    private String acptArea;
+    /**
+     * 申请日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date effTime;
+    /**
+     * 评定截止日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date lastAprDate;
+    /**
+     * 组长姓名
+     */
+    private String empRealName;
+    /**
+     * 组长身份证号码
+     */
+    private String empCertiCode;
+    /**
+     * 组长手机号码
+     */
+    private String empTel;
+    /**
+     * 拒绝时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date acceptTime;
+    /**
+     * 拒绝原因
+     */
+    private String refuseReason;
+    /**
+     * 操作机构
+     */
+    private String refuseOrganName;
+    /**
+     * 操作人
+     */
+    private String refuseEmp;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 备注
+     */
+    private String refuseRemark;
+}

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

@@ -15,11 +15,16 @@ public class TaskGroupInfoVO {
      */
     private String taskPushId;
     /**
-     * 分组日期
+     * 预约时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date time;
     /**
+     * 分组日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date assignTime;
+    /**
      * 组号
      */
     private String groupNumber;

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

@@ -24,7 +24,7 @@ public class TaskGroupVO {
     //评定起点地址
     private String routeStatrtLocation;
     //组号
-    private Integer groupNumber;
+    private String groupNumber;
     //评定人员姓名
     private String realName;
     //评定人员身份证号码

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

+package com.hungraim.ltc.pojo.vo.governance;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 列表页回显对象
+ */
+@Data
+public class ProgramDetailVo {
+
+    /**
+     * 服务方案ID
+     */
+    private Long programId;
+
+    /**
+     * 服务机构id
+     */
+    private Long srvOrganId;
+
+    /**
+     * 失能人员id
+     */
+    private Long disabInfoId;
+
+    /**
+     * 失能人员所在省
+     */
+    private String disableDistrictProvincial;
+
+    /**
+     * 失能人员所在市
+     */
+    private String disableDistrictCity;
+
+    /**
+     * 失能人员所在区域
+     */
+    private String disableDistrictArea;
+
+    /**
+     * 失能人员姓名
+     */
+    private String realName;
+
+    /**
+     * 失能人员手机号
+     */
+    private String realTel;
+
+    /**
+     * 失能人员生日
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthday;
+
+    /**
+     * 失能人员性别
+     */
+    private String gender;
+
+    /**
+     * 疾病大类
+     */
+    private Long diseTypeF;
+
+    /**
+     * 疾病小类
+     */
+    private Long diseTypeS;
+
+    /**
+     * 家庭住址
+     */
+    private String addressDetail;
+
+
+    /**
+     * 接收服务省市区
+     */
+    private String acptProvincial;
+    private String acptCity;
+    private String acptArea;
+    private String acptStreet;
+    private String acptAddress;
+
+    /**
+     * 失能等级
+     */
+    private String realLevel;
+
+    /**
+     * 评定完成日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date assessDate;
+
+    /**
+     * 服务方式
+     */
+    private String svrModelName;
+
+    /**
+     * 护理机构名称
+     */
+    private String svrOrganName;
+
+    /**
+     * 方案生效时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date programDate;
+
+    /**
+     * 方案结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date programEndDate;
+
+    /**
+     * 方案状态
+     */
+    private Integer progStatus;
+
+    /**
+     * 服务方案项目集合
+     */
+    private List<ProgramSetAndProjectVo> programSetAndProjectVos;
+
+
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramSetListVo.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramListVo.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * 列表页回显对象
  */
 @Data
-public class ProgramSetListVo {
+public class ProgramListVo {
 
     /**
      * 服务分配ID
@@ -74,6 +74,7 @@ public class ProgramSetListVo {
     /**
      * 评定完成日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date assessDate;
 
     /**

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

+package com.hungraim.ltc.pojo.vo.governance;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ProgramSetAndProjectVo {
+
+    /**
+     * 服务项目id
+     */
+    private Long projectId;
+
+    /**
+     * 护理机构ID
+     */
+    private Long srvOrganId;
+
+    /**
+     * 服务方案配置id
+     */
+    private Long setId;
+
+    /**
+     * 服务项目名称
+     */
+    private String itemName;
+
+    /**
+     * 类服务包类型(1基础护理、2日常照护项目、3其它、4巡诊)
+     */
+    private Short categoryType;
+
+    /**
+     * 频次
+     */
+    private Long itemTimes;
+
+    /**
+     * 频次类型(1:次/每月，2:必要时）
+     */
+    private Short itemTimesType;
+
+    /**
+     * 单价
+     */
+    private BigDecimal itemPrice;
+
+    /**
+     * 是否必需项(是：1；否：0)
+     */
+    private Short isNeed;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否配置 (是：1；否：0)
+     */
+    private Short isConf;
+
+    /**
+     * 计划频次
+     */
+    private Long planningFrequency;
+
+    /**
+     * 计划频次类型(1：次/每月，2：次/每天，3：次/每周；)
+     */
+    private Short planningFrequencyType;
+
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SvrProgramListVo.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SvrSendListVo.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * 列表页回显对象
  */
 @Data
-public class SvrProgramListVo {
+public class SvrSendListVo {
 
     /**
      * 服务分配ID

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

@@ -17,7 +17,6 @@ public class SerialNumberUtils {
      */
     public static String getSerialNumber(String key) {
         DateFormat dateFormat = new SimpleDateFormat(DateUtils.DATE_PATTERN_yyyyMMddHHMMss);
-        dateFormat.format(new Date());
-        return dateFormat.toString() + key;
+        return dateFormat.format(new Date()) + key;
     }
 }

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

 package com.hungraim.ltc.governance.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo;
-import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
+import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
 import com.hungraim.ltc.governance.service.SrvProgramService;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +49,7 @@ public class SrvProgramController {
         if (pageSize == null || pageSize < 1) {
             pageSize = 10;
         }
-        Page<SvrProgramListVo> page = new Page<>(pageNum, pageSize);
+        Page<SvrSendListVo> page = new Page<>(pageNum, pageSize);
         page = srvProgramService.getProgramList(page, srvOrganId, realName, realTel, programStatus);
         return Result.success(page);
     }
@@ -56,20 +57,53 @@ public class SrvProgramController {
     /**
      * 个人照护方案列表查询
      *
-     * @param pageNum  页码
-     * @param pageSize 每页大小
+     * @param pageNum     页码
+     * @param pageSize    每页大小
+     * @param disabInfoId 失能人员id
+     * @param srvOrganId  服务机构id
      * @return 返回个人照护方案列表
      */
     @RequestMapping("/programSetList")
-    public Result getProgramSetList(Integer pageNum, Integer pageSize) {
-        if (pageNum == null || pageNum < 1) {
+    public Result getProgramSetList(Integer pageNum, Integer pageSize, Long disabInfoId, Long srvOrganId) {
+        if (pageNum == null || pageNum < 1 || disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) {
             return Result.failed("参数错误");
         }
         if (pageSize == null || pageSize < 1) {
             pageSize = 10;
         }
-        Page<ProgramSetListVo> page = new Page<>(pageNum, pageSize);
-        page = srvProgramService.getProgramSetList(page);
+        Page<ProgramListVo> page = new Page<>(pageNum, pageSize);
+        page = srvProgramService.getProgramSetList(page, disabInfoId, srvOrganId);
         return Result.success(page);
     }
+
+    /**
+     * 查看服务方案详情
+     *
+     * @param programId 方案id
+     * @return 返回服务方案详情
+     */
+    @RequestMapping("/programDetail")
+    public Result getProgramDetail(Long programId) {
+        if (programId == null || programId == 0) {
+            return Result.failed("参数错误");
+        }
+        ProgramDetailVo programDetail = srvProgramService.getProgramDetail(programId);
+        return Result.success(programDetail);
+    }
+
+    /**
+     * 添加服务方案时需要展示的相关信息
+     *
+     * @param disabInfoId 失能人员id
+     * @param srvOrganId  服务机构id
+     * @return 返回添加服务方案需要展示的信息
+     */
+    @RequestMapping("/programDetailWithAdd")
+    public Result getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId) {
+        if (disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) {
+            return Result.failed("参数错误");
+        }
+        ProgramDetailVo programDetail = srvProgramService.getProgramDetailWithAdd(disabInfoId, srvOrganId);
+        return Result.success(programDetail);
+    }
 }

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChCfgParaMapper extends BaseMapper<ChCfgPara> {
+}
\ No newline at end of file

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganProject;
+import com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface ChSrvOrganProjectMapper extends BaseMapper<ChSrvOrganProject> {
+
+    /**
+     * 通过服务机构id查询服务机构下的服务项目
+     *
+     * @param srvOrganId 服务机构id
+     * @return 返回项目列表
+     */
+    List<ProgramSetAndProjectVo> selectOrganProjectsBySrvOrganId(@Param("srvOrganId") Long srvOrganId);
+}
\ No newline at end of file

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

@@ -4,8 +4,10 @@ package com.hungraim.ltc.governance.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
-import com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo;
+import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
+import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 @Mapper
@@ -15,8 +17,28 @@ public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> {
     /**
      * 个人照护方案列表查询
      *
-     * @param page 分页参数
+     * @param page        分页参数
+     * @param disabInfoId 失能人员id
+     * @param srvOrganId  服务机构id
      * @return 返回个人照护方案列表
      */
-    Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page);
+    Page<ProgramListVo> getProgramList(Page<ProgramListVo> page, @Param("disabInfoId") Long disabInfoId, @Param("srvOrganId") Long srvOrganId);
+
+    /**
+     * 查看服务方案详情
+     *
+     * @param programId 方案id
+     * @return 返回服务方案详情
+     */
+    ProgramDetailVo getProgramDetail(@Param("programId") Long programId);
+
+    /**
+     * 添加服务方案时需要展示的相关信息
+     *
+     * @param disabInfoId 失能人员id
+     * @param srvOrganId  服务机构id
+     * @return 返回服务方案详情
+     */
+    ProgramDetailVo getProgramDetailWithAdd(@Param("disabInfoId") Long disabInfoId, @Param("srvOrganId") Long srvOrganId);
+
 }
\ No newline at end of file

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgramSet;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChSrvProgramSetMapper extends BaseMapper<ChSrvProgramSet> {
+}
\ No newline at end of file

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

@@ -4,7 +4,7 @@ package com.hungraim.ltc.governance.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
-import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -21,6 +21,6 @@ public interface ChSrvSendMapper extends BaseMapper<ChSrvSend> {
      * @param programStatus 服务方案状态
      * @return 返回列表
      */
-    Page<SvrProgramListVo> selectProgramList(Page<SvrProgramListVo> page, @Param("srvOrganId") Long srvOrganId, @Param("realName") String realName, @Param("realTel") String realTel, @Param("programStatus") String programStatus);
+    Page<SvrSendListVo> selectSrvSendList(Page<SvrSendListVo> page, @Param("srvOrganId") Long srvOrganId, @Param("realName") String realName, @Param("realTel") String realTel, @Param("programStatus") String programStatus);
 
 }
\ No newline at end of file

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChSrvTaskDetailMapper extends BaseMapper<ChSrvTaskDetail> {
+}
\ No newline at end of file

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

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskFinishItem;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChSrvTaskFinishItemMapper extends BaseMapper<ChSrvTaskFinishItem> {
+}
\ No newline at end of file

governance/src/main/java/com/hungraim/ltc/governance/dao/ChSrvTaskMapper.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;
+
+@Mapper
+@Repository
+public interface ChSrvTaskMapper extends BaseMapper<ChSrvTask> {
+}
\ No newline at end of file

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

 package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo;
-import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
+import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
 
 public interface SrvProgramService {
 
@@ -15,13 +16,32 @@ public interface SrvProgramService {
      * @param programStatus 服务方案状态
      * @return 返回列表
      */
-    Page<SvrProgramListVo> getProgramList(Page<SvrProgramListVo> page, Long srvOrganId, String realName, String realTel, String programStatus);
+    Page<SvrSendListVo> getProgramList(Page<SvrSendListVo> page, Long srvOrganId, String realName, String realTel, String programStatus);
 
     /**
      * 个人照护方案列表查询
      *
-     * @param page 分页参数
+     * @param page        分页参数
+     * @param disabInfoId 失能人员id
+     * @param srvOrganId  服务机构id
      * @return 返回个人照护方案列表
      */
-    Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page);
+    Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId);
+
+    /**
+     * 查看服务方案详情
+     *
+     * @param programId 方案id
+     * @return 返回服务方案详情
+     */
+    ProgramDetailVo getProgramDetail(Long programId);
+
+    /**
+     * 添加服务方案时需要展示的相关信息
+     *
+     * @param disabInfoId 失能人员id
+     * @param srvOrganId  服务机构id
+     * @return 返回添加服务方案需要展示的信息
+     */
+    ProgramDetailVo getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId);
 }

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

@@ -2,9 +2,9 @@ package com.hungraim.ltc.governance.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.dao.ChSrvProgramMapper;
-import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
-import com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo;
-import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
+import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
 import com.hungraim.ltc.governance.dao.ChSrvSendMapper;
 import com.hungraim.ltc.governance.service.SrvProgramService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,12 +21,22 @@ public class SrvProgramServiceImpl implements SrvProgramService {
     private ChSrvProgramMapper chSrvProgramMapper;
 
     @Override
-    public Page<SvrProgramListVo> getProgramList(Page<SvrProgramListVo> page, Long srvOrganId, String realName, String realTel, String programStatus) {
-        return chSrvSendMapper.selectProgramList(page, srvOrganId, realName, realTel, programStatus);
+    public Page<SvrSendListVo> getProgramList(Page<SvrSendListVo> page, Long srvOrganId, String realName, String realTel, String programStatus) {
+        return chSrvSendMapper.selectSrvSendList(page, srvOrganId, realName, realTel, programStatus);
     }
 
     @Override
-    public Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page) {
-        return chSrvProgramMapper.getProgramSetList(page);
+    public Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId) {
+        return chSrvProgramMapper.getProgramList(page, disabInfoId, srvOrganId);
+    }
+
+    @Override
+    public ProgramDetailVo getProgramDetail(Long programId) {
+        return chSrvProgramMapper.getProgramDetail(programId);
+    }
+
+    @Override
+    public ProgramDetailVo getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId) {
+        return chSrvProgramMapper.getProgramDetailWithAdd(disabInfoId, srvOrganId);
     }
 }

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChCfgParaMapper.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.ChCfgParaMapper">
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara">
+    <id column="PARA_ID" jdbcType="DECIMAL" property="paraId" />
+    <result column="ORGAN_ID" jdbcType="VARCHAR" property="organId" />
+    <result column="CFG_NAME" jdbcType="VARCHAR" property="cfgName" />
+    <result column="CFG_CYCLE" jdbcType="VARCHAR" property="cfgCycle" />
+    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+    <result column="STATUS" jdbcType="DECIMAL" property="status" />
+    <result column="DEFINE_EMP" jdbcType="DECIMAL" property="defineEmp" />
+    <result column="EFF_TIME" jdbcType="TIMESTAMP" property="effTime" />
+    <result column="END_EMP" jdbcType="DECIMAL" property="endEmp" />
+    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
+    <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="CFG_ARG_TIME" jdbcType="DECIMAL" property="cfgArgTime" />
+    <result column="CFG_ARG_UNIT" jdbcType="DECIMAL" property="cfgArgUnit" />
+    <result column="DIS_LIMT_SCORE" jdbcType="DECIMAL" property="disLimtScore" />
+    <result column="PULICITY_PERIOD" jdbcType="DECIMAL" property="pulicityPeriod" />
+    <result column="PULICITY_PERIOD_UNIT" jdbcType="DECIMAL" property="pulicityPeriodUnit" />
+    <result column="ENJOY_STANDARD" jdbcType="DECIMAL" property="enjoyStandard" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    PARA_ID, ORGAN_ID, CFG_NAME, CFG_CYCLE, REMARK, "STATUS", DEFINE_EMP, EFF_TIME, END_EMP, 
+    END_TIME, FCD, FCU, LCD, LCU, CFG_ARG_TIME, CFG_ARG_UNIT, DIS_LIMT_SCORE, PULICITY_PERIOD, 
+    PULICITY_PERIOD_UNIT, ENJOY_STANDARD
+  </sql>
+</mapper>
\ No newline at end of file

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvOrganProjectMapper.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.ChSrvOrganProjectMapper">
+    <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganProject">
+        <id column="PROJECT_ID" jdbcType="DECIMAL" property="projectId"/>
+        <result column="SRV_ORGAN_ID" jdbcType="DECIMAL" property="srvOrganId"/>
+        <result column="PROJECT_CATEGORY" jdbcType="DECIMAL" property="projectCategory"/>
+        <result column="ITEM_NAME" jdbcType="VARCHAR" property="itemName"/>
+        <result column="SERVICE_CONTENT" jdbcType="VARCHAR" property="serviceContent"/>
+        <result column="CATEGORY_TYPE" jdbcType="DECIMAL" property="categoryType"/>
+        <result column="ITEM_TIMES" jdbcType="DECIMAL" property="itemTimes"/>
+        <result column="ITEM_TIMES_TYPE" jdbcType="DECIMAL" property="itemTimesType"/>
+        <result column="ITEM_PRICE" jdbcType="DECIMAL" property="itemPrice"/>
+        <result column="IS_CONF" jdbcType="DECIMAL" property="isConf"/>
+        <result column="STATUS" jdbcType="DECIMAL" property="status"/>
+        <result column="REMARK" jdbcType="VARCHAR" property="remark"/>
+        <result column="DEFINE_EMP" jdbcType="DECIMAL" property="defineEmp"/>
+        <result column="EFF_TIME" jdbcType="TIMESTAMP" property="effTime"/>
+        <result column="END_EMP" jdbcType="DECIMAL" property="endEmp"/>
+        <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime"/>
+        <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="ITEM_PRICE_TYPE" jdbcType="DECIMAL" property="itemPriceType"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        PROJECT_ID, SRV_ORGAN_ID, PROJECT_CATEGORY, ITEM_NAME, SERVICE_CONTENT, CATEGORY_TYPE,
+    ITEM_TIMES, ITEM_TIMES_TYPE, ITEM_PRICE, IS_CONF, "STATUS", REMARK, DEFINE_EMP, EFF_TIME, 
+    END_EMP, END_TIME, FCD, FCU, LCD, LCU, ITEM_PRICE_TYPE
+    </sql>
+    <resultMap id="organProjectsMap" type="com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo">
+        <id column="PROJECT_ID" property="projectId"/>
+        <result column="SRV_ORGAN_ID" property="srvOrganId"/>
+        <result column="ITEM_NAME" property="itemName"/>
+        <result column="CATEGORY_TYPE" property="categoryType"/>
+        <result column="SRV_ORGAN_ID" property="itemTimes"/>
+        <result column="ITEM_TIMES_TYPE" property="itemTimesType"/>
+        <result column="ITEM_PRICE" property="itemPrice"/>
+        <result column="IS_CONF" property="isNeed"/>
+    </resultMap>
+
+    <select id="selectOrganProjectsBySrvOrganId" resultMap="organProjectsMap">
+        SELECT *
+        FROM CH_SRV_ORGAN_PROJECT
+        WHERE SRV_ORGAN_ID = #{srvOrganId}
+          AND STATUS = 0
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -2,11 +2,132 @@
 <!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.ChSrvProgramMapper">
 
-    <select id="getProgramSetList" resultType="com.hungraim.ltc.pojo.vo.governance.ProgramSetListVo">
-        SELECT *
+
+    <resultMap id="ProgramSetDetailVoMap" type="com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo">
+        <id column="PROGRAM_ID" property="programId"/>
+        <result column="SRV_ORGAN_ID" property="srvOrganId"/>
+        <result column="DISAB_INFO_ID" property="disabInfoId"/>
+        <result column="DISTRICT_PROVINCIAL" property="disableDistrictProvincial"/>
+        <result column="DISTRICT_CITY" property="disableDistrictCity"/>
+        <result column="DISTRICT_AREA" property="disableDistrictArea"/>
+        <result column="REAL_NAME" property="realName"/>
+        <result column="BIRTHDAY" property="birthday"/>
+        <result column="GENDER" property="gender"/>
+        <result column="TEL" property="realTel"/>
+        <result column="ADRESS_DETAIL" property="addressDetail"/>
+        <result column="DISE_TYPE_F" property="diseTypeF"/>
+        <result column="DISE_TYPE_S" property="diseTypeS"/>
+        <result column="ACPT_PROVINCIAL" property="acptProvincial"/>
+        <result column="ACPT_CITY" property="acptCity"/>
+        <result column="ACPT_AREA" property="acptArea"/>
+        <result column="ACPT_STREET" property="acptStreet"/>
+        <result column="ACPT_ADDRESS" property="acptAddress"/>
+        <result column="DISABLE_LEVEL_NAME" property="realLevel"/>
+        <result column="FINISH_TIME" property="assessDate"/>
+        <result column="SRV_MODE_NAME" property="svrModelName"/>
+        <result column="SRV_ORGAN_NAME" property="svrOrganName"/>
+        <result column="PROG_STATUS" property="progStatus"/>
+        <result column="program" property="programDate"/>
+        <result column="PROGRAM_EDN_DATE" property="programEndDate"/>
+        <collection property="programSetAndProjectVos" column="SRV_ORGAN_ID"
+                    select="com.hungraim.ltc.governance.dao.ChSrvOrganProjectMapper.selectOrganProjectsBySrvOrganId"/>
+    </resultMap>
+    <select id="getProgramDetail" resultMap="ProgramSetDetailVoMap">
+        SELECT T1.PROGRAM_ID,
+               T1.SRV_ORGAN_ID,
+               T1.DISAB_INFO_ID,
+               T2.DISTRICT_PROVINCIAL,
+               T2.DISTRICT_CITY,
+               T2.DISTRICT_AREA,
+               T2.REAL_NAME,
+               T2.TEL,
+               T2.BIRTHDAY,
+               T2.GENDER,
+               T2.ADRESS_DETAIL,
+               T2.DISE_TYPE_F,
+               T2.DISE_TYPE_S,
+               T2.ACPT_PROVINCIAL,
+               T2.ACPT_CITY,
+               T2.ACPT_AREA,
+               T2.ACPT_STREET,
+               T2.ACPT_ADDRESS,
+               T6.DISABLE_LEVEL_NAME,
+               T4.FINISH_TIME,
+               T7.SRV_MODE_NAME,
+               T5.SRV_ORGAN_NAME,
+               T1.PROG_STATUS,
+               T1.EFF_TIME
+        FROM CH_SRV_PROGRAM T1
+                 INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
+                 LEFT JOIN CH_FND_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.SRV_MODE_ID
+                 LEFT JOIN CH_APR_REPORT T3 ON T2.LAST_TASK_ID = T3.TASK_ID
+                 LEFT JOIN CH_CFG_SRV_DISABLE_LEVEL T6 ON T3.DISABLE_LEVEL_ID = T6.DISABLE_LEVEL_ID
+                 LEFT JOIN CH_APR_TASK T4 ON T3.TASK_ID = T4.TASK_ID
+                 LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
+        WHERE T1.PROGRAM_ID = #{programId}
+    </select>
+    <select id="getProgramDetailWithAdd" resultMap="ProgramSetDetailVoMap">
+        SELECT T1.SRV_ORGAN_ID,
+               T1.DISAB_INFO_ID,
+               T2.DISTRICT_PROVINCIAL,
+               T2.DISTRICT_CITY,
+               T2.DISTRICT_AREA,
+               T2.REAL_NAME,
+               T2.TEL,
+               T2.BIRTHDAY,
+               T2.GENDER,
+               T2.ADRESS_DETAIL,
+               T2.DISE_TYPE_F,
+               T2.DISE_TYPE_S,
+               T2.ACPT_PROVINCIAL,
+               T2.ACPT_CITY,
+               T2.ACPT_AREA,
+               T2.ACPT_STREET,
+               T2.ACPT_ADDRESS,
+               T6.DISABLE_LEVEL_NAME,
+               T4.FINISH_TIME,
+               T7.SRV_MODE_NAME,
+               T5.SRV_ORGAN_NAME
+        FROM CH_SRV_SEND T1
+                 INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
+                 LEFT JOIN CH_FND_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.SRV_MODE_ID
+                 LEFT JOIN CH_APR_REPORT T3 ON T2.LAST_TASK_ID = T3.TASK_ID
+                 LEFT JOIN CH_CFG_SRV_DISABLE_LEVEL T6 ON T3.DISABLE_LEVEL_ID = T6.DISABLE_LEVEL_ID
+                 LEFT JOIN CH_APR_TASK T4 ON T3.TASK_ID = T4.TASK_ID
+                 LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
+        WHERE T1.DISAB_INFO_ID = #{disabInfoId}
+          AND T1.SRV_ORGAN_ID = #{srvOrganId}
+    </select>
+
+    <select id="getProgramList" resultType="com.hungraim.ltc.pojo.vo.governance.ProgramListVo">
+        SELECT T1.PROGRAM_ID          programId,
+               T1.SRV_ORGAN_ID        srvOrganId,
+               T1.DISAB_INFO_ID       disabInfoId,
+               T5.DISTRICT_PROVINCIAL districtProvincial,
+               T5.DISTRICT_CITY       districtCity,
+               T2.REAL_NAME           realName,
+               T2.TEL                 realTel,
+               T2.BIRTHDAY            birthday,
+               T2.GENDER              gender,
+               T2.ACPT_PROVINCIAL     acptProvincial,
+               T2.ACPT_CITY           acptCity,
+               T2.ACPT_AREA           acptArea,
+               T2.ACPT_STREET         acptStreet,
+               T2.ACPT_ADDRESS        acptAddress,
+               T6.DISABLE_LEVEL_NAME  realLevel,
+               T4.FINISH_TIME         assessDate,
+               T7.SRV_MODE_NAME       svrModelName,
+               T5.SRV_ORGAN_NAME      svrOrganName,
+               T1.PROG_STATUS         progStatus,
+               T1.EFF_TIME            effTime
         FROM CH_SRV_PROGRAM T1
                  INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
+                 LEFT JOIN CH_FND_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.SRV_MODE_ID
                  LEFT JOIN CH_APR_REPORT T3 ON T2.LAST_TASK_ID = T3.TASK_ID
+                 LEFT JOIN CH_CFG_SRV_DISABLE_LEVEL T6 ON T3.DISABLE_LEVEL_ID = T6.DISABLE_LEVEL_ID
                  LEFT JOIN CH_APR_TASK T4 ON T3.TASK_ID = T4.TASK_ID
+                 LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
+        WHERE T1.DISAB_INFO_ID = #{disabInfoId}
+          AND T1.SRV_ORGAN_ID = #{srvOrganId}
     </select>
 </mapper>
\ No newline at end of file

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvProgramSetMapper.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.ChSrvProgramSetMapper">
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgramSet">
+    <id column="SET_ID" jdbcType="DECIMAL" property="setId" />
+    <result column="ITEM_ID" jdbcType="DECIMAL" property="itemId" />
+    <result column="IS_CONF" jdbcType="DECIMAL" property="isConf" />
+    <result column="ITEM_FREQ" jdbcType="DECIMAL" property="itemFreq" />
+    <result column="ITEM_TIMES" jdbcType="DECIMAL" property="itemTimes" />
+    <result column="DEFINE_EMP" jdbcType="DECIMAL" property="defineEmp" />
+    <result column="EFF_TIME" jdbcType="TIMESTAMP" property="effTime" />
+    <result column="END_EMP" jdbcType="DECIMAL" property="endEmp" />
+    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
+    <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="PROGRAM_ID" jdbcType="DECIMAL" property="programId" />
+    <result column="SRV_MODE_ID" jdbcType="DECIMAL" property="srvModeId" />
+    <result column="DATA_FROM" jdbcType="DECIMAL" property="dataFrom" />
+    <result column="WEB_DEFINE_EMP" jdbcType="DECIMAL" property="webDefineEmp" />
+    <result column="WEB_END_EMP" jdbcType="DECIMAL" property="webEndEmp" />
+    <result column="ITEM_TYPE" jdbcType="DECIMAL" property="itemType" />
+    <result column="CHOOSE_FLAG" jdbcType="DECIMAL" property="chooseFlag" />
+    <result column="PAY_TYPE" jdbcType="DECIMAL" property="payType" />
+    <result column="SPEC" jdbcType="VARCHAR" property="spec" />
+    <result column="UNIT" jdbcType="VARCHAR" property="unit" />
+    <result column="PRICE" jdbcType="DECIMAL" property="price" />
+    <result column="PLANNING_FREQUENCY" jdbcType="DECIMAL" property="planningFrequency" />
+    <result column="PLANNING_FREQUENCY_TYPE" jdbcType="DECIMAL" property="planningFrequencyType" />
+    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    SET_ID, ITEM_ID, IS_CONF, ITEM_FREQ, ITEM_TIMES, DEFINE_EMP, EFF_TIME, END_EMP, END_TIME, 
+    FCD, FCU, LCD, LCU, PROGRAM_ID, SRV_MODE_ID, DATA_FROM, WEB_DEFINE_EMP, WEB_END_EMP, 
+    ITEM_TYPE, CHOOSE_FLAG, PAY_TYPE, SPEC, UNIT, PRICE, PLANNING_FREQUENCY, PLANNING_FREQUENCY_TYPE, 
+    REMARK
+  </sql>
+</mapper>
\ No newline at end of file

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

@@ -31,7 +31,7 @@
         <result column="ACPT_LONGITUDE" jdbcType="VARCHAR" property="acptLongitude"/>
         <result column="ACPT_LATITUDE" jdbcType="VARCHAR" property="acptLatitude"/>
     </resultMap>
-    <select id="selectProgramList" resultType="com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo">
+    <select id="selectSrvSendList" resultType="com.hungraim.ltc.pojo.vo.governance.SvrSendListVo">
         SELECT T1.SRV_SEND_ID srvSendId,
         T1.SRV_ORGAN_ID srvOrganId,
         T1.DISAB_INFO_ID disabInfoId,

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvTaskDetailMapper.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.ChSrvTaskDetailMapper">
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail">
+    <id column="TASK_DETAIL_ID" jdbcType="DECIMAL" property="taskDetailId" />
+    <result column="SRV_TASK_ID" jdbcType="DECIMAL" property="srvTaskId" />
+    <result column="STATUS" jdbcType="DECIMAL" property="status" />
+    <result column="DEFINE_EMP" jdbcType="DECIMAL" property="defineEmp" />
+    <result column="EFF_TIME" jdbcType="TIMESTAMP" property="effTime" />
+    <result column="END_EMP" jdbcType="DECIMAL" property="endEmp" />
+    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
+    <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="SRV_START_TIME" jdbcType="TIMESTAMP" property="srvStartTime" />
+    <result column="SRV_END_TIME" jdbcType="TIMESTAMP" property="srvEndTime" />
+    <result column="SRV_TIME" jdbcType="DECIMAL" property="srvTime" />
+    <result column="SRV_START_PIC" jdbcType="VARCHAR" property="srvStartPic" />
+    <result column="SRV_END_PIC" jdbcType="VARCHAR" property="srvEndPic" />
+    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
+    <result column="SRV_SCORE" jdbcType="VARCHAR" property="srvScore" />
+    <result column="TASK_TYPE" jdbcType="DECIMAL" property="taskType" />
+    <result column="DATA_FROM" jdbcType="DECIMAL" property="dataFrom" />
+    <result column="WEB_DEFINE_EMP" jdbcType="DECIMAL" property="webDefineEmp" />
+    <result column="WEB_END_EMP" jdbcType="DECIMAL" property="webEndEmp" />
+    <result column="SRV_DATE" jdbcType="TIMESTAMP" property="srvDate" />
+    <result column="SRV_AMOUNT" jdbcType="DECIMAL" property="srvAmount" />
+    <result column="SELF_AMOUNT" jdbcType="DECIMAL" property="selfAmount" />
+    <result column="LONGITUDE_CODE" jdbcType="VARCHAR" property="longitudeCode" />
+    <result column="LATITUDE_CODE" jdbcType="VARCHAR" property="latitudeCode" />
+    <result column="SRV_TIME_START_TIME" jdbcType="TIMESTAMP" property="srvTimeStartTime" />
+    <result column="SRV_TIME_END_TIME" jdbcType="TIMESTAMP" property="srvTimeEndTime" />
+    <result column="SRV_TIME_START_PIC" jdbcType="VARCHAR" property="srvTimeStartPic" />
+    <result column="SRV_TIME_END_PIC" jdbcType="VARCHAR" property="srvTimeEndPic" />
+    <result column="SRV_TIME_CHARGE" jdbcType="DECIMAL" property="srvTimeCharge" />
+    <result column="SRV_TIME_REMARK" jdbcType="VARCHAR" property="srvTimeRemark" />
+    <result column="FINISH_FLAG" jdbcType="VARCHAR" property="finishFlag" />
+    <result column="AUDIT_RESULT" jdbcType="DECIMAL" property="auditResult" />
+    <result column="AUDIT_REMARK" jdbcType="VARCHAR" property="auditRemark" />
+    <result column="AUDIT_DATE" jdbcType="TIMESTAMP" property="auditDate" />
+    <result column="ILLEGAL_TYPE" jdbcType="DECIMAL" property="illegalType" />
+    <result column="ILLEGAL_REMARK" jdbcType="VARCHAR" property="illegalRemark" />
+    <result column="ILLEGALRE_EMP" jdbcType="DECIMAL" property="illegalreEmp" />
+    <result column="ILLEGALRE_NAME" jdbcType="VARCHAR" property="illegalreName" />
+    <result column="ILLEGALRE_TIME" jdbcType="TIMESTAMP" property="illegalreTime" />
+    <result column="ACCOUNT_SIGN" jdbcType="DECIMAL" property="accountSign" />
+    <result column="TASK_DETAIL_TYPE" jdbcType="DECIMAL" property="taskDetailType" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    TASK_DETAIL_ID, SRV_TASK_ID, "STATUS", DEFINE_EMP, EFF_TIME, END_EMP, END_TIME, FCD, 
+    FCU, LCD, LCU, SRV_START_TIME, SRV_END_TIME, SRV_TIME, SRV_START_PIC, SRV_END_PIC, 
+    REMARK, SRV_SCORE, TASK_TYPE, DATA_FROM, WEB_DEFINE_EMP, WEB_END_EMP, SRV_DATE, SRV_AMOUNT, 
+    SELF_AMOUNT, LONGITUDE_CODE, LATITUDE_CODE, SRV_TIME_START_TIME, SRV_TIME_END_TIME, 
+    SRV_TIME_START_PIC, SRV_TIME_END_PIC, SRV_TIME_CHARGE, SRV_TIME_REMARK, FINISH_FLAG, 
+    AUDIT_RESULT, AUDIT_REMARK, AUDIT_DATE, ILLEGAL_TYPE, ILLEGAL_REMARK, ILLEGALRE_EMP, 
+    ILLEGALRE_NAME, ILLEGALRE_TIME, ACCOUNT_SIGN, TASK_DETAIL_TYPE
+  </sql>
+</mapper>
\ No newline at end of file

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvTaskFinishItemMapper.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.ChSrvTaskFinishItemMapper">
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskFinishItem">
+    <result column="TASK_FINISH_ITEM_ID" jdbcType="DECIMAL" property="taskFinishItemId" />
+    <result column="TASK_DETAIL_ID" jdbcType="DECIMAL" property="taskDetailId" />
+    <result column="ITEM_ID" jdbcType="DECIMAL" property="itemId" />
+    <result column="DEFINE_EMP" jdbcType="DECIMAL" property="defineEmp" />
+    <result column="EFF_TIME" jdbcType="TIMESTAMP" property="effTime" />
+    <result column="END_EMP" jdbcType="DECIMAL" property="endEmp" />
+    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
+    <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="REMARK" jdbcType="VARCHAR" property="remark" />
+    <result column="DATA_FROM" jdbcType="DECIMAL" property="dataFrom" />
+    <result column="WEB_DEFINE_EMP" jdbcType="DECIMAL" property="webDefineEmp" />
+    <result column="WEB_END_EMP" jdbcType="DECIMAL" property="webEndEmp" />
+    <result column="CHILD_ITEM_TYPE" jdbcType="DECIMAL" property="childItemType" />
+    <result column="ITEM_NAME" jdbcType="VARCHAR" property="itemName" />
+    <result column="ITEM_PRICE" jdbcType="DECIMAL" property="itemPrice" />
+    <result column="CATEGORY_TYPE" jdbcType="DECIMAL" property="categoryType" />
+    <result column="ITEM_TIMES" jdbcType="DECIMAL" property="itemTimes" />
+    <result column="ITEM_TIMES_TYPE" jdbcType="DECIMAL" property="itemTimesType" />
+  </resultMap>
+</mapper>
\ No newline at end of file

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvTaskMapper.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.ChSrvTaskMapper">
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask">
+    <id column="SRV_TASK_ID" jdbcType="DECIMAL" property="srvTaskId" />
+    <result column="SRV_EMP_ID" jdbcType="DECIMAL" property="srvEmpId" />
+    <result column="SRV_DATE" jdbcType="TIMESTAMP" property="srvDate" />
+    <result column="STATUS" jdbcType="DECIMAL" property="status" />
+    <result column="DISAB_INFO_ID" jdbcType="DECIMAL" property="disabInfoId" />
+    <result column="DEFINE_EMP" jdbcType="DECIMAL" property="defineEmp" />
+    <result column="EFF_TIME" jdbcType="TIMESTAMP" property="effTime" />
+    <result column="END_EMP" jdbcType="DECIMAL" property="endEmp" />
+    <result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
+    <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="PROGRAM_ID" jdbcType="DECIMAL" property="programId" />
+    <result column="DATA_FROM" jdbcType="DECIMAL" property="dataFrom" />
+    <result column="WEB_DEFINE_EMP" jdbcType="DECIMAL" property="webDefineEmp" />
+    <result column="WEB_END_EMP" jdbcType="DECIMAL" property="webEndEmp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    SRV_TASK_ID, SRV_EMP_ID, SRV_DATE, "STATUS", DISAB_INFO_ID, DEFINE_EMP, EFF_TIME, 
+    END_EMP, END_TIME, FCD, FCU, LCD, LCU, PROGRAM_ID, DATA_FROM, WEB_DEFINE_EMP, WEB_END_EMP
+  </sql>
+</mapper>
\ No newline at end of file