打卡

apply/apply-service/src/main/java/com/hungraim/ltc/controller/SrvOrganController.java

@@ -289,36 +289,36 @@ public class SrvOrganController {
         FileUtils.exportResponse(workbook,fileName,response);
     }
 
-    /**
-     * 打卡查询
-     * @param empId
-     * @return
-     */
-   @GetMapping("/chSrvTaskDetailQuery")
-    public Result  chSrvTaskDetailQuery(Integer pageNum, Integer pageSize,Long empId){
-       Page<ChSrvTaskDetailVo> page = new Page<>(pageNum, pageSize);
-       page = srvOrganEmpService.chSrvTaskDetailQuery(page,empId);
-       if(page.getSize()>0){
-           return Result.success(page);
-       }else {
-           return Result.failed(ResultCode.SRV_ORGAN_NOT_QUERY);
-       }
-   }
-
-    /**
-     *  删除打卡数据
-     * @param taskDetailId
-     * @param userName
-     * @return
-     */
-    @PostMapping("/chSrvTaskDetailDelete")
-    public Result  chSrvTaskDetailDelete(Long taskDetailId,String userName){
-        int srv = srvOrganEmpService.chSrvTaskDetailDelete(taskDetailId,userName);
-        if(srv>0){
-            return Result.success();
-        }else {
-            return Result.failed("删除失败");
-        }
-    }
+//    /**
+//     * 打卡查询
+//     * @param empId
+//     * @return
+//     */
+//   @GetMapping("/chSrvTaskDetailQuery")
+//    public Result  chSrvTaskDetailQuery(Integer pageNum, Integer pageSize,Long empId){
+//       Page<ChSrvTaskDetailVo> page = new Page<>(pageNum, pageSize);
+//       page = srvOrganEmpService.chSrvTaskDetailQuery(page,empId);
+//       if(page.getSize()>0){
+//           return Result.success(page);
+//       }else {
+//           return Result.failed(ResultCode.SRV_ORGAN_NOT_QUERY);
+//       }
+//   }
+//
+//    /**
+//     *  删除打卡数据
+//     * @param taskDetailId
+//     * @param userName
+//     * @return
+//     */
+//    @PostMapping("/chSrvTaskDetailDelete")
+//    public Result  chSrvTaskDetailDelete(Long taskDetailId,String userName){
+//        int srv = srvOrganEmpService.chSrvTaskDetailDelete(taskDetailId,userName);
+//        if(srv>0){
+//            return Result.success();
+//        }else {
+//            return Result.failed("删除失败");
+//        }
+//    }
 
 }

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

@@ -56,20 +56,4 @@
     AUDIT_RESULT, AUDIT_REMARK, AUDIT_DATE, ILLEGAL_TYPE, ILLEGAL_REMARK, ILLEGALRE_EMP, 
     ILLEGALRE_NAME, ILLEGALRE_TIME, ACCOUNT_SIGN, TASK_DETAIL_TYPE
   </sql>
-
-  <select id="chSrvTaskDetailQuery" resultType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo">
-    SELECT
-      t.TASK_DETAIL_ID taskDetailId,
-      m.EMP_NAME empName,
-      m.ORGAN_ID orgamId,
-      --t.STATUS status,
-      decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status,
-      t.SRV_START_TIME sevStarTime,
-      t.SRV_END_TIME sevEndTime
-    FROM
-      CH_SRV_TASK_DETAIL t
-        LEFT JOIN  CH_SRV_TASK k ON t.SRV_TASK_ID = k.SRV_TASK_ID
-        LEFT JOIN  CH_SRV_ORGAN_EMP m ON m.EMP_ID = k.SRV_EMP_ID
-    WHERE m.EMP_ID = #{empId}
-  </select>
 </mapper>
\ No newline at end of file

auth-service/src/main/java/com/hungraim/ltc/controller/PublicKeyController.java

 package com.hungraim.ltc.controller;
 
-import com.hungraim.ltc.util.CsoftSecurityUtil;
-import com.hungraim.ltc.util.Result;
 import com.nimbusds.jose.jwk.JWKSet;
 import com.nimbusds.jose.jwk.RSAKey;
 import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.security.KeyPair;
 import java.security.interfaces.RSAPublicKey;
 import java.util.Map;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChPunchDetailVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+/**
+ * @author mq
+ */
+@Data
+@Component
+public class ChPunchDetailVO {
+    /**
+     * 父类id
+     */
+    private Long paraId;
+
+    /**
+     * 父类name
+     */
+    private String serviceTypeName;
+
+    /**
+     * 项目信息
+     */
+    private List<ChServiceTypeVO> serviceTypeVOS;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChPunchDetailsVO.java

 package com.hungraim.ltc.pojo.entity.account;
 
-import com.hungraim.ltc.pojo.entity.disable.ChServiceTypeDetailed;
 import lombok.Data;
 
 import java.util.List;
 
+/**
+ * 打卡记录返回
+ * @author mq
+ */
 @Data
 public class ChPunchDetailsVO {
 
@@ -13,15 +16,16 @@ public class ChPunchDetailsVO {
      */
    private String srvOrganName;
     /**
-     * 护理机构
+     * 护理类型
      */
     private String organTypeName;
 
     /**
-     * 护理机构
+     * 项目信息
      */
-    private List<ChServiceTypeDetailed> projectNames;
+    private List<ChPunchDetailVO> recordData;
     /**
-     *
+     * 打卡记录
      */
+    private List<ChServiceTypeDetailedVO> chPunchDetailVOS;
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChServiceTypeDetailedVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import lombok.Data;
+
+/**
+ * @author mq
+ */
+@Data
+public class ChServiceTypeDetailedVO {
+
+    /**
+     * 天数
+     */
+    private String executionTime;
+    /**
+     * 服务类型名称
+     */
+    private String itemName;
+    /**
+     * 服务类型明细id
+     */
+    private String serviceTypeDetailedId;
+
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChServiceTypeVO.java

+package com.hungraim.ltc.pojo.entity.account;
+
+import lombok.Data;
+
+/**
+ * @author mq
+ */
+@Data
+public class ChServiceTypeVO {
+    /**
+     * 服务类型id
+     */
+    private Long serviceTypeDetailedId;
+
+    /**
+     * 服务类型名称
+     */
+    private String serviceTypeDetailedName;
+
+    /**
+     * 父类id
+     */
+    private Long paraId;
+
+    /**
+     * 父类name
+     */
+    private String serviceTypeName;
+
+}

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

 package com.hungraim.ltc.pojo.vo.disable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hungraim.ltc.pojo.vo.BaseReq;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
+/**
+ * @author root
+ */
 @Data
-public class ChSrvTaskDetailVo {
-
+public class ChSrvTaskDetailVo extends BaseReq {
+    /**
+     * 打卡id
+     */
     private Long taskDetailId;
 
-    private String empName;
-
-    private Integer orgamId;
-
-    private String status;
-
+    /**
+     * 服务开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date sevStarTime;
-
+    /**
+     * 服务结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date sevEndTime;
     /**
      * 护理机构id
@@ -33,11 +44,15 @@ public class ChSrvTaskDetailVo {
     /**
      * 失能人员姓名
      */
-    private Date realName;
+    private String realName;
     /**
      * 失能人员身份证件号码
      */
-    private Date certiCode;
+    private String certiCode;
 
+    /**
+     * 服务方式
+     */
+    private String modeName;
 
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.service.*;
+import com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
@@ -281,13 +282,13 @@ public class BuildBedController {
 
     /**
      * 打卡查询
-     * @param empId
+     * @param
      * @return
      */
     @GetMapping("/chSrvTaskDetailQuery")
-    public Result  chSrvTaskDetailQuery(Integer pageNum, Integer pageSize,Long empId){
-        Page<ChSrvTaskDetailVo> page = new Page<>(pageNum, pageSize);
-        page = buildBedService.chSrvTaskDetailQuery(page,empId);
+    public Result  chSrvTaskDetailQuery(ChSrvTaskDetailVo vo){
+        Page<ChSrvTaskDetailVo> page = new Page<>(vo.getPageNum(), vo.getPageSize());
+        page = buildBedService.chSrvTaskDetailQuery(page,vo);
         if(page.getSize()>0){
             return Result.success(page);
         }else {
@@ -296,15 +297,14 @@ public class BuildBedController {
     }
 
     /**
-     * 打卡查询
+     * 打卡详情
      * @param
      * @return
      */
     @GetMapping("/chPunchDetailsQuery")
-    public Result  chPunchDetailsQuery(Long taskDetailId,String userName){
-         buildBedService.chPunchDetailsQuery(taskDetailId);
-
-            return Result.success(page);
+    public Result  chPunchDetailsQuery(Long taskDetailId,String sevStarTime,String sevEndTime){
+        ChPunchDetailsVO chPunchDetailsVO = buildBedService.chPunchDetailsQuery(taskDetailId,sevStarTime,sevEndTime);
+        return Result.success(chPunchDetailsVO);
 
     }
 

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

@@ -3,6 +3,10 @@ package com.hungraim.ltc.governance.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO;
+import com.hungraim.ltc.pojo.entity.account.ChServiceTypeDetailedVO;
+import com.hungraim.ltc.pojo.entity.account.ChServiceTypeVO;
+import com.hungraim.ltc.pojo.entity.disable.ChServiceTypeDetailed;
 import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
@@ -12,6 +16,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author jiaguokai
  * ChSrvBuildBed
@@ -26,5 +33,11 @@ public interface BuildBedMapper extends BaseMapper<ChSrvBuildBed> {
                                  String srvmodename, String area, String city,
                                  String certicode, String applystatus, int pageNum, int pageSize);
 
-    Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page, Long empId);
+    Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,@Param("vo") ChSrvTaskDetailVo vo);
+
+    ChPunchDetailsVO getsrvOrgan(Long taskDetailId);
+
+    List<ChServiceTypeDetailedVO> getServiceTypeDetailed(@Param("taskDetailId")Long taskDetailId,@Param("sevStarTime")String sevStarTime,@Param("sevEndTime")String sevEndTime);
+
+    List<ChServiceTypeVO> selectServiceTypeDetailed();
 }

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

@@ -2,12 +2,15 @@ package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
 
+import java.util.Date;
+
 /**
  * @author jiaguokai
  */
@@ -31,7 +34,7 @@ public interface IBuildBedService extends IService<ChSrvBuildBed> {
      * @param empId
      * @return
      */
-    Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page, Long empId);
+    Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,ChSrvTaskDetailVo vo);
 
     /**
      * 删除打卡数据
@@ -41,5 +44,9 @@ public interface IBuildBedService extends IService<ChSrvBuildBed> {
      */
     int chSrvTaskDetailDelete(Long taskDetailId, String userName);
 
-    void chPunchDetailsQuery(Long taskDetailId);
+    /**
+     * 打卡详情
+     * @param taskDetailId
+     */
+    ChPunchDetailsVO chPunchDetailsQuery(Long taskDetailId,String sevStarTime,String sevEndTime);
 }

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

@@ -7,10 +7,11 @@ import com.hungraim.ltc.governance.dao.BuildBedMapper;
 import com.hungraim.ltc.governance.dao.ServiceTypeDetailedMapper;
 import com.hungraim.ltc.governance.service.IBuildBedService;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
-import com.hungraim.ltc.pojo.entity.disable.ChServiceTypeDetailed;
+import com.hungraim.ltc.pojo.entity.account.ChPunchDetailVO;
+import com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO;
+import com.hungraim.ltc.pojo.entity.account.ChServiceTypeDetailedVO;
+import com.hungraim.ltc.pojo.entity.account.ChServiceTypeVO;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
-import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
-import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetailDelete;
 import com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
@@ -24,8 +25,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author jiaguokai
@@ -79,11 +80,22 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
         return buildBedDetailVo;
     }
 
+    /**
+     * 打卡查询
+     * @param page
+     * @param empId
+     * @return
+     */
     @Override
-    public Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page, Long empId) {
-        return buildBedMapper.chSrvTaskDetailQuery(page,empId);
+    public Page<ChSrvTaskDetailVo> chSrvTaskDetailQuery(Page<ChSrvTaskDetailVo> page,ChSrvTaskDetailVo vo) {
+        return buildBedMapper.chSrvTaskDetailQuery(page,vo);
     }
-
+    /**
+     * 删除打卡数据
+     * @param taskDetailId
+     * @param userName
+     * @return
+     */
     @Override
     public int chSrvTaskDetailDelete(Long taskDetailId, String userName) {
 //        ChSrvTaskDetail chSrvTaskDetail = buildBedMapper.selectById(taskDetailId);
@@ -96,11 +108,36 @@ public class BuildBedServiceImpl extends ServiceImpl<BuildBedMapper, ChSrvBuildB
         return buildBedMapper.deleteById(taskDetailId);
     }
 
+    /**
+     * 打卡详情
+     * @param taskDetailId
+     */
     @Override
-    public void chPunchDetailsQuery(Long taskDetailId) {
-
+    public ChPunchDetailsVO chPunchDetailsQuery(Long taskDetailId, String sevStarTime,String sevEndTime) {
+        List<ChPunchDetailVO> chPunchDetailVOS = new ArrayList<>();
         //获取项目信息
-        List<ChServiceTypeDetailed> chServiceTypeDetaileds = serviceTypeDetailed.selectList(null);
+        List<ChServiceTypeVO> chServiceTypeDetaileds = buildBedMapper.selectServiceTypeDetailed();
+        log.info("chPunchDetailsQuery项目信息:"+chServiceTypeDetaileds);
+        Map<String, List<ChServiceTypeVO>> collects = chServiceTypeDetaileds.stream().collect(Collectors.groupingBy(ChServiceTypeVO::getServiceTypeName));
+
+        Iterator<Map.Entry<String, List<ChServiceTypeVO>>> iterator = collects.entrySet().iterator();
+        while (iterator.hasNext()){
+            Map.Entry<String, List<ChServiceTypeVO>> next = iterator.next();
+            ChPunchDetailVO chPunchDetailVO=new ChPunchDetailVO();
+            chPunchDetailVO.setServiceTypeName(next.getKey());
+            chPunchDetailVO.setServiceTypeVOS(next.getValue());
+            chPunchDetailVOS.add(chPunchDetailVO);
+        }
+        //获取服务机构和服务类型
+        ChPunchDetailsVO chPunchDetailsVO = buildBedMapper.getsrvOrgan(taskDetailId);
+        log.info("chPunchDetailsQuery获取服务机构和服务类型:"+chPunchDetailsVO);
+        //打卡详情
+        List<ChServiceTypeDetailedVO> serviceTypeDetailed1s = buildBedMapper.getServiceTypeDetailed(taskDetailId,sevStarTime, sevEndTime);
+        log.info("chPunchDetailsQuery打卡详情:"+serviceTypeDetailed1s);
+        chPunchDetailsVO.setRecordData(chPunchDetailVOS);
+        chPunchDetailsVO.setChPunchDetailVOS(serviceTypeDetailed1s);
+        log.info("chPunchDetailsQuery:"+chPunchDetailsVO);
+        return chPunchDetailsVO;
     }
 
     /**

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

@@ -29,29 +29,135 @@
             resultType="com.hungraim.ltc.pojo.vo.disable.ChSrvTaskDetailVo">
         SELECT
         t.TASK_DETAIL_ID taskDetailId,
-        m.EMP_NAME empName,
-        m.ORGAN_ID orgamId,
-        --t.STATUS status,
-        decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status,
+        mode1.MODE_NAME modeName,----服务方式
+        organ.SRV_ORGAN_NAME srvOrganName,--护理机构名称
+        info.REAL_NAME realName,--失能人员名字
+        info.CERTI_CODE certiCode,--失能人员身份证件号码
         t.SRV_START_TIME sevStarTime,--服务开始时间
         t.SRV_END_TIME sevEndTime,--服务结束时间
-        l.SRV_ORGAN_ID, --护理机构id
-        o.SRV_ORGAN_NAME,--"护理机构名称"
-        l.DISAB_INFO_ID, --失能人员id
-        info.REAL_NAME,--"失能人员姓名"
-        info.CERTI_CODE--"失能人员身份证件号码"
+        TO_DATE( '', 'yyyy-MM-dd' ) declarationTime
         FROM
-        CH_SRV_TASK_DETAIL t
-        LEFT JOIN CH_DISAB_ACCOUNTS_DETAIL l ON t.TASK_DETAIL_ID = l.TASK_DETAIL_ID
-        LEFT JOIN CH_DISABLE_INFO info ON l.DISAB_INFO_ID=info.DISAB_INFO_ID
-        LEFT JOIN  CH_SRV_TASK k ON t.SRV_TASK_ID = k.SRV_TASK_ID
-        LEFT JOIN  CH_SRV_ORGAN_EMP m ON m.EMP_ID = k.SRV_EMP_ID
-        LEFT JOIN CH_SRV_ORGAN  o on o.SRV_ORGAN_ID = l.SRV_ORGAN_ID
-        AND l.SRV_ORGAN_ID =#{srvOrganId}   --护理机构id
-        AND l.DISAB_INFO_ID =#{disabInfoId}   --失能人员id
-        AND info.CERTI_CODE =#{certiCode}   --失能人员身份证件号码
-        AND t.SRV_START_TIME >= TO_DATE(sevStarTime, 'yyyy-mm-dd')
-        AND t.SRV_END_TIME <= TO_DATE(sevEndTime, 'yyyy-mm-dd')
-        AND m.EMP_ID = #{empId}
+        CH_SRV_TASK_DETAIL t --服务明细表
+        LEFT JOIN ch_srv_task task ON task.srv_task_id = t.srv_task_id --服务计划详情
+        LEFT JOIN CH_DISABLE_INFO info ON task.DISAB_INFO_ID = info.DISAB_INFO_ID --失能人员信息表
+        LEFT JOIN ch_srv_program program ON task.program_id = program.program_id --服务方案
+        LEFT JOIN ch_srv_organ organ ON program.srv_organ_id = organ.srv_organ_id --服务机构
+        LEFT JOIN ch_cfg_srv_mode mode1 ON program.srv_mode_id = mode1.mode_id --服务方式
+        where 1=1
+        <if test="vo.srvOrganName != null and vo.srvOrganName != ''">
+            AND organ.SRV_ORGAN_NAME LIKE '%' || #{vo.srvOrganName} || '%'
+        </if>
+        <if test="vo.modeName != null and vo.modeName != ''">
+            AND mode1.MODE_NAME = #{vo.modeName}
+        </if>
+        <if test="vo.realName != null and vo.realName != ''">
+            AND info.REAL_NAME LIKE '%' ||  #{vo.realName}  || '%'
+        </if>
+        <if test="vo.certiCode != null and vo.certiCode != ''">
+            AND info.CERTI_CODE =#{vo.certiCode}
+        </if>
+        <if test="vo.sevStarTime != null and vo.sevStarTime != ''">
+            AND t.SRV_START_TIME &gt;= TO_DATE (#{vo.sevStarTime}, 'yyyy-mm-dd')
+        </if>
+        <if test="vo.sevEndTime != null and vo.sevEndTime != ''">
+            AND t.SRV_END_TIME &lt;= TO_DATE (#{vo.sevEndTime}, 'yyyy-mm-dd')
+        </if>
+        UNION
+        SELECT
+        d.TASK_DETAIL_ID taskDetailId,
+        d.MODE_NAME modeName,----服务方式
+        o.SRV_ORGAN_NAME srvOrganName,--护理机构名称
+        info.REAL_NAME realName,--失能人员名字
+        info.CERTI_CODE certiCode,--失能人员身份证件号码
+        TO_DATE( '', 'yyyy-MM-dd' ) sevStarTime,--服务开始时间
+        TO_DATE( '', 'yyyy-MM-dd' ) sevEndTime,--服务结束时间
+        d.DECLARATION_TIME declarationTime--申报日期
+        FROM
+        CH_DISAB_ACCOUNTS_DETAIL d --账户信息表
+        LEFT JOIN CH_DISABLE_INFO info ON d.DISAB_INFO_ID = info.DISAB_INFO_ID --失能人员信息表
+        LEFT JOIN CH_SRV_ORGAN o ON d.SRV_ORGAN_ID = o.SRV_ORGAN_ID --护理机构表
+        where 1=1
+        <if test="vo.srvOrganName != null and vo.srvOrganName != ''">
+            AND o.SRV_ORGAN_NAME LIKE '%' || #{vo.srvOrganName} || '%'
+        </if>
+        <if test="vo.modeName != null and vo.modeName != ''">
+            AND d.MODE_NAME = #{vo.modeName}
+        </if>
+        <if test="vo.realName != null and vo.realName != ''">
+            AND info.REAL_NAME LIKE '%' ||  #{vo.realName}  || '%'
+        </if>
+        <if test="vo.certiCode != null and vo.certiCode != ''">
+            AND info.CERTI_CODE =#{vo.certiCode}
+        </if>
+        <if test="vo.sevStarTime != null and vo.sevStarTime != ''">
+            AND d.DECLARATION_TIME &gt;= TO_DATE (#{vo.sevStarTime}, 'yyyy-mm-dd')
+        </if>
+        <if test="vo.sevEndTime != null and vo.sevEndTime != ''">
+            AND d.DECLARATION_TIME &lt;= TO_DATE (#{vo.sevEndTime}, 'yyyy-mm-dd')
+        </if>
+    </select>
+    <select id="getsrvOrgan"  resultType="com.hungraim.ltc.pojo.entity.account.ChPunchDetailsVO">
+        SELECT
+            n.SRV_ORGAN_NAME srvOrganName,
+            e.ORGAN_TYPE_NAME organTypeName
+        FROM
+            CH_SRV_ORGAN n
+                LEFT JOIN CH_CFG_SRV_ORGAN_TYPE e ON n.ORGAN_ID = e.ORGAN_TYPE_ID
+                LEFT JOIN CH_DISAB_ACCOUNTS_DETAIL detail ON n.SRV_ORGAN_ID = detail.SRV_ORGAN_ID
+        WHERE detail.TASK_DETAIL_ID  = #{taskDetailId}
     </select>
+
+    <select id="getServiceTypeDetailed" parameterType="Long" resultType="com.hungraim.ltc.pojo.entity.account.ChServiceTypeDetailedVO">
+        SELECT
+        to_char( detail.DECLARATION_TIME, 'dd' ) executionTime,
+        service.SERVICE_TYPE_DETAILED_NAME itemName,
+        service.SERVICE_TYPE_DETAILED_ID serviceTypeDetailedId
+        FROM
+        CH_DISAB_ACCOUNTS_DETAIL detail
+        LEFT JOIN CH_SRV_TASK_FINISH_ITEM item ON detail.TASK_DETAIL_ID = item.TASK_DETAIL_ID
+        LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = item.ITEM_ID
+        left join CH_SERVICE_TYPE_DETAILED service on service.SERVICE_TYPE_DETAILED_ID = CSOP.ITEM_NAME
+        WHERE 1=1
+        <if test="taskDetailId != null and taskDetailId != ''">
+            and detail.TASK_DETAIL_ID  = #{taskDetailId}
+        </if>
+        <if test="sevStarTime != null and sevStarTime != ''">
+            AND detail.DECLARATION_TIME &gt;= TO_DATE (#{sevStarTime}, 'yyyy-mm-dd')
+        </if>
+        <if test="sevEndTime != null and sevEndTime != ''">
+            AND detail.DECLARATION_TIME &lt;= TO_DATE (#{sevEndTime}, 'yyyy-mm-dd')
+        </if>
+        UNION
+        SELECT
+        to_char( detail.SRV_START_TIME, 'dd' ) executionTime,
+        service.SERVICE_TYPE_DETAILED_NAME itemName,
+        service.SERVICE_TYPE_DETAILED_ID serviceTypeDetailedId
+        FROM
+        CH_SRV_TASK_DETAIL detail
+        LEFT JOIN CH_SRV_TASK_FINISH_ITEM item ON detail.TASK_DETAIL_ID = item.TASK_DETAIL_ID
+        LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = item.ITEM_ID
+        left join CH_SERVICE_TYPE_DETAILED service on service.SERVICE_TYPE_DETAILED_ID = CSOP.ITEM_NAME
+        WHERE 1=1
+        <if test="taskDetailId != null and taskDetailId != ''">
+            and detail.TASK_DETAIL_ID  = #{taskDetailId}
+        </if>
+        <if test="sevStarTime != null and sevStarTime != ''">
+            AND detail.SRV_START_TIME &gt;= TO_DATE (#{sevStarTime}, 'yyyy-mm-dd')
+        </if>
+        <if test="sevEndTime != null and sevEndTime != ''">
+            AND detail.SRV_END_TIME &lt;= TO_DATE (#{sevEndTime}, 'yyyy-mm-dd')
+        </if>
+    </select>
+
+    <select id="selectServiceTypeDetailed"  resultType="com.hungraim.ltc.pojo.entity.account.ChServiceTypeVO">
+        SELECT
+            d.SERVICE_TYPE_DETAILED_ID,
+            d.SERVICE_TYPE_DETAILED_NAME,
+            d.PARA_ID,
+            e.SERVICE_TYPE_NAME
+        FROM
+            CH_SERVICE_TYPE_DETAILED d
+                LEFT JOIN CH_SERVICE_TYPE e ON d.PARA_ID = e.SERVICE_TYPE_ID
+    </select>
+
 </mapper>
\ No newline at end of file