Merge remote-tracking branch 'origin/master'

apply/apply-service/src/main/java/com/hungraim/ism/ApplyApplication.java → apply/apply-service/src/main/java/com/hungraim/ltc/ApplyApplication.java

-package com.hungraim.ism;
+package com.hungraim.ltc;
 
 
-import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
-import com.baomidou.mybatisplus.extension.incrementer.OracleKeyGenerator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.context.annotation.Bean;
 
 /**
  * 申请服务
@@ -20,13 +17,5 @@ public class ApplyApplication {
         SpringApplication.run(ApplyApplication.class, args);
     }
 
-    /**
-     * 注册oracle生成器
-     * @return 返回mybatis-plus默认的oracle生成器
-     */
-    @Bean
-    public IKeyGenerator getKeyGenerator() {
-        return new OracleKeyGenerator();
-    }
 
 }

apply/apply-service/src/main/java/com/hungraim/ism/controller/DisableController.java → apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

-package com.hungraim.ism.controller;
+package com.hungraim.ltc.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
-import com.hungraim.ism.service.DisableService;
+import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.service.DisableService;
 import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
@@ -110,13 +110,13 @@ public class DisableController {
      * @return 失能人员信息列表
      */
     @RequestMapping("/disableList")
-    public Result<List<DisableVO>> disableList(String organId, String districtProvincial,
+    public Result<IPage<DisableVO>> disableList(String organId, String districtProvincial,
                                                String districtCity, String districtArea,
                                                String realName, String certiCode, String dataFrom,
                                                String srvOrganName, int pageNum, int pageSize) {
         IPage<DisableVO> iPage = disableService.disableList(organId, districtProvincial,
                 districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, pageNum, pageSize);
-        return Result.success(iPage.getRecords());
+        return Result.success(iPage);
     }
 
     /**

apply/apply-service/src/main/java/com/hungraim/ism/dao/AprTaskMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/AprTaskMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;

apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyHisMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/DisableApplyHisMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;

apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/DisableApplyMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
-import com.hungraim.ism.pojo.vo.disable.ExamineRecord;
+import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.vo.disable.ExamineRecord;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableInfoMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/DisableInfoMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;

apply/apply-service/src/main/java/com/hungraim/ism/dao/FndDiseaseTypeMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/FndDiseaseTypeMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChFndDiseaseType;

apply/apply-service/src/main/java/com/hungraim/ism/dao/FndDistrictMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/FndDistrictMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChFndDistrict;

apply/apply-service/src/main/java/com/hungraim/ism/dao/FndOrganMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/FndOrganMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChFndOrgan;

apply/apply-service/src/main/java/com/hungraim/ism/dao/FndSrvModeMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/FndSrvModeMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChFndSrvMode;

apply/apply-service/src/main/java/com/hungraim/ism/dao/FndStreetMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/FndStreetMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChFndStreet;

apply/apply-service/src/main/java/com/hungraim/ism/dao/SrvOrganMapper.java → apply/apply-service/src/main/java/com/hungraim/ltc/dao/SrvOrganMapper.java

-package com.hungraim.ism.dao;
+package com.hungraim.ltc.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;

apply/apply-service/src/main/java/com/hungraim/ism/service/DisableService.java → apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

-package com.hungraim.ism.service;
+package com.hungraim.ltc.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.disable.*;
-import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

-package com.hungraim.ism.service.impl;
+package com.hungraim.ltc.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ism.dao.*;
-import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
-import com.hungraim.ism.pojo.vo.disable.ExamineRecord;
-import com.hungraim.ism.service.DisableService;
-import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
+import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.vo.disable.ExamineRecord;
+import com.hungraim.ltc.dao.*;
 import com.hungraim.ltc.pojo.entity.disable.*;
+import com.hungraim.ltc.pojo.entity.eval.ChAprTask;
+import com.hungraim.ltc.service.DisableService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.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.ism.dao.DisableApplyMapper">
+<mapper namespace="com.hungraim.ltc.dao.DisableApplyMapper">
 
-    <select id="disableList" resultType="com.hungraim.ism.pojo.vo.disable.DisableVO">
+    <select id="disableList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableVO">
         select a.APPLY_ID applyId,
         o.ORGAN_NAME organName,
         a.organ_id organId,
@@ -19,7 +19,7 @@
         a.tel tel,
         a.fixed_tel fixedTel,
         m.SRV_MODE_NAME srvModeName,
-        a.disease disease,
+        (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE c WHERE a.DISE_TYPE_S = c.DISE_TYPE_ID) diseTypeS,
         a.eff_time effTime,
         a.data_from dataFrom,
         a.APPLY_STATUS applyStatus
@@ -58,7 +58,7 @@
         </where>
     </select>
 
-    <select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO">
+    <select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO">
         select a.APPLY_ID                                                                   applyId,
                a.organ_id                                                                   organId,
                a.DISTRICT_PROVINCIAL                                                        districtProvincial,
@@ -119,7 +119,7 @@
         order by APPLY_ID desc
     </select>
 
-    <select id="listExamineRecordByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.ExamineRecord">
+    <select id="listExamineRecordByApplyId" resultType="com.hungraim.ltc.pojo.vo.disable.ExamineRecord">
         select CHECK_TIME     checkTime,
                TREATMENT_TYPE teratmentType,
                APPLY_STATUS   status,

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableEvaluateInfoVO.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableEvaluateInfoVO.java

-package com.hungraim.ism.pojo.vo.disable;
+package com.hungraim.ltc.pojo.vo.disable;
 
 import lombok.Data;
 

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableEvaluateVO.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableEvaluateVO.java

-package com.hungraim.ism.pojo.vo.disable;
+package com.hungraim.ltc.pojo.vo.disable;
 
 import com.hungraim.ltc.pojo.entity.PageInfo;
 

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableExamineInfoVO.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExamineInfoVO.java

-package com.hungraim.ism.pojo.vo.disable;
+package com.hungraim.ltc.pojo.vo.disable;
 
 import lombok.Data;
 

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableVO.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableVO.java

-package com.hungraim.ism.pojo.vo.disable;
+package com.hungraim.ltc.pojo.vo.disable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -18,7 +18,7 @@ public class DisableVO implements Serializable {
     //适用机构
     private String organName;
     //机构代码
-    private String organiId;
+    private String organId;
     //所在省市
     private String provincial;
     private String city;
@@ -43,12 +43,13 @@ public class DisableVO implements Serializable {
     //失能人员固话
     private String fixedtel;
     //申请服务方式
-    private String srvmodeName;
+    private String srvModeName;
     //诊断疾病
     private String disease;
+    private String diseTypeS;
     //申请时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date efftime;
+    private Date effTime;
     //申请来源 网厅：0，核心：1，手机端:2,待遇申请:3
     private String datafrom;
     //审核状态

common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/ExamineRecord.java → common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ExamineRecord.java

-package com.hungraim.ism.pojo.vo.disable;
+package com.hungraim.ltc.pojo.vo.disable;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

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

-package com.hungraim.ism.pojo.vo.governance;
+package com.hungraim.ltc.pojo.vo.governance;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

common/common-mybatis/src/main/java/com/hungraim/ltc/config/DataSourceConfig.java

 package com.hungraim.ltc.config;
 
 
+import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
+import com.baomidou.mybatisplus.extension.incrementer.OracleKeyGenerator;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -20,12 +22,22 @@ public class DataSourceConfig {
 
 
     @Bean
-  @ConfigurationProperties(prefix="spring.datasource")
-  public DataSource dataSource(){
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DataSource dataSource() {
         return new DriverManagerDataSource();
     }
 
     /**
+     * 注册oracle生成器
+     *
+     * @return 返回mybatis-plus默认的oracle生成器
+     */
+    @Bean
+    public IKeyGenerator getKeyGenerator() {
+        return new OracleKeyGenerator();
+    }
+
+    /**
      * 分页插件
      */
     @Bean

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

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableEvaluateVO;
 import com.hungraim.ltc.governance.service.*;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
@@ -12,7 +12,6 @@ import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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.ism.pojo.vo.governance.SvrProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
 import com.hungraim.ltc.governance.service.SrvProgramService;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
@@ -49,6 +49,8 @@ public class SrvProgramController {
         }
         Page<SvrProgramListVo> page = new Page<>(pageNum, pageSize);
         page = srvProgramService.getProgramList(page, srvOrganId, realName, realTel, programStatus);
+        long total = page.getTotal();
+        log.info("total:{}", total);
         return Result.success(page);
     }
 }

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

 package com.hungraim.ltc.governance.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
-import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

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

@@ -3,7 +3,7 @@ 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.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchRsp;

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

@@ -3,7 +3,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.ism.pojo.vo.governance.SvrProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvSend;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

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

@@ -2,9 +2,9 @@ package com.hungraim.ltc.governance.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
-import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;

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

@@ -3,12 +3,7 @@ package com.hungraim.ltc.governance.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
-import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
 
 public interface ApplyService extends IService<ChDisableApply> {
 

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

 package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
-import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableEvaluateVO;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
 import org.springframework.stereotype.Service;
 

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

 package com.hungraim.ltc.governance.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
-import com.hungraim.ltc.governance.dao.BuildBedMapper;
-import com.hungraim.ltc.pojo.entity.disable.ChDepositAcct;
-import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author jiaguokai

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.ism.pojo.vo.governance.SvrProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
 
 public interface SrvProgramService {
 

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

 package com.hungraim.ltc.governance.service.impl;
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
-import com.hungraim.ism.pojo.vo.disable.DisableVO;
 import com.hungraim.ltc.governance.dao.BuildBedMapper;
 import com.hungraim.ltc.governance.service.IBuildBedService;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author jiaguokai

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

@@ -2,8 +2,8 @@ package com.hungraim.ltc.governance.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
-import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableEvaluateInfoVO;
+import com.hungraim.ltc.pojo.vo.disable.DisableEvaluateVO;
 import com.hungraim.ltc.governance.dao.DisableEvaluateMapper;
 import com.hungraim.ltc.governance.service.DisableEvaluateService;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;

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

 package com.hungraim.ltc.governance.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ism.pojo.vo.governance.SvrProgramListVo;
+import com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo;
 import com.hungraim.ltc.governance.dao.ChSrvSendMapper;
 import com.hungraim.ltc.governance.service.SrvProgramService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,7 +2,7 @@
 <!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.DisableEvaluateMapper">
 
-    <select id="disableEvaluateList" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO">
+    <select id="disableEvaluateList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableEvaluateVO">
         select e.evaluate_id evaluateId,
         o.ORGAN_NAME organName,
         e.organ_id organId,
@@ -32,7 +32,7 @@
         </if>
     </select>
 
-    <select id="selectDisableEvaluateInfoByEvaluateId" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO">
+    <select id="selectDisableEvaluateInfoByEvaluateId" resultType="com.hungraim.ltc.pojo.vo.disable.DisableEvaluateInfoVO">
         select a.organ_id                                                                 organId,
                (select o1.organ_name from CH_FND_ORGAN o1 where a.organ_id = o1.organ_id) organName,
                a.DISTRICT_PROVINCIAL                                                      provincial,

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.ism.pojo.vo.governance.SvrProgramListVo">
+    <select id="selectProgramList" resultType="com.hungraim.ltc.pojo.vo.governance.SvrProgramListVo">
         SELECT T1.SRV_SEND_ID srvSendId,
         T2.DISTRICT_PROVINCIAL districtProvincial,
         T2.DISTRICT_CITY districtCity,
@@ -46,7 +46,7 @@
         T3.ACPT_ADDRESS acptAddress,
         T1.STATUS sendStatus,
         T1.EFF_TIME effTime,
-        (SELECT COUNT(0) FROM CH_SRV_PROGRAM T4 WHERE T1.SRV_ORGAN_ID = T4.SRV_ORGAN_ID) programNum
+        (SELECT COUNT(0) FROM CH_SRV_PROGRAM T4 WHERE T1.SRV_ORGAN_ID = T4.SRV_ORGAN_ID AND T1.DISAB_INFO_ID = T4.DISAB_INFO_ID) programNum
         FROM CH_SRV_SEND T1
         INNER JOIN CH_SRV_ORGAN T2 ON T1.SRV_ORGAN_ID = T2.SRV_ORGAN_ID
         INNER JOIN CH_DISABLE_INFO T3 ON T1.DISAB_INFO_ID = T3.DISAB_INFO_ID