照护方案详情页显示以及添加页面需要展示的信息接口

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/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;
+
+    /**
+     * 是否配置
+     */
+    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

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);
     }
@@ -70,8 +71,39 @@ public class SrvProgramController {
         if (pageSize == null || pageSize < 1) {
             pageSize = 10;
         }
-        Page<ProgramSetListVo> page = new Page<>(pageNum, pageSize);
+        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/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,7 +4,8 @@ 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;
@@ -21,5 +22,23 @@ public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> {
      * @param srvOrganId  服务机构id
      * @return 返回个人照护方案列表
      */
-    Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page, @Param("disabInfoId") Long disabInfoId, @Param("srvOrganId") Long srvOrganId);
+    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/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,7 +16,7 @@ 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);
 
     /**
      * 个人照护方案列表查询
@@ -25,5 +26,22 @@ public interface SrvProgramService {
      * @param srvOrganId  服务机构id
      * @return 返回个人照护方案列表
      */
-    Page<ProgramSetListVo> getProgramSetList(Page<ProgramSetListVo> page, Long disabInfoId, Long srvOrganId);
+    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,8 +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.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;
@@ -20,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, Long disabInfoId, Long srvOrganId) {
-        return chSrvProgramMapper.getProgramSetList(page, disabInfoId, srvOrganId);
+    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/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,28 +2,124 @@
 <!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
-        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
+
+    <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
@@ -31,6 +127,7 @@
                  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}
+        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,