diff --git a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java
index a434031..4210d62 100644
--- a/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java
+++ b/bl-sysem/src/main/java/com/docus/server/bl/infrastructure/mapper/BlDeptMapper.java
@@ -13,10 +13,17 @@ import java.util.Map;
 @DS(DSKeyConstants.DS_KEY)
 public interface BlDeptMapper {
 
-    List<Map<String, Object>> list(@Param("startDate") Date startDate,
+    List<Map<String, Object>> page(@Param("startDate") Date startDate,
                                    @Param("endDate") Date endDate,
                                    @Param("offset") int offset,
                                    @Param("pageSize") int pageSize);
 
 
+    List<Map<String, Object>> BatchForJZH(@Param("jzhs") List<String> jzhs);
+
+    List<Map<String, Object>> BatchForJZHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForZYHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForEXAMTIME(@Param("datas") List<Map<String, Object>> datas);
 }
diff --git a/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java b/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java
index f559885..d42efd2 100644
--- a/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java
+++ b/bl-sysem/src/main/java/com/docus/server/bl/service/IBlService.java
@@ -1,16 +1,6 @@
 package com.docus.server.bl.service;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.client.api.IHospitalApi;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-public interface IBlService {
-    List<Map<String, Object>> list(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize);
+public interface IBlService extends IHospitalApi {
 }
diff --git a/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java b/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java
index 4effb5e..2dd6ad8 100644
--- a/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java
+++ b/bl-sysem/src/main/java/com/docus/server/bl/service/impl/BlServiceImpl.java
@@ -1,11 +1,8 @@
 package com.docus.server.bl.service.impl;
 
+import com.docus.server.bl.common.DSKeyConstants;
 import com.docus.server.bl.infrastructure.mapper.BlDeptMapper;
-import com.docus.server.bl.infrastructure.mapper.BlTBasicMapper;
-import com.docus.server.bl.infrastructure.mapper.BlUserMapper;
 import com.docus.server.bl.service.IBlService;
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
@@ -13,27 +10,35 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-@Component
+@Component(DSKeyConstants.DS_KEY + "ServiceImpl")
 @AllArgsConstructor
 public class BlServiceImpl implements IBlService {
 
     private final BlDeptMapper blDeptMapper;
-    private final BlUserMapper blUserMapper;
-    private final BlTBasicMapper blTBasicMapper;
 
     @Override
-    public List<Map<String, Object>> list(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return blDeptMapper.list(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> page(Date startDate, Date endDate, int pageNum, int pageSize) {
+        return blDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
     }
 
     @Override
-    public List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return blUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForJZH(List<String> jzhs) {
+        return blDeptMapper.BatchForJZH(jzhs);
     }
 
     @Override
-    public List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return blTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForJZHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return blDeptMapper.BatchForJZHAndAdmissTimes(datas);
+    }
+
+    @Override
+    public List<Map<String, Object>> BatchForZYHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return blDeptMapper.BatchForZYHAndAdmissTimes(datas);
+    }
+
+    @Override
+    public List<Map<String, Object>> BatchForEXAMTIME(List<Map<String, Object>> datas) {
+        return blDeptMapper.BatchForEXAMTIME(datas);
     }
 
 }
diff --git a/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml b/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml
index c0fe31c..00618aa 100644
--- a/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml
+++ b/bl-sysem/src/main/resources/mapper/BlDeptMapper.xml
@@ -4,13 +4,144 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.bl.infrastructure.mapper.BlDeptMapper">
 
-    <select id="list" resultType="map">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
-        WHERE  update_time between #{startDate}  and  #{endDate}
-        order by update_time asc
+    <!--根据更新时间分页查询-->
+    <select id="page" resultType="java.util.Map">
+        SELECT DISTINCT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND AFFIRM_TIME <![CDATA[ > ]]> #{startDate}
+        AND AFFIRM_TIME <![CDATA[ <= ]]> #{endDate}
+        ORDER BY
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC
         LIMIT #{offset}, #{pageSize}
     </select>
 
+    <!--根据jzh取得所需采集的批量数据-->
+    <select id="BatchForJZH" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND JZH IN
+        <foreach item="item" index="index" collection="jzhs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+    <!--记账号+住院次数-->
+    <select id="BatchForJZHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (JZH =#{item.FVISIT_ID} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForZYHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForEXAMTIME" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and EXAM_TIME <![CDATA[ >= ]]>  STR_TO_DATE(#{item.admiss_date})
+            <if test="item.dis_date != null">
+                and EXAM_TIME <![CDATA[ <= ]]> STR_TO_DATE(#{item.dis_date})
+            </if>
+        </foreach>
+        )
+    </select>
+
 
     <!--  mysql
     <select id="list" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java
index f350db9..04e6f4a 100644
--- a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java
+++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java
@@ -2,8 +2,8 @@ package com.docus.server.collect.dept.ws;
 
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
-import com.docus.server.collect.web.utils.IdUtil;
 import com.docus.server.collect.IWsResult;
+import com.docus.server.common.util.IdUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java
index e90e771..8f9a3fe 100644
--- a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java
@@ -5,9 +5,9 @@ import com.docus.core.util.Func;
 import com.docus.core.util.XmlUtil;
 import com.docus.infrastructure.core.exception.BaseException;
 import com.docus.server.archivefile.pojo.dto.ReportDTO;
-import com.docus.server.collect.web.utils.ParamsUtils;
-import com.docus.server.collect.web.utils.TableJsonRead;
 import com.docus.server.collect.IConverter;
+import com.docus.server.collect.web.utils.TableJsonRead;
+import com.docus.server.common.util.ParamsUtils;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Node;
 
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/HospitalServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/BaseViewJobResultImpl.java
similarity index 94%
rename from collect-sdry/src/main/java/com/docus/server/collect/report/view/HospitalServiceImpl.java
rename to collect-sdry/src/main/java/com/docus/server/collect/report/view/BaseViewJobResultImpl.java
index ebbf7ad..5311852 100644
--- a/collect-sdry/src/main/java/com/docus/server/collect/report/view/HospitalServiceImpl.java
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/BaseViewJobResultImpl.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog;
 import com.docus.server.archivefile.service.IAfViewCollectionLogService;
+import com.docus.server.client.api.IHospitalApi;
+import com.docus.server.collect.IJobResult;
 import com.docus.server.collect.web.common.BasicProperties;
 import com.docus.server.collect.web.common.DocusProperties;
 import com.docus.server.collect.web.common.dto.BasicQueryDto;
@@ -19,15 +21,14 @@ import com.docus.server.collect.web.enums.RedisKeyEnum;
 import com.docus.server.collect.web.utils.MqQueueUtils;
 import com.docus.server.collect.web.utils.RedisMq;
 import com.docus.server.collect.web.utils.SpringRestTemplateUtils;
-import com.docus.server.common.IHospital;
 import com.docus.server.common.message.MqMessage;
+import com.docus.server.common.util.SpringUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.core.env.Environment;
 import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -42,10 +43,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-@Component
 @Slf4j
-public class HospitalServiceImpl implements IHospitalService {
-    private IHospital hospital;
+public abstract class BaseViewJobResultImpl implements IJobResult<List<Map<String, Object>>> {
+    private IHospitalApi hospitalApi;
     @Resource
     private IdService idService;
     @Resource
@@ -67,12 +67,12 @@ public class HospitalServiceImpl implements IHospitalService {
     private String syscodekey = "SYS_CODE";
 
     @Override
-    public void handle(List<Map<String, Object>> t, String dsKey, IHospital hospital) {
-        this.hospital = hospital;
-        handle(t, dsKey);
+    public void handle(List<Map<String, Object>> results, String dsKey) {
+        this.hospitalApi = (IHospitalApi) SpringUtils.getBean(String.format("%s%s", dsKey, "ServiceImpl"));
+        process(results, dsKey);
     }
 
-    public void handle(List<Map<String, Object>> datas, String key) {
+    public void process(List<Map<String, Object>> datas, String key) {
         String mqKey = String.format("topic_task_%s_queue", key);
         MqMessage mqMessage = new MqMessage();
         //将key转为大写以免出错
@@ -186,13 +186,13 @@ public class HospitalServiceImpl implements IHospitalService {
     }
 
     private List<Map<String, Object>> GetColectionForJZHAndAdmissTimes(BasicQueryDto dto, String oldJzhkey, String syscode, List<String> jzhs, List<Map<String, Object>> datas) {
-        List<Map<String, Object>> batchcollects = hospital.BatchForJZHAndAdmissTimes(datas);
+        List<Map<String, Object>> batchcollects = hospitalApi.BatchForJZHAndAdmissTimes(datas);
         toReplaceBlank(batchcollects);
         return GetColectionForJZH(syscode, jzhs, batchcollects);
     }
 
     private List<Map<String, Object>> GetColectionForZYHAndAdmissTimes(BasicQueryDto dto, String oldJzhkey, String syscode, List<String> jzhs, List<Map<String, Object>> datas) {
-        List<Map<String, Object>> batchcollects = hospital.BatchForZYHAndAdmissTimes(datas);
+        List<Map<String, Object>> batchcollects = hospitalApi.BatchForZYHAndAdmissTimes(datas);
         toReplaceBlank(batchcollects);
         return GetColectionForJZH(syscode, jzhs, batchcollects);
     }
@@ -413,7 +413,7 @@ public class HospitalServiceImpl implements IHospitalService {
         }
 
         //取得该患者全部住院文件
-        List<Map<String, Object>> batchcollects = hospital.BatchForEXAMTIME(list);
+        List<Map<String, Object>> batchcollects = hospitalApi.BatchForEXAMTIME(list);
         toReplaceBlank(batchcollects);
         //添加记帐号
         for (Map<String, Object> k : batchcollects) {
@@ -436,7 +436,7 @@ public class HospitalServiceImpl implements IHospitalService {
 
     private List<Map<String, Object>> GetColectionForJZH(BasicQueryDto dto, String oldJzhkey, String syscode, List<String> jzhs) {
         jzhs = jzhs.stream().distinct().collect(Collectors.toList());
-        List<Map<String, Object>> batchcollects = hospital.BatchForJZH(jzhs);
+        List<Map<String, Object>> batchcollects = hospitalApi.BatchForJZH(jzhs);
         log.debug("size:{}", batchcollects.size());
         toReplaceBlank(batchcollects);
         return GetColectionForJZH(syscode, jzhs, batchcollects);
@@ -473,4 +473,14 @@ public class HospitalServiceImpl implements IHospitalService {
     private String getPort() {
         return environment.getProperty("local.server.port");
     }
+
+    @Override
+    public List<Map<String, Object>> ok(Map<String, Object> params) {
+        return null;
+    }
+
+    @Override
+    public List<Map<String, Object>> fail(Map<String, Object> params) {
+        return null;
+    }
 }
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/BlViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/BlViewJobResultImpl.java
new file mode 100644
index 0000000..d141fff
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/BlViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 病理数据
+ */
+@Component("blViewJobResultImpl")
+public class BlViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/EcgViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/EcgViewJobResultImpl.java
new file mode 100644
index 0000000..54a3604
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/EcgViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 电生理系统数据
+ */
+@Component("ecgViewJobResultImpl")
+public class EcgViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/EmrViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/EmrViewJobResultImpl.java
new file mode 100644
index 0000000..1ffaefb
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/EmrViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 电子病历系统数据
+ */
+@Component("emrViewJobResultImpl")
+public class EmrViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/HlViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/HlViewJobResultImpl.java
new file mode 100644
index 0000000..1820748
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/HlViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 护理文书系统数据
+ */
+@Component("hlViewJobResultImpl")
+public class HlViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/IssubmitViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/IssubmitViewJobResultImpl.java
new file mode 100644
index 0000000..aefc1de
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/IssubmitViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 手麻系统数据
+ */
+@Component("issubmitViewJobResultImpl")
+public class IssubmitViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/LisViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/LisViewJobResultImpl.java
new file mode 100644
index 0000000..69e580d
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/LisViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * lis系统数据
+ */
+@Component("lisViewJobResultImpl")
+public class LisViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/PacsViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/PacsViewJobResultImpl.java
new file mode 100644
index 0000000..0ea28ce
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/PacsViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * Pacs系统数据视图
+ */
+@Component("pacsViewJobResultImpl")
+public class PacsViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/VteViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/VteViewJobResultImpl.java
new file mode 100644
index 0000000..5e7bdfa
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/VteViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * vte静脉血栓栓塞症
+ */
+@Component("vteViewJobResultImpl")
+public class VteViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/view/ZzViewJobResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/view/ZzViewJobResultImpl.java
new file mode 100644
index 0000000..6d2f7c3
--- /dev/null
+++ b/collect-sdry/src/main/java/com/docus/server/collect/report/view/ZzViewJobResultImpl.java
@@ -0,0 +1,11 @@
+package com.docus.server.collect.report.view;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 重症系统数据
+ */
+@Component("zzViewJobResultImpl")
+public class ZzViewJobResultImpl extends BaseViewJobResultImpl {
+
+}
diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java
index 0011b33..87de83a 100644
--- a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java
+++ b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java
@@ -2,8 +2,8 @@ package com.docus.server.collect.user.ws;
 
 import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
-import com.docus.server.collect.web.utils.IdUtil;
 import com.docus.server.collect.IWsResult;
+import com.docus.server.common.util.IdUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -19,74 +19,74 @@ public class WsUserResultImpl implements IWsResult {
     public String ok(Map<String, Object> params) {
         String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
         return "<MCCI_IN000002UV01 ITSVersion=\"XML_1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:hl7-org:v3\" xsi:schemaLocation=\"urn:hl7-org:v3\n" +
-                "file:///E:/hl7/HL7/v3ballot_fullsite_2011MAY/v3ballot/html/processable/multicacheschemas/MCCI\n" +
-                "_IN000002UV01.xsd\">\n" +
-                "\t<id extension=\"" + IdUtil.standardUUID() + "\"/>\n" +
-                "\t<creationTime value=\"" + createTime + "\"/>\n" +
-                "\t<interactionId root=\"2.16.840.1.113883.1.6\" extension=\"MCCI_IN000002UV01\"/>\n" +
-                "\t<processingCode code=\"P\"/>\n" +
-                "\t<processingModeCode/>\n" +
-                "\t<acceptAckCode code=\"AL\"/>\n" +
-                "\t<receiver typeCode=\"RCV\">\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item extension=\"MDM\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</receiver>\n" +
-                "\t<sender typeCode=\"SND\">\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item extension=\"" + params.get("receiver") + "\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</sender>\n" +
-                "\t<acknowledgement typeCode=\"AA\">\n" +
-                "\t\t<targetMessage>\n" +
-                "\t\t\t<id extension=\"" + params.get("messageId") + "\"/>\n" +
-                "\t\t</targetMessage>\n" +
-                "\t\t<acknowledgementDetail>\n" +
-                "\t\t\t<text value=\"" + params.get("msg") + "\"/>\n" +
-                "\t\t</acknowledgementDetail>\n" +
-                "\t</acknowledgement>\n" +
-                "</MCCI_IN000002UV01>";
+            "file:///E:/hl7/HL7/v3ballot_fullsite_2011MAY/v3ballot/html/processable/multicacheschemas/MCCI\n" +
+            "_IN000002UV01.xsd\">\n" +
+            "\t<id extension=\"" + IdUtil.standardUUID() + "\"/>\n" +
+            "\t<creationTime value=\"" + createTime + "\"/>\n" +
+            "\t<interactionId root=\"2.16.840.1.113883.1.6\" extension=\"MCCI_IN000002UV01\"/>\n" +
+            "\t<processingCode code=\"P\"/>\n" +
+            "\t<processingModeCode/>\n" +
+            "\t<acceptAckCode code=\"AL\"/>\n" +
+            "\t<receiver typeCode=\"RCV\">\n" +
+            "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
+            "\t\t\t<id>\n" +
+            "\t\t\t\t<item extension=\"MDM\"/>\n" +
+            "\t\t\t</id>\n" +
+            "\t\t</device>\n" +
+            "\t</receiver>\n" +
+            "\t<sender typeCode=\"SND\">\n" +
+            "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
+            "\t\t\t<id>\n" +
+            "\t\t\t\t<item extension=\"" + params.get("receiver") + "\"/>\n" +
+            "\t\t\t</id>\n" +
+            "\t\t</device>\n" +
+            "\t</sender>\n" +
+            "\t<acknowledgement typeCode=\"AA\">\n" +
+            "\t\t<targetMessage>\n" +
+            "\t\t\t<id extension=\"" + params.get("messageId") + "\"/>\n" +
+            "\t\t</targetMessage>\n" +
+            "\t\t<acknowledgementDetail>\n" +
+            "\t\t\t<text value=\"" + params.get("msg") + "\"/>\n" +
+            "\t\t</acknowledgementDetail>\n" +
+            "\t</acknowledgement>\n" +
+            "</MCCI_IN000002UV01>";
     }
 
     @Override
     public String fail(Map<String, Object> params) {
         String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI);
         return "<RCMR_IN000030UV01 ITSVersion=\"XML_1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:hl7-org:v3\" xsi:schemaLocation=\"urn:hl7-org:v3\n" +
-                "file:///E:/hl7/HL7/v3ballot_fullsite_2011MAY/v3ballot/html/processable/multicacheschemas/RCMR\n" +
-                "_IN000030UV01.xsd\">\n" +
-                "\n" +
-                "\t<id extension=\"" + IdUtil.standardUUID() + "\"/>\n" +
-                "\t<creationTime value=\"" + createTime + "\"/>\n" +
-                "\t<interactionId root=\"2.16.840.1.113883.1.6\" extension=\"RCMR_IN000030UV01\"/>\n" +
-                "\t<processingCode code=\"P\"/>\n" +
-                "\t<processingModeCode/>\n" +
-                "\t<acceptAckCode code=\"AL\"/>\n" +
-                "\t<receiver typeCode=\"RCV\">\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item extension=\"MDM\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</receiver>\n" +
-                "\t<sender typeCode=\"SND\">\n" +
-                "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
-                "\t\t\t<id>\n" +
-                "\t\t\t\t<item extension=\"" + params.get("receiver") + "\"/>\n" +
-                "\t\t\t</id>\n" +
-                "\t\t</device>\n" +
-                "\t</sender>\n" +
-                "\t<acknowledgement typeCode=\"AE\">\n" +
-                "\t\t<targetMessage>\n" +
-                "\t\t\t<id extension=\"" + params.get("messageId") + "\"/>\n" +
-                "\t\t</targetMessage>\n" +
-                "\t\t<acknowledgementDetail>\n" +
-                "\t\t\t<text value=\"" + params.get("msg") + "\"/>\n" +
-                "\t\t</acknowledgementDetail>\n" +
-                "\t</acknowledgement>\n" +
-                "</RCMR_IN000030UV01>\n";
+            "file:///E:/hl7/HL7/v3ballot_fullsite_2011MAY/v3ballot/html/processable/multicacheschemas/RCMR\n" +
+            "_IN000030UV01.xsd\">\n" +
+            "\n" +
+            "\t<id extension=\"" + IdUtil.standardUUID() + "\"/>\n" +
+            "\t<creationTime value=\"" + createTime + "\"/>\n" +
+            "\t<interactionId root=\"2.16.840.1.113883.1.6\" extension=\"RCMR_IN000030UV01\"/>\n" +
+            "\t<processingCode code=\"P\"/>\n" +
+            "\t<processingModeCode/>\n" +
+            "\t<acceptAckCode code=\"AL\"/>\n" +
+            "\t<receiver typeCode=\"RCV\">\n" +
+            "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
+            "\t\t\t<id>\n" +
+            "\t\t\t\t<item extension=\"MDM\"/>\n" +
+            "\t\t\t</id>\n" +
+            "\t\t</device>\n" +
+            "\t</receiver>\n" +
+            "\t<sender typeCode=\"SND\">\n" +
+            "\t\t<device classCode=\"DEV\" determinerCode=\"INSTANCE\">\n" +
+            "\t\t\t<id>\n" +
+            "\t\t\t\t<item extension=\"" + params.get("receiver") + "\"/>\n" +
+            "\t\t\t</id>\n" +
+            "\t\t</device>\n" +
+            "\t</sender>\n" +
+            "\t<acknowledgement typeCode=\"AE\">\n" +
+            "\t\t<targetMessage>\n" +
+            "\t\t\t<id extension=\"" + params.get("messageId") + "\"/>\n" +
+            "\t\t</targetMessage>\n" +
+            "\t\t<acknowledgementDetail>\n" +
+            "\t\t\t<text value=\"" + params.get("msg") + "\"/>\n" +
+            "\t\t</acknowledgementDetail>\n" +
+            "\t</acknowledgement>\n" +
+            "</RCMR_IN000030UV01>\n";
     }
 }
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/BasicProperties.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/BasicProperties.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/BasicProperties.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/BasicProperties.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/DocusProperties.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/DocusProperties.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/DocusProperties.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/DocusProperties.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/NoViewChNewbornProperties.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/NoViewChNewbornProperties.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/NoViewChNewbornProperties.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/NoViewChNewbornProperties.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/NoViewProperties.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/NoViewProperties.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/NoViewProperties.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/NoViewProperties.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/BasicQueryDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/BasicQueryDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/BasicQueryDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/BasicQueryDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/CollectionForJZHDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionForJZHDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/CollectionForJZHDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionForJZHDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequire.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequire.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequire.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequire.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequireTimeDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequireTimeDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequireTimeDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionRequireTimeDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/DaTypeDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DaTypeDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/DaTypeDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DaTypeDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/DableJsonDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DableJsonDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/DableJsonDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DableJsonDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/DataFormatDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DataFormatDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/DataFormatDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DataFormatDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/DataSourceDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DataSourceDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/DataSourceDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DataSourceDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/DataSourcesDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DataSourcesDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/DataSourcesDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DataSourcesDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/DataTransferJsonDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DataTransferJsonDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/DataTransferJsonDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/DataTransferJsonDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/FieldJsonDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/FieldJsonDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/FieldJsonDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/FieldJsonDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/HoliDay.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/HoliDay.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/HoliDay.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/HoliDay.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/MutliDataTransferJsonDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/MutliDataTransferJsonDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/MutliDataTransferJsonDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/MutliDataTransferJsonDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewCollectionDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/NoViewConfig.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewConfig.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/NoViewConfig.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewConfig.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/NoViewMakeUpDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewMakeUpDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/NoViewMakeUpDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/NoViewMakeUpDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/TaskCollect.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/TaskCollect.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/TaskCollect.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/TaskCollect.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/ViewReportTwoDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/ViewReportTwoDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/ViewReportTwoDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/ViewReportTwoDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/two/ReportDownTwoDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/two/ReportDownTwoDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/two/ReportDownTwoDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/two/ReportDownTwoDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/two/ReportHospitalTwoDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/two/ReportHospitalTwoDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/two/ReportHospitalTwoDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/two/ReportHospitalTwoDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/two/ReportPatientTwoDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/two/ReportPatientTwoDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/two/ReportPatientTwoDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/two/ReportPatientTwoDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/dto/two/ReportTaskTwoDto.java b/collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/two/ReportTaskTwoDto.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/common/dto/two/ReportTaskTwoDto.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/two/ReportTaskTwoDto.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/enums/ColectNameEnum.java b/collect-sdry/src/main/java/com/docus/server/collect/web/enums/ColectNameEnum.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/enums/ColectNameEnum.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/enums/ColectNameEnum.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/enums/DisposeModeEnum.java b/collect-sdry/src/main/java/com/docus/server/collect/web/enums/DisposeModeEnum.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/enums/DisposeModeEnum.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/enums/DisposeModeEnum.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/HospitalEnum.java b/collect-sdry/src/main/java/com/docus/server/collect/web/enums/HospitalEnum.java
similarity index 91%
rename from common-collect/src/main/java/com/docus/server/collect/web/service/HospitalEnum.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/enums/HospitalEnum.java
index 9330c21..256cdda 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/service/HospitalEnum.java
+++ b/collect-sdry/src/main/java/com/docus/server/collect/web/enums/HospitalEnum.java
@@ -1,4 +1,4 @@
-package com.docus.server.collect.web.service;
+package com.docus.server.collect.web.enums;
 
 /**
  * 医院标识
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/enums/RedisKeyEnum.java b/collect-sdry/src/main/java/com/docus/server/collect/web/enums/RedisKeyEnum.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/enums/RedisKeyEnum.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/enums/RedisKeyEnum.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/DateUtils.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/DateUtils.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/DateUtils.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/DateUtils.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/DynamicAnnotation.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/DynamicAnnotation.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/DynamicAnnotation.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/DynamicAnnotation.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/HoliDayUtil.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/HoliDayUtil.java
similarity index 94%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/HoliDayUtil.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/HoliDayUtil.java
index d821500..b8edda0 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/utils/HoliDayUtil.java
+++ b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/HoliDayUtil.java
@@ -4,7 +4,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.docus.server.collect.web.common.dto.HoliDay;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
 
 public class HoliDayUtil {
 
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/MqQueueUtils.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/MqQueueUtils.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/MqQueueUtils.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/MqQueueUtils.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/RedisMq.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/RedisMq.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/RedisMq.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/RedisMq.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/SpringRestTemplateUtils.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/SpringRestTemplateUtils.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/SpringRestTemplateUtils.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/SpringRestTemplateUtils.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/UrlEncode.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/UrlEncode.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/UrlEncode.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/UrlEncode.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/XaUtils.java b/collect-sdry/src/main/java/com/docus/server/collect/web/utils/XaUtils.java
similarity index 100%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/XaUtils.java
rename to collect-sdry/src/main/java/com/docus/server/collect/web/utils/XaUtils.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/IJobResult.java b/common-collect/src/main/java/com/docus/server/collect/IJobResult.java
new file mode 100644
index 0000000..b38e0b6
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/IJobResult.java
@@ -0,0 +1,17 @@
+package com.docus.server.collect;
+
+/**
+ * @author linruifeng
+ * @date 2023/6/14 14:27
+ */
+public interface IJobResult<T> extends IResult<T> {
+
+    /**
+     * job主动返回结果
+     *
+     * @param results 分页查询表数据
+     * @param dsKey   数据源key
+     */
+    void handle(T results, String dsKey);
+
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java
index 944a408..9cb096c 100644
--- a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java
@@ -42,8 +42,8 @@ public class TBasicHttpCollectJob extends AbstractCollectJob<TBasicDTO> {
 
 
     @Override
-    public void doHandle(List<TBasicDTO> t) {
-        basicService.batchSaveBasics(t);
+    public void doHandle(List<TBasicDTO> results) {
+        basicService.batchSaveBasics(results);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java
index 89a489c..00181a1 100644
--- a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java
@@ -40,8 +40,8 @@ public class TBasicViewCollectJob extends AbstractCollectJob<TBasicDTO> {
     }
 
     @Override
-    public void doHandle(List<TBasicDTO> t) {
-        basicService.batchSaveBasics(t);
+    public void doHandle(List<TBasicDTO> results) {
+        basicService.batchSaveBasics(results);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java
index 65b91ec..62d5a43 100644
--- a/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java
@@ -40,8 +40,8 @@ public class TBasicWsCollectJob extends AbstractCollectJob<TBasicDTO> {
     }
 
     @Override
-    public void doHandle(List<TBasicDTO> t) {
-        basicService.batchSaveBasics(t);
+    public void doHandle(List<TBasicDTO> results) {
+        basicService.batchSaveBasics(results);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java
index 886b7de..6dfddb9 100644
--- a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java
@@ -41,8 +41,8 @@ public class DeptHttpCollectJob extends AbstractCollectJob<DeptDTO> {
     }
 
     @Override
-    public void doHandle(List<DeptDTO> t) {
-        deptService.batchInsertOrUpdatePowerDept(t);
+    public void doHandle(List<DeptDTO> results) {
+        deptService.batchInsertOrUpdatePowerDept(results);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java
index 90958e2..7fd6004 100644
--- a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java
@@ -42,8 +42,8 @@ public class DeptViewCollectJob extends AbstractCollectJob<DeptDTO> {
     }
 
     @Override
-    public void doHandle(List<DeptDTO> t) {
-        deptService.batchInsertOrUpdatePowerDept(t);
+    public void doHandle(List<DeptDTO> results) {
+        deptService.batchInsertOrUpdatePowerDept(results);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java
index b0ceed4..67056cf 100644
--- a/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java
@@ -40,8 +40,8 @@ public class DeptWsCollectJob extends AbstractCollectJob<DeptDTO> {
     }
 
     @Override
-    public void doHandle(List<DeptDTO> t) {
-        deptService.batchInsertOrUpdatePowerDept(t);
+    public void doHandle(List<DeptDTO> results) {
+        deptService.batchInsertOrUpdatePowerDept(results);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java
new file mode 100644
index 0000000..2a34ff9
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java
@@ -0,0 +1,59 @@
+package com.docus.server.collect.report.view;
+
+import com.docus.server.collect.ICollector;
+import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
+import com.docus.server.collect.web.job.AbstractCollectJob;
+import com.docus.server.lis.common.DSKeyConstants;
+import com.docus.server.lis.service.ILisService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 病理数据
+ *
+ * @author linruifeng
+ * @see AbstractCollectJob
+ * @see IJob
+ * @see ICollector
+ */
+@Component
+public class BlViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
+    @Resource
+    private ILisService lisService;
+    @Resource(name = "blViewJobResultImpl")
+    private IJobResult jobResult;
+
+    /**
+     * xxl jobhandler 手工执行，全量执行
+     */
+    @XxlJob("startAllLisViewCollect")
+    public void startAllLisViewCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
+     */
+    @XxlJob("startIncLisViewCollect")
+    public void startIncLisViewCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
+    }
+
+    @Override
+    public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
+        //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
+        return lisService.page(startDate, endDate, pageNum, pageSize);
+    }
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java
new file mode 100644
index 0000000..e637d25
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java
@@ -0,0 +1,59 @@
+package com.docus.server.collect.report.view;
+
+import com.docus.server.collect.ICollector;
+import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
+import com.docus.server.collect.web.job.AbstractCollectJob;
+import com.docus.server.lis.common.DSKeyConstants;
+import com.docus.server.lis.service.ILisService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 电生理系统数据
+ *
+ * @author linruifeng
+ * @see AbstractCollectJob
+ * @see IJob
+ * @see ICollector
+ */
+@Component
+public class EcgViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
+    @Resource
+    private ILisService lisService;
+    @Resource(name = "ecgViewJobResultImpl")
+    private IJobResult jobResult;
+
+    /**
+     * xxl jobhandler 手工执行，全量执行
+     */
+    @XxlJob("startAllLisViewCollect")
+    public void startAllLisViewCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
+     */
+    @XxlJob("startIncLisViewCollect")
+    public void startIncLisViewCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
+    }
+
+    @Override
+    public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
+        //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
+        return lisService.page(startDate, endDate, pageNum, pageSize);
+    }
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java
new file mode 100644
index 0000000..11f8350
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java
@@ -0,0 +1,59 @@
+package com.docus.server.collect.report.view;
+
+import com.docus.server.collect.ICollector;
+import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
+import com.docus.server.collect.web.job.AbstractCollectJob;
+import com.docus.server.lis.common.DSKeyConstants;
+import com.docus.server.lis.service.ILisService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 电子病历系统数据
+ *
+ * @author linruifeng
+ * @see AbstractCollectJob
+ * @see IJob
+ * @see ICollector
+ */
+@Component
+public class EmrViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
+    @Resource
+    private ILisService lisService;
+    @Resource(name = "emrViewJobResultImpl")
+    private IJobResult jobResult;
+
+    /**
+     * xxl jobhandler 手工执行，全量执行
+     */
+    @XxlJob("startAllLisViewCollect")
+    public void startAllLisViewCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
+     */
+    @XxlJob("startIncLisViewCollect")
+    public void startIncLisViewCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
+    }
+
+    @Override
+    public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
+        //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
+        return lisService.page(startDate, endDate, pageNum, pageSize);
+    }
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java
new file mode 100644
index 0000000..5a81f86
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java
@@ -0,0 +1,59 @@
+package com.docus.server.collect.report.view;
+
+import com.docus.server.collect.ICollector;
+import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
+import com.docus.server.collect.web.job.AbstractCollectJob;
+import com.docus.server.lis.common.DSKeyConstants;
+import com.docus.server.lis.service.ILisService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 护理文书系统数据
+ *
+ * @author linruifeng
+ * @see AbstractCollectJob
+ * @see IJob
+ * @see ICollector
+ */
+@Component
+public class HlViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
+    @Resource
+    private ILisService lisService;
+    @Resource(name = "hlViewJobResultImpl")
+    private IJobResult jobResult;
+
+    /**
+     * xxl jobhandler 手工执行，全量执行
+     */
+    @XxlJob("startAllLisViewCollect")
+    public void startAllLisViewCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
+     */
+    @XxlJob("startIncLisViewCollect")
+    public void startIncLisViewCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
+    }
+
+    @Override
+    public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
+        //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
+        return lisService.page(startDate, endDate, pageNum, pageSize);
+    }
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/IHospitalService.java b/common-collect/src/main/java/com/docus/server/collect/report/view/IHospitalService.java
deleted file mode 100644
index 0643c3c..0000000
--- a/common-collect/src/main/java/com/docus/server/collect/report/view/IHospitalService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.docus.server.collect.report.view;
-
-import com.docus.server.common.IHospital;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author linruifeng
- * @date 2023/6/14 9:38
- */
-public interface IHospitalService {
-
-    void handle(List<Map<String, Object>> t, String dsKey, IHospital hospital);
-
-}
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java
new file mode 100644
index 0000000..a4d87d6
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java
@@ -0,0 +1,59 @@
+package com.docus.server.collect.report.view;
+
+import com.docus.server.collect.ICollector;
+import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
+import com.docus.server.collect.web.job.AbstractCollectJob;
+import com.docus.server.lis.common.DSKeyConstants;
+import com.docus.server.lis.service.ILisService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 手麻系统数据
+ *
+ * @author linruifeng
+ * @see AbstractCollectJob
+ * @see IJob
+ * @see ICollector
+ */
+@Component
+public class IssubmitViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
+    @Resource
+    private ILisService lisService;
+    @Resource(name = "issubmitViewJobResultImpl")
+    private IJobResult jobResult;
+
+    /**
+     * xxl jobhandler 手工执行，全量执行
+     */
+    @XxlJob("startAllLisViewCollect")
+    public void startAllLisViewCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
+     */
+    @XxlJob("startIncLisViewCollect")
+    public void startIncLisViewCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
+    }
+
+    @Override
+    public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
+        //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
+        return lisService.page(startDate, endDate, pageNum, pageSize);
+    }
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java
index 3c3e1e0..6b36c53 100644
--- a/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.java
@@ -2,6 +2,7 @@ package com.docus.server.collect.report.view;
 
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
 import com.docus.server.collect.web.job.AbstractCollectJob;
 import com.docus.server.lis.common.DSKeyConstants;
 import com.docus.server.lis.service.ILisService;
@@ -14,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 病理数据job
+ * lis系统数据
  *
  * @author linruifeng
  * @see AbstractCollectJob
@@ -25,8 +26,8 @@ import java.util.Map;
 public class LisViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
     @Resource
     private ILisService lisService;
-    @Resource
-    private IHospitalService hospitalService;
+    @Resource(name = "lisViewJobResultImpl")
+    private IJobResult jobResult;
 
     /**
      * xxl jobhandler 手工执行，全量执行
@@ -44,12 +45,12 @@ public class LisViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
         super.startCollectIncrement(getJobParam());
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public void doHandle(List<Map<String, Object>> t) {
-        hospitalService.handle(t, DSKeyConstants.DS_KEY, lisService);
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
         //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java
new file mode 100644
index 0000000..421b4c4
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java
@@ -0,0 +1,59 @@
+package com.docus.server.collect.report.view;
+
+import com.docus.server.collect.ICollector;
+import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
+import com.docus.server.collect.web.job.AbstractCollectJob;
+import com.docus.server.lis.common.DSKeyConstants;
+import com.docus.server.lis.service.ILisService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Pacs系统数据视图
+ *
+ * @author linruifeng
+ * @see AbstractCollectJob
+ * @see IJob
+ * @see ICollector
+ */
+@Component
+public class PacsViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
+    @Resource
+    private ILisService lisService;
+    @Resource(name = "pacsViewJobResultImpl")
+    private IJobResult jobResult;
+
+    /**
+     * xxl jobhandler 手工执行，全量执行
+     */
+    @XxlJob("startAllLisViewCollect")
+    public void startAllLisViewCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
+     */
+    @XxlJob("startIncLisViewCollect")
+    public void startIncLisViewCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
+    }
+
+    @Override
+    public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
+        //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
+        return lisService.page(startDate, endDate, pageNum, pageSize);
+    }
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java
new file mode 100644
index 0000000..e4ddf7c
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java
@@ -0,0 +1,59 @@
+package com.docus.server.collect.report.view;
+
+import com.docus.server.collect.ICollector;
+import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
+import com.docus.server.collect.web.job.AbstractCollectJob;
+import com.docus.server.lis.common.DSKeyConstants;
+import com.docus.server.lis.service.ILisService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * vte静脉血栓栓塞症
+ *
+ * @author linruifeng
+ * @see AbstractCollectJob
+ * @see IJob
+ * @see ICollector
+ */
+@Component
+public class VteViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
+    @Resource
+    private ILisService lisService;
+    @Resource(name = "vteViewJobResultImpl")
+    private IJobResult jobResult;
+
+    /**
+     * xxl jobhandler 手工执行，全量执行
+     */
+    @XxlJob("startAllLisViewCollect")
+    public void startAllLisViewCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
+     */
+    @XxlJob("startIncLisViewCollect")
+    public void startIncLisViewCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
+    }
+
+    @Override
+    public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
+        //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
+        return lisService.page(startDate, endDate, pageNum, pageSize);
+    }
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java
new file mode 100644
index 0000000..c577ebd
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java
@@ -0,0 +1,59 @@
+package com.docus.server.collect.report.view;
+
+import com.docus.server.collect.ICollector;
+import com.docus.server.collect.IJob;
+import com.docus.server.collect.IJobResult;
+import com.docus.server.collect.web.job.AbstractCollectJob;
+import com.docus.server.lis.common.DSKeyConstants;
+import com.docus.server.lis.service.ILisService;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 重症系统数据
+ *
+ * @author linruifeng
+ * @see AbstractCollectJob
+ * @see IJob
+ * @see ICollector
+ */
+@Component
+public class ZzViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
+    @Resource
+    private ILisService lisService;
+    @Resource(name = "zzViewJobResultImpl")
+    private IJobResult jobResult;
+
+    /**
+     * xxl jobhandler 手工执行，全量执行
+     */
+    @XxlJob("startAllLisViewCollect")
+    public void startAllLisViewCollect() {
+        super.startCollectAll(getJobParam());
+    }
+
+    /**
+     * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
+     */
+    @XxlJob("startIncLisViewCollect")
+    public void startIncLisViewCollect() {
+        super.startCollectIncrement(getJobParam());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void doHandle(List<Map<String, Object>> results) {
+        jobResult.handle(results, DSKeyConstants.DS_KEY);
+    }
+
+    @Override
+    public List<Map<String, Object>> execute(Date startDate, Date endDate, int pageNum, int pageSize) {
+        //每家医院按照固定的格式写sql，不同医院需要替换不同的sql即可。
+        return lisService.page(startDate, endDate, pageNum, pageSize);
+    }
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java
index f31d198..deb4234 100644
--- a/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java
@@ -40,8 +40,8 @@ public class UserHttpCollectJob extends AbstractCollectJob<UserDTO> {
     }
 
     @Override
-    public void doHandle(List<UserDTO> t) {
-        userService.batchInsertOrUpdatePowerUser(t);
+    public void doHandle(List<UserDTO> results) {
+        userService.batchInsertOrUpdatePowerUser(results);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java
index fa4172e..580cb27 100644
--- a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java
@@ -48,13 +48,13 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
     }
 
     @Override
-    public void doHandle(List<UserDTO> t) {
+    public void doHandle(List<UserDTO> results) {
         //docus-BasicDataReceive同步user逻辑
-        Collection<Object> userNames = ListUtils.distinctSelect(t, UserDTO::getUserName);
+        Collection<Object> userNames = ListUtils.distinctSelect(results, UserDTO::getUserName);
         List<PowerUser> powerUsers = userService.findByList("userName", userNames);
         List<String> existUserNames = ListUtils.distinctSelect(powerUsers, PowerUser::getUserName);
 
-        t.forEach(p -> {
+        results.forEach(p -> {
             String userName = p.getUserName();
             String pwd = p.getPwd();
             if (existUserNames.contains(userName)) {
diff --git a/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java
index 72f2f48..65e4f6f 100644
--- a/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java
@@ -40,8 +40,8 @@ public class UserWsCollectJob extends AbstractCollectJob<UserDTO> {
     }
 
     @Override
-    public void doHandle(List<UserDTO> t) {
-        userService.batchInsertOrUpdatePowerUser(t);
+    public void doHandle(List<UserDTO> results) {
+        userService.batchInsertOrUpdatePowerUser(results);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/A.java b/common-collect/src/main/java/com/docus/server/collect/web/common/A.java
new file mode 100644
index 0000000..29b2ead
--- /dev/null
+++ b/common-collect/src/main/java/com/docus/server/collect/web/common/A.java
@@ -0,0 +1,8 @@
+package com.docus.server.collect.web.common;
+
+/**
+ * @author linruifeng
+ * @date 2023/6/14 14:10
+ */
+public class A {
+}
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java
index 10b923a..f7c2b2e 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java
+++ b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java
@@ -85,23 +85,23 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
     @Override
     public void get(PeriodTime periodTime, TaskConfig taskConfig) {
         //考虑到性能，应该把起始时间和结束时间进行切割拆分到每天。按段查询。
-        List<T> t;
+        List<T> results;
         int pageNum = 1;
         for (; true; pageNum++) {
-            t = this.execute(
+            results = this.execute(
                 periodTime.getPeriodStartDate(),
                 periodTime.getPeriodEndDate(),
                 pageNum,
                 taskConfig.getPageSize()
             );
 
-            if (Func.isEmpty(t)) {
+            if (Func.isEmpty(results)) {
                 log.info("本次采集：0笔" + taskConfig.getType());
                 break;
             }
 
-            log.info("本次采集：" + t.size() + "笔" + taskConfig.getType());
-            this.doHandle(t);
+            log.info("本次采集：" + results.size() + "笔" + taskConfig.getType());
+            this.doHandle(results);
         }
     }
 
@@ -124,7 +124,7 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
         return XxlJobHelper.getJobParam();
     }
 
-    public abstract void doHandle(List<T> t);
+    public abstract void doHandle(List<T> results);
 
     public abstract List<T> execute(Date startDate, Date endDate, int pageNum, int pageSize);
 }
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/process/JobProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/process/JobProcessor.java
index 1c77e22..9ef3a5e 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/process/JobProcessor.java
+++ b/common-collect/src/main/java/com/docus/server/collect/web/process/JobProcessor.java
@@ -8,9 +8,9 @@ import com.docus.server.collect.IConverter;
 import com.docus.server.collect.IResult;
 import com.docus.server.collect.web.enums.CollectTypeEnum;
 import com.docus.server.collect.web.service.ITaskOriginalMessageService;
-import com.docus.server.collect.web.utils.SpringUtils;
 import com.docus.server.common.enums.IIntegerEnum;
 import com.docus.server.common.enums.StateEnum;
+import com.docus.server.common.util.SpringUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.xxl.job.core.context.XxlJobHelper;
 import lombok.extern.slf4j.Slf4j;
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java
index 89c77ab..06db14c 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java
+++ b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java
@@ -8,9 +8,9 @@ import com.docus.server.collect.IConverter;
 import com.docus.server.collect.IResult;
 import com.docus.server.collect.web.enums.CollectTypeEnum;
 import com.docus.server.collect.web.service.ITaskOriginalMessageService;
-import com.docus.server.collect.web.utils.SpringUtils;
 import com.docus.server.common.enums.IIntegerEnum;
 import com.docus.server.common.enums.StateEnum;
+import com.docus.server.common.util.SpringUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/docus-api-common/pom.xml b/docus-api-common/pom.xml
new file mode 100644
index 0000000..66c0c80
--- /dev/null
+++ b/docus-api-common/pom.xml
@@ -0,0 +1,32 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>docus-collector-server</artifactId>
+        <groupId>com.docus</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>docus-api-common</artifactId>
+    <name>Archetype - docus-api-common</name>
+    <url>http://maven.apache.org</url>
+    <dependencies>
+        <dependency>
+            <groupId>com.docus</groupId>
+            <artifactId>docus-client-interface</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>
diff --git a/docus-common/src/main/java/com/docus/server/common/CommonApplication.java b/docus-api-common/src/main/java/com/docus/server/common/CommonApplication.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/CommonApplication.java
rename to docus-api-common/src/main/java/com/docus/server/common/CommonApplication.java
diff --git a/docus-common/src/main/java/com/docus/server/common/bean/MqExchange.java b/docus-api-common/src/main/java/com/docus/server/common/bean/MqExchange.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/bean/MqExchange.java
rename to docus-api-common/src/main/java/com/docus/server/common/bean/MqExchange.java
diff --git a/docus-common/src/main/java/com/docus/server/common/bean/MqQueue.java b/docus-api-common/src/main/java/com/docus/server/common/bean/MqQueue.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/bean/MqQueue.java
rename to docus-api-common/src/main/java/com/docus/server/common/bean/MqQueue.java
diff --git a/docus-common/src/main/java/com/docus/server/common/bean/Result.java b/docus-api-common/src/main/java/com/docus/server/common/bean/Result.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/bean/Result.java
rename to docus-api-common/src/main/java/com/docus/server/common/bean/Result.java
diff --git a/docus-common/src/main/java/com/docus/server/common/config/RabbitMQConfig.java b/docus-api-common/src/main/java/com/docus/server/common/config/RabbitMQConfig.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/config/RabbitMQConfig.java
rename to docus-api-common/src/main/java/com/docus/server/common/config/RabbitMQConfig.java
diff --git a/docus-common/src/main/java/com/docus/server/common/config/ServletListenerRegistrationConfig.java b/docus-api-common/src/main/java/com/docus/server/common/config/ServletListenerRegistrationConfig.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/config/ServletListenerRegistrationConfig.java
rename to docus-api-common/src/main/java/com/docus/server/common/config/ServletListenerRegistrationConfig.java
diff --git a/docus-common/src/main/java/com/docus/server/common/config/UserProperties.java b/docus-api-common/src/main/java/com/docus/server/common/config/UserProperties.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/config/UserProperties.java
rename to docus-api-common/src/main/java/com/docus/server/common/config/UserProperties.java
diff --git a/docus-common/src/main/java/com/docus/server/common/constants/Constants.java b/docus-api-common/src/main/java/com/docus/server/common/constants/Constants.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/constants/Constants.java
rename to docus-api-common/src/main/java/com/docus/server/common/constants/Constants.java
diff --git a/docus-common/src/main/java/com/docus/server/common/constants/RabbitMQProperty.java b/docus-api-common/src/main/java/com/docus/server/common/constants/RabbitMQProperty.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/constants/RabbitMQProperty.java
rename to docus-api-common/src/main/java/com/docus/server/common/constants/RabbitMQProperty.java
diff --git a/docus-common/src/main/java/com/docus/server/common/db/KeyGenerator.java b/docus-api-common/src/main/java/com/docus/server/common/db/KeyGenerator.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/db/KeyGenerator.java
rename to docus-api-common/src/main/java/com/docus/server/common/db/KeyGenerator.java
diff --git a/docus-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTimeTypeHandler.java b/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTimeTypeHandler.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTimeTypeHandler.java
rename to docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTimeTypeHandler.java
diff --git a/docus-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTypeHandler.java b/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTypeHandler.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTypeHandler.java
rename to docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalDateTypeHandler.java
diff --git a/docus-common/src/main/java/com/docus/server/common/db/type/handler/LocalTimeTypeHandler.java b/docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalTimeTypeHandler.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/db/type/handler/LocalTimeTypeHandler.java
rename to docus-api-common/src/main/java/com/docus/server/common/db/type/handler/LocalTimeTypeHandler.java
diff --git a/docus-common/src/main/java/com/docus/server/common/declare/AbstractDeclare.java b/docus-api-common/src/main/java/com/docus/server/common/declare/AbstractDeclare.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/declare/AbstractDeclare.java
rename to docus-api-common/src/main/java/com/docus/server/common/declare/AbstractDeclare.java
diff --git a/docus-common/src/main/java/com/docus/server/common/declare/AmBindDeclare.java b/docus-api-common/src/main/java/com/docus/server/common/declare/AmBindDeclare.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/declare/AmBindDeclare.java
rename to docus-api-common/src/main/java/com/docus/server/common/declare/AmBindDeclare.java
diff --git a/docus-common/src/main/java/com/docus/server/common/declare/AmExchangeDeclare.java b/docus-api-common/src/main/java/com/docus/server/common/declare/AmExchangeDeclare.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/declare/AmExchangeDeclare.java
rename to docus-api-common/src/main/java/com/docus/server/common/declare/AmExchangeDeclare.java
diff --git a/docus-common/src/main/java/com/docus/server/common/declare/AmQueueDeclare.java b/docus-api-common/src/main/java/com/docus/server/common/declare/AmQueueDeclare.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/declare/AmQueueDeclare.java
rename to docus-api-common/src/main/java/com/docus/server/common/declare/AmQueueDeclare.java
diff --git a/docus-common/src/main/java/com/docus/server/common/enums/EnumItemView.java b/docus-api-common/src/main/java/com/docus/server/common/enums/EnumItemView.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/enums/EnumItemView.java
rename to docus-api-common/src/main/java/com/docus/server/common/enums/EnumItemView.java
diff --git a/docus-common/src/main/java/com/docus/server/common/enums/EnumTypeHandlerDispatch.java b/docus-api-common/src/main/java/com/docus/server/common/enums/EnumTypeHandlerDispatch.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/enums/EnumTypeHandlerDispatch.java
rename to docus-api-common/src/main/java/com/docus/server/common/enums/EnumTypeHandlerDispatch.java
diff --git a/docus-common/src/main/java/com/docus/server/common/enums/FlagEnum.java b/docus-api-common/src/main/java/com/docus/server/common/enums/FlagEnum.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/enums/FlagEnum.java
rename to docus-api-common/src/main/java/com/docus/server/common/enums/FlagEnum.java
diff --git a/docus-common/src/main/java/com/docus/server/common/enums/IIntegerEnum.java b/docus-api-common/src/main/java/com/docus/server/common/enums/IIntegerEnum.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/enums/IIntegerEnum.java
rename to docus-api-common/src/main/java/com/docus/server/common/enums/IIntegerEnum.java
diff --git a/docus-common/src/main/java/com/docus/server/common/enums/IntegerEnumHandler.java b/docus-api-common/src/main/java/com/docus/server/common/enums/IntegerEnumHandler.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/enums/IntegerEnumHandler.java
rename to docus-api-common/src/main/java/com/docus/server/common/enums/IntegerEnumHandler.java
diff --git a/docus-common/src/main/java/com/docus/server/common/enums/StateEnum.java b/docus-api-common/src/main/java/com/docus/server/common/enums/StateEnum.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/enums/StateEnum.java
rename to docus-api-common/src/main/java/com/docus/server/common/enums/StateEnum.java
diff --git a/docus-common/src/main/java/com/docus/server/common/exception/Assert.java b/docus-api-common/src/main/java/com/docus/server/common/exception/Assert.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/exception/Assert.java
rename to docus-api-common/src/main/java/com/docus/server/common/exception/Assert.java
diff --git a/docus-common/src/main/java/com/docus/server/common/exception/BaseException.java b/docus-api-common/src/main/java/com/docus/server/common/exception/BaseException.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/exception/BaseException.java
rename to docus-api-common/src/main/java/com/docus/server/common/exception/BaseException.java
diff --git a/docus-common/src/main/java/com/docus/server/common/exception/GlobalExceptionHandler.java b/docus-api-common/src/main/java/com/docus/server/common/exception/GlobalExceptionHandler.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/exception/GlobalExceptionHandler.java
rename to docus-api-common/src/main/java/com/docus/server/common/exception/GlobalExceptionHandler.java
diff --git a/docus-common/src/main/java/com/docus/server/common/exception/IResult.java b/docus-api-common/src/main/java/com/docus/server/common/exception/IResult.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/exception/IResult.java
rename to docus-api-common/src/main/java/com/docus/server/common/exception/IResult.java
diff --git a/docus-common/src/main/java/com/docus/server/common/exception/RabbitMQException.java b/docus-api-common/src/main/java/com/docus/server/common/exception/RabbitMQException.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/exception/RabbitMQException.java
rename to docus-api-common/src/main/java/com/docus/server/common/exception/RabbitMQException.java
diff --git a/docus-common/src/main/java/com/docus/server/common/exception/RabbitMQExceptionAssert.java b/docus-api-common/src/main/java/com/docus/server/common/exception/RabbitMQExceptionAssert.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/exception/RabbitMQExceptionAssert.java
rename to docus-api-common/src/main/java/com/docus/server/common/exception/RabbitMQExceptionAssert.java
diff --git a/docus-common/src/main/java/com/docus/server/common/exception/RabbitMQExceptionUtils.java b/docus-api-common/src/main/java/com/docus/server/common/exception/RabbitMQExceptionUtils.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/exception/RabbitMQExceptionUtils.java
rename to docus-api-common/src/main/java/com/docus/server/common/exception/RabbitMQExceptionUtils.java
diff --git a/docus-common/src/main/java/com/docus/server/common/listen/AbstractMessageHandler.java b/docus-api-common/src/main/java/com/docus/server/common/listen/AbstractMessageHandler.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/listen/AbstractMessageHandler.java
rename to docus-api-common/src/main/java/com/docus/server/common/listen/AbstractMessageHandler.java
diff --git a/docus-common/src/main/java/com/docus/server/common/listen/InitThreadLocalPoolListen.java b/docus-api-common/src/main/java/com/docus/server/common/listen/InitThreadLocalPoolListen.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/listen/InitThreadLocalPoolListen.java
rename to docus-api-common/src/main/java/com/docus/server/common/listen/InitThreadLocalPoolListen.java
diff --git a/docus-common/src/main/java/com/docus/server/common/listen/MessageListen.java b/docus-api-common/src/main/java/com/docus/server/common/listen/MessageListen.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/listen/MessageListen.java
rename to docus-api-common/src/main/java/com/docus/server/common/listen/MessageListen.java
diff --git a/docus-common/src/main/java/com/docus/server/common/message/MessageData.java b/docus-api-common/src/main/java/com/docus/server/common/message/MessageData.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/message/MessageData.java
rename to docus-api-common/src/main/java/com/docus/server/common/message/MessageData.java
diff --git a/docus-common/src/main/java/com/docus/server/common/message/MqMessage.java b/docus-api-common/src/main/java/com/docus/server/common/message/MqMessage.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/message/MqMessage.java
rename to docus-api-common/src/main/java/com/docus/server/common/message/MqMessage.java
diff --git a/docus-common/src/main/java/com/docus/server/common/register/AbstractRegisterQueue.java b/docus-api-common/src/main/java/com/docus/server/common/register/AbstractRegisterQueue.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/register/AbstractRegisterQueue.java
rename to docus-api-common/src/main/java/com/docus/server/common/register/AbstractRegisterQueue.java
diff --git a/docus-common/src/main/java/com/docus/server/common/request/Request.java b/docus-api-common/src/main/java/com/docus/server/common/request/Request.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/request/Request.java
rename to docus-api-common/src/main/java/com/docus/server/common/request/Request.java
diff --git a/docus-common/src/main/java/com/docus/server/common/request/RequestQueue.java b/docus-api-common/src/main/java/com/docus/server/common/request/RequestQueue.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/request/RequestQueue.java
rename to docus-api-common/src/main/java/com/docus/server/common/request/RequestQueue.java
diff --git a/docus-common/src/main/java/com/docus/server/common/send/AbstractReceiveService.java b/docus-api-common/src/main/java/com/docus/server/common/send/AbstractReceiveService.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/send/AbstractReceiveService.java
rename to docus-api-common/src/main/java/com/docus/server/common/send/AbstractReceiveService.java
diff --git a/docus-common/src/main/java/com/docus/server/common/send/AbstractSendService.java b/docus-api-common/src/main/java/com/docus/server/common/send/AbstractSendService.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/send/AbstractSendService.java
rename to docus-api-common/src/main/java/com/docus/server/common/send/AbstractSendService.java
diff --git a/docus-common/src/main/java/com/docus/server/common/service/IBaseService.java b/docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/service/IBaseService.java
rename to docus-api-common/src/main/java/com/docus/server/common/service/IBaseService.java
diff --git a/docus-common/src/main/java/com/docus/server/common/service/RabbitMQApiService.java b/docus-api-common/src/main/java/com/docus/server/common/service/RabbitMQApiService.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/service/RabbitMQApiService.java
rename to docus-api-common/src/main/java/com/docus/server/common/service/RabbitMQApiService.java
diff --git a/docus-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java b/docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java
rename to docus-api-common/src/main/java/com/docus/server/common/service/impl/BaseServiceImpl.java
diff --git a/docus-common/src/main/java/com/docus/server/common/service/impl/RabbitMQApiServiceImpl.java b/docus-api-common/src/main/java/com/docus/server/common/service/impl/RabbitMQApiServiceImpl.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/service/impl/RabbitMQApiServiceImpl.java
rename to docus-api-common/src/main/java/com/docus/server/common/service/impl/RabbitMQApiServiceImpl.java
diff --git a/docus-common/src/main/java/com/docus/server/common/service/impl/Sort.java b/docus-api-common/src/main/java/com/docus/server/common/service/impl/Sort.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/service/impl/Sort.java
rename to docus-api-common/src/main/java/com/docus/server/common/service/impl/Sort.java
diff --git a/docus-common/src/main/java/com/docus/server/common/thread/RequestThread.java b/docus-api-common/src/main/java/com/docus/server/common/thread/RequestThread.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/thread/RequestThread.java
rename to docus-api-common/src/main/java/com/docus/server/common/thread/RequestThread.java
diff --git a/docus-common/src/main/java/com/docus/server/common/thread/RequestThreadPool.java b/docus-api-common/src/main/java/com/docus/server/common/thread/RequestThreadPool.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/thread/RequestThreadPool.java
rename to docus-api-common/src/main/java/com/docus/server/common/thread/RequestThreadPool.java
diff --git a/docus-common/src/main/java/com/docus/server/common/type/AmExcepitonEnum.java b/docus-api-common/src/main/java/com/docus/server/common/type/AmExcepitonEnum.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/type/AmExcepitonEnum.java
rename to docus-api-common/src/main/java/com/docus/server/common/type/AmExcepitonEnum.java
diff --git a/docus-common/src/main/java/com/docus/server/common/type/ExchangeTypeEnum.java b/docus-api-common/src/main/java/com/docus/server/common/type/ExchangeTypeEnum.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/type/ExchangeTypeEnum.java
rename to docus-api-common/src/main/java/com/docus/server/common/type/ExchangeTypeEnum.java
diff --git a/docus-common/src/main/java/com/docus/server/common/type/ResultEnum.java b/docus-api-common/src/main/java/com/docus/server/common/type/ResultEnum.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/type/ResultEnum.java
rename to docus-api-common/src/main/java/com/docus/server/common/type/ResultEnum.java
diff --git a/docus-common/src/main/java/com/docus/server/common/util/ClassUtils.java b/docus-api-common/src/main/java/com/docus/server/common/util/ClassUtils.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/util/ClassUtils.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/ClassUtils.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/IdUtil.java b/docus-api-common/src/main/java/com/docus/server/common/util/IdUtil.java
similarity index 90%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/IdUtil.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/IdUtil.java
index 21309d0..20d39ec 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/utils/IdUtil.java
+++ b/docus-api-common/src/main/java/com/docus/server/common/util/IdUtil.java
@@ -1,4 +1,4 @@
-package com.docus.server.collect.web.utils;
+package com.docus.server.common.util;
 
 import lombok.Data;
 
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/IpUtil.java b/docus-api-common/src/main/java/com/docus/server/common/util/IpUtil.java
similarity index 97%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/IpUtil.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/IpUtil.java
index 45988ee..6fac8d4 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/utils/IpUtil.java
+++ b/docus-api-common/src/main/java/com/docus/server/common/util/IpUtil.java
@@ -1,4 +1,4 @@
-package com.docus.server.collect.web.utils;
+package com.docus.server.common.util;
 
 
 
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/MapObjUtil.java b/docus-api-common/src/main/java/com/docus/server/common/util/MapObjUtil.java
similarity index 99%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/MapObjUtil.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/MapObjUtil.java
index da5232b..79bbaac 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/utils/MapObjUtil.java
+++ b/docus-api-common/src/main/java/com/docus/server/common/util/MapObjUtil.java
@@ -1,4 +1,4 @@
-package com.docus.server.collect.web.utils;
+package com.docus.server.common.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/ParamsUtils.java b/docus-api-common/src/main/java/com/docus/server/common/util/ParamsUtils.java
similarity index 94%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/ParamsUtils.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/ParamsUtils.java
index 3e817bc..c6213f0 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/utils/ParamsUtils.java
+++ b/docus-api-common/src/main/java/com/docus/server/common/util/ParamsUtils.java
@@ -1,4 +1,4 @@
-package com.docus.server.collect.web.utils;
+package com.docus.server.common.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/docus-common/src/main/java/com/docus/server/common/util/RabbitMQUtils.java b/docus-api-common/src/main/java/com/docus/server/common/util/RabbitMQUtils.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/util/RabbitMQUtils.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/RabbitMQUtils.java
diff --git a/docus-common/src/main/java/com/docus/server/common/util/ResultWapper.java b/docus-api-common/src/main/java/com/docus/server/common/util/ResultWapper.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/util/ResultWapper.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/ResultWapper.java
diff --git a/common-collect/src/main/java/com/docus/server/collect/web/utils/SpringUtils.java b/docus-api-common/src/main/java/com/docus/server/common/util/SpringUtils.java
similarity index 99%
rename from common-collect/src/main/java/com/docus/server/collect/web/utils/SpringUtils.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/SpringUtils.java
index 99d2368..538203a 100644
--- a/common-collect/src/main/java/com/docus/server/collect/web/utils/SpringUtils.java
+++ b/docus-api-common/src/main/java/com/docus/server/common/util/SpringUtils.java
@@ -1,4 +1,4 @@
-package com.docus.server.collect.web.utils;
+package com.docus.server.common.util;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
diff --git a/docus-common/src/main/java/com/docus/server/common/util/UUIDUtils.java b/docus-api-common/src/main/java/com/docus/server/common/util/UUIDUtils.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/util/UUIDUtils.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/UUIDUtils.java
diff --git a/docus-common/src/main/java/com/docus/server/common/util/ValidateUtils.java b/docus-api-common/src/main/java/com/docus/server/common/util/ValidateUtils.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/util/ValidateUtils.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/ValidateUtils.java
diff --git a/docus-common/src/main/java/com/docus/server/common/util/ValidatorResultUtil.java b/docus-api-common/src/main/java/com/docus/server/common/util/ValidatorResultUtil.java
similarity index 100%
rename from docus-common/src/main/java/com/docus/server/common/util/ValidatorResultUtil.java
rename to docus-api-common/src/main/java/com/docus/server/common/util/ValidatorResultUtil.java
diff --git a/docus-common/src/main/resources/application.properties b/docus-api-common/src/main/resources/application.properties
similarity index 100%
rename from docus-common/src/main/resources/application.properties
rename to docus-api-common/src/main/resources/application.properties
diff --git a/docus-archivefile/pom.xml b/docus-archivefile/pom.xml
index 57549ef..6887415 100644
--- a/docus-archivefile/pom.xml
+++ b/docus-archivefile/pom.xml
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>com.docus</groupId>
-            <artifactId>docus-common</artifactId>
+            <artifactId>docus-api-common</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
diff --git a/docus-common/pom.xml b/docus-client-interface/pom.xml
similarity index 88%
rename from docus-common/pom.xml
rename to docus-client-interface/pom.xml
index da6ac15..ff615f9 100644
--- a/docus-common/pom.xml
+++ b/docus-client-interface/pom.xml
@@ -6,8 +6,8 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>docus-common</artifactId>
-    <name>Archetype - docus-common</name>
+    <artifactId>docus-client-interface</artifactId>
+    <name>Archetype - docus-client-interface</name>
     <url>http://maven.apache.org</url>
 
     <build>
diff --git a/docus-client-interface/src/main/java/com/docus/server/client/A.java b/docus-client-interface/src/main/java/com/docus/server/client/A.java
new file mode 100644
index 0000000..01e841e
--- /dev/null
+++ b/docus-client-interface/src/main/java/com/docus/server/client/A.java
@@ -0,0 +1,8 @@
+package com.docus.server.client;
+
+/**
+ * @author linruifeng
+ * @date 2023/6/14 11:35
+ */
+public class A {
+}
diff --git a/docus-common/src/main/java/com/docus/server/common/IHospital.java b/docus-client-interface/src/main/java/com/docus/server/client/api/IHospitalApi.java
similarity index 93%
rename from docus-common/src/main/java/com/docus/server/common/IHospital.java
rename to docus-client-interface/src/main/java/com/docus/server/client/api/IHospitalApi.java
index f44a483..a30c705 100644
--- a/docus-common/src/main/java/com/docus/server/common/IHospital.java
+++ b/docus-client-interface/src/main/java/com/docus/server/client/api/IHospitalApi.java
@@ -1,4 +1,4 @@
-package com.docus.server.common;
+package com.docus.server.client.api;
 
 import java.util.Date;
 import java.util.List;
@@ -8,7 +8,7 @@ import java.util.Map;
  * @author linruifeng
  * @date 2023/6/14 9:26
  */
-public interface IHospital {
+public interface IHospitalApi {
     /**
      * 分页查询
      *
diff --git a/docus-medical-record/pom.xml b/docus-medical-record/pom.xml
index fad41fe..11b015b 100644
--- a/docus-medical-record/pom.xml
+++ b/docus-medical-record/pom.xml
@@ -13,7 +13,7 @@
     <dependencies>
         <dependency>
             <groupId>com.docus</groupId>
-            <artifactId>docus-common</artifactId>
+            <artifactId>docus-api-common</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
diff --git a/docus-sys/pom.xml b/docus-sys/pom.xml
index c1c60b0..66b8551 100644
--- a/docus-sys/pom.xml
+++ b/docus-sys/pom.xml
@@ -26,7 +26,7 @@
     <dependencies>
         <dependency>
             <groupId>com.docus</groupId>
-            <artifactId>docus-common</artifactId>
+            <artifactId>docus-api-common</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgDeptMapper.java b/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgDeptMapper.java
index 8587e4b..3d05222 100644
--- a/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgDeptMapper.java
+++ b/ecg-sysem/src/main/java/com/docus/server/ecg/infrastructure/mapper/EcgDeptMapper.java
@@ -2,21 +2,29 @@ package com.docus.server.ecg.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.ecg.common.DSKeyConstants;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @DS(DSKeyConstants.DS_KEY)
 public interface EcgDeptMapper {
 
-    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate,
-                                  @Param("endDate") Date endDate,
-                                  @Param("offset") int offset,
-                                  @Param("pageSize") int pageSize);
+    List<Map<String, Object>> page(@Param("startDate") Date startDate,
+                                   @Param("endDate") Date endDate,
+                                   @Param("offset") int offset,
+                                   @Param("pageSize") int pageSize);
 
 
+    List<Map<String, Object>> BatchForJZH(@Param("jzhs") List<String> jzhs);
+
+    List<Map<String, Object>> BatchForJZHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForZYHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForEXAMTIME(@Param("datas") List<Map<String, Object>> datas);
+
 }
diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java b/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java
index a27e191..91ac5c6 100644
--- a/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java
+++ b/ecg-sysem/src/main/java/com/docus/server/ecg/service/IEcgService.java
@@ -1,16 +1,6 @@
 package com.docus.server.ecg.service;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.client.api.IHospitalApi;
 
-import java.util.Date;
-import java.util.List;
-
-public interface IEcgService {
-    List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize);
+public interface IEcgService extends IHospitalApi {
 }
diff --git a/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java b/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java
index 30a9569..ff5c521 100644
--- a/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java
+++ b/ecg-sysem/src/main/java/com/docus/server/ecg/service/impl/EcgServiceImpl.java
@@ -1,40 +1,45 @@
 package com.docus.server.ecg.service.impl;
 
+import com.docus.server.ecg.common.DSKeyConstants;
 import com.docus.server.ecg.infrastructure.mapper.EcgDeptMapper;
-import com.docus.server.ecg.infrastructure.mapper.EcgTBasicMapper;
-import com.docus.server.ecg.infrastructure.mapper.EcgUserMapper;
 import com.docus.server.ecg.service.IEcgService;
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
-@Component
+@Component(DSKeyConstants.DS_KEY + "ServiceImpl")
 @AllArgsConstructor
 public class EcgServiceImpl implements IEcgService {
 
-    private final EcgDeptMapper hisDeptMapper;
-    private final EcgUserMapper hisUserMapper;
-    private final EcgTBasicMapper hisTBasicMapper;
+    private final EcgDeptMapper ecgDeptMapper;
 
     @Override
-    public List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> page(Date startDate, Date endDate, int pageNum, int pageSize) {
+        return ecgDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
     }
 
+    @Override
+    public List<Map<String, Object>> BatchForJZH(List<String> jzhs) {
+        return ecgDeptMapper.BatchForJZH(jzhs);
+    }
+
+    @Override
+    public List<Map<String, Object>> BatchForJZHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return ecgDeptMapper.BatchForJZHAndAdmissTimes(datas);
+    }
 
     @Override
-    public List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForZYHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return ecgDeptMapper.BatchForZYHAndAdmissTimes(datas);
     }
 
     @Override
-    public List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForEXAMTIME(List<Map<String, Object>> datas) {
+        return ecgDeptMapper.BatchForEXAMTIME(datas);
     }
 
+
 }
diff --git a/ecg-sysem/src/main/resources/mapper/EcgDeptMapper.xml b/ecg-sysem/src/main/resources/mapper/EcgDeptMapper.xml
index 380c76f..cfab4bc 100644
--- a/ecg-sysem/src/main/resources/mapper/EcgDeptMapper.xml
+++ b/ecg-sysem/src/main/resources/mapper/EcgDeptMapper.xml
@@ -4,13 +4,143 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.ecg.infrastructure.mapper.EcgDeptMapper">
 
-    <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
-        WHERE  update_time between #{startDate}  and  #{endDate}
-        order by update_time asc
+    <!--根据更新时间分页查询-->
+    <select id="page" resultType="java.util.Map">
+        SELECT DISTINCT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND AFFIRM_TIME <![CDATA[ > ]]> #{startDate}
+        AND AFFIRM_TIME <![CDATA[ <= ]]> #{endDate}
+        ORDER BY
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC
         LIMIT #{offset}, #{pageSize}
     </select>
 
+    <!--根据jzh取得所需采集的批量数据-->
+    <select id="BatchForJZH" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND JZH IN
+        <foreach item="item" index="index" collection="jzhs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+    <!--记账号+住院次数-->
+    <select id="BatchForJZHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (JZH =#{item.FVISIT_ID} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForZYHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForEXAMTIME" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and EXAM_TIME <![CDATA[ >= ]]>  STR_TO_DATE(#{item.admiss_date})
+            <if test="item.dis_date != null">
+                and EXAM_TIME <![CDATA[ <= ]]> STR_TO_DATE(#{item.dis_date})
+            </if>
+        </foreach>
+        )
+    </select>
 
     <!--  mysql
     <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
diff --git a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrDeptMapper.java b/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrDeptMapper.java
index 5ec0dc0..931a4f4 100644
--- a/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrDeptMapper.java
+++ b/emr-sysem/src/main/java/com/docus/server/emr/infrastructure/mapper/EmrDeptMapper.java
@@ -2,21 +2,29 @@ package com.docus.server.emr.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.emr.common.DSKeyConstants;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @DS(DSKeyConstants.DS_KEY)
 public interface EmrDeptMapper {
 
-    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate,
-                                  @Param("endDate") Date endDate,
-                                  @Param("offset") int offset,
-                                  @Param("pageSize") int pageSize);
+    List<Map<String, Object>> page(@Param("startDate") Date startDate,
+                                   @Param("endDate") Date endDate,
+                                   @Param("offset") int offset,
+                                   @Param("pageSize") int pageSize);
 
 
+    List<Map<String, Object>> BatchForJZH(@Param("jzhs") List<String> jzhs);
+
+    List<Map<String, Object>> BatchForJZHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForZYHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForEXAMTIME(@Param("datas") List<Map<String, Object>> datas);
+
 }
diff --git a/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java b/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java
index 9f489b8..78feca3 100644
--- a/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java
+++ b/emr-sysem/src/main/java/com/docus/server/emr/service/IEmrService.java
@@ -1,16 +1,6 @@
 package com.docus.server.emr.service;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.client.api.IHospitalApi;
 
-import java.util.Date;
-import java.util.List;
-
-public interface IEmrService {
-    List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize);
+public interface IEmrService extends IHospitalApi {
 }
diff --git a/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java b/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java
index 73f84c3..e102118 100644
--- a/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java
+++ b/emr-sysem/src/main/java/com/docus/server/emr/service/impl/EmrServiceImpl.java
@@ -1,40 +1,45 @@
 package com.docus.server.emr.service.impl;
 
+import com.docus.server.emr.common.DSKeyConstants;
 import com.docus.server.emr.infrastructure.mapper.EmrDeptMapper;
-import com.docus.server.emr.infrastructure.mapper.EmrTBasicMapper;
-import com.docus.server.emr.infrastructure.mapper.EmrUserMapper;
 import com.docus.server.emr.service.IEmrService;
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
-@Component
+@Component(DSKeyConstants.DS_KEY + "ServiceImpl")
 @AllArgsConstructor
 public class EmrServiceImpl implements IEmrService {
 
-    private final EmrDeptMapper hisDeptMapper;
-    private final EmrUserMapper hisUserMapper;
-    private final EmrTBasicMapper hisTBasicMapper;
+    private final EmrDeptMapper emrDeptMapper;
 
     @Override
-    public List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> page(Date startDate, Date endDate, int pageNum, int pageSize) {
+        return emrDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
     }
 
+    @Override
+    public List<Map<String, Object>> BatchForJZH(List<String> jzhs) {
+        return emrDeptMapper.BatchForJZH(jzhs);
+    }
+
+    @Override
+    public List<Map<String, Object>> BatchForJZHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return emrDeptMapper.BatchForJZHAndAdmissTimes(datas);
+    }
 
     @Override
-    public List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForZYHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return emrDeptMapper.BatchForZYHAndAdmissTimes(datas);
     }
 
     @Override
-    public List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForEXAMTIME(List<Map<String, Object>> datas) {
+        return emrDeptMapper.BatchForEXAMTIME(datas);
     }
 
+
 }
diff --git a/emr-sysem/src/main/resources/mapper/EmrDeptMapper.xml b/emr-sysem/src/main/resources/mapper/EmrDeptMapper.xml
index 9672d36..2ab3ee7 100644
--- a/emr-sysem/src/main/resources/mapper/EmrDeptMapper.xml
+++ b/emr-sysem/src/main/resources/mapper/EmrDeptMapper.xml
@@ -4,13 +4,144 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.emr.infrastructure.mapper.EmrDeptMapper">
 
-    <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
-        WHERE  update_time between #{startDate}  and  #{endDate}
-        order by update_time asc
+    <!--根据更新时间分页查询-->
+    <select id="page" resultType="java.util.Map">
+        SELECT DISTINCT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND AFFIRM_TIME <![CDATA[ > ]]> #{startDate}
+        AND AFFIRM_TIME <![CDATA[ <= ]]> #{endDate}
+        ORDER BY
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC
         LIMIT #{offset}, #{pageSize}
     </select>
 
+    <!--根据jzh取得所需采集的批量数据-->
+    <select id="BatchForJZH" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND JZH IN
+        <foreach item="item" index="index" collection="jzhs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+    <!--记账号+住院次数-->
+    <select id="BatchForJZHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (JZH =#{item.FVISIT_ID} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForZYHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForEXAMTIME" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and EXAM_TIME <![CDATA[ >= ]]>  STR_TO_DATE(#{item.admiss_date})
+            <if test="item.dis_date != null">
+                and EXAM_TIME <![CDATA[ <= ]]> STR_TO_DATE(#{item.dis_date})
+            </if>
+        </foreach>
+        )
+    </select>
+
 
     <!--  mysql
     <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
diff --git a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlDeptMapper.java b/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlDeptMapper.java
index 8b9963d..c450a1b 100644
--- a/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlDeptMapper.java
+++ b/hl-sysem/src/main/java/com/docus/server/hl/infrastructure/mapper/HlDeptMapper.java
@@ -2,21 +2,30 @@ package com.docus.server.hl.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.hl.common.DSKeyConstants;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @DS(DSKeyConstants.DS_KEY)
 public interface HlDeptMapper {
 
-    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate,
-                                  @Param("endDate") Date endDate,
-                                  @Param("offset") int offset,
-                                  @Param("pageSize") int pageSize);
+    List<Map<String, Object>> page(@Param("startDate") Date startDate,
+                                   @Param("endDate") Date endDate,
+                                   @Param("offset") int offset,
+                                   @Param("pageSize") int pageSize);
+
+
+    List<Map<String, Object>> BatchForJZH(@Param("jzhs") List<String> jzhs);
+
+    List<Map<String, Object>> BatchForJZHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForZYHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForEXAMTIME(@Param("datas") List<Map<String, Object>> datas);
 
 
 }
diff --git a/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java b/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java
index 5b20010..39fb625 100644
--- a/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java
+++ b/hl-sysem/src/main/java/com/docus/server/hl/service/IHlService.java
@@ -1,16 +1,6 @@
 package com.docus.server.hl.service;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.client.api.IHospitalApi;
 
-import java.util.Date;
-import java.util.List;
-
-public interface IHlService {
-    List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize);
+public interface IHlService extends IHospitalApi {
 }
diff --git a/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java b/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java
index fc9c509..ca9db3d 100644
--- a/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java
+++ b/hl-sysem/src/main/java/com/docus/server/hl/service/impl/HlServiceImpl.java
@@ -1,40 +1,45 @@
 package com.docus.server.hl.service.impl;
 
+import com.docus.server.hl.common.DSKeyConstants;
 import com.docus.server.hl.infrastructure.mapper.HlDeptMapper;
-import com.docus.server.hl.infrastructure.mapper.HlTBasicMapper;
-import com.docus.server.hl.infrastructure.mapper.HlUserMapper;
 import com.docus.server.hl.service.IHlService;
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
-@Component
+@Component(DSKeyConstants.DS_KEY + "ServiceImpl")
 @AllArgsConstructor
 public class HlServiceImpl implements IHlService {
 
-    private final HlDeptMapper hisDeptMapper;
-    private final HlUserMapper hisUserMapper;
-    private final HlTBasicMapper hisTBasicMapper;
+    private final HlDeptMapper hlDeptMapper;
+
+
+    @Override
+    public List<Map<String, Object>> page(Date startDate, Date endDate, int pageNum, int pageSize) {
+        return hlDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    }
 
     @Override
-    public List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForJZH(List<String> jzhs) {
+        return hlDeptMapper.BatchForJZH(jzhs);
     }
 
+    @Override
+    public List<Map<String, Object>> BatchForJZHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return hlDeptMapper.BatchForJZHAndAdmissTimes(datas);
+    }
 
     @Override
-    public List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForZYHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return hlDeptMapper.BatchForZYHAndAdmissTimes(datas);
     }
 
     @Override
-    public List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForEXAMTIME(List<Map<String, Object>> datas) {
+        return hlDeptMapper.BatchForEXAMTIME(datas);
     }
 
 }
diff --git a/hl-sysem/src/main/resources/mapper/HlDeptMapper.xml b/hl-sysem/src/main/resources/mapper/HlDeptMapper.xml
index 8a60e9e..1ce6a3d 100644
--- a/hl-sysem/src/main/resources/mapper/HlDeptMapper.xml
+++ b/hl-sysem/src/main/resources/mapper/HlDeptMapper.xml
@@ -4,13 +4,143 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.hl.infrastructure.mapper.HlDeptMapper">
 
-    <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
-        WHERE  update_time between #{startDate}  and  #{endDate}
-        order by update_time asc
+    <!--根据更新时间分页查询-->
+    <select id="page" resultType="java.util.Map">
+        SELECT DISTINCT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND AFFIRM_TIME <![CDATA[ > ]]> #{startDate}
+        AND AFFIRM_TIME <![CDATA[ <= ]]> #{endDate}
+        ORDER BY
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC
         LIMIT #{offset}, #{pageSize}
     </select>
 
+    <!--根据jzh取得所需采集的批量数据-->
+    <select id="BatchForJZH" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND JZH IN
+        <foreach item="item" index="index" collection="jzhs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+    <!--记账号+住院次数-->
+    <select id="BatchForJZHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (JZH =#{item.FVISIT_ID} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForZYHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForEXAMTIME" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and EXAM_TIME <![CDATA[ >= ]]>  STR_TO_DATE(#{item.admiss_date})
+            <if test="item.dis_date != null">
+                and EXAM_TIME <![CDATA[ <= ]]> STR_TO_DATE(#{item.dis_date})
+            </if>
+        </foreach>
+        )
+    </select>
 
     <!--  mysql
     <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitDeptMapper.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitDeptMapper.java
index d505478..f5715e8 100644
--- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitDeptMapper.java
+++ b/issubmit-sysem/src/main/java/com/docus/server/issubmit/infrastructure/mapper/IssubmitDeptMapper.java
@@ -2,21 +2,30 @@ package com.docus.server.issubmit.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.issubmit.common.DSKeyConstants;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @DS(DSKeyConstants.DS_KEY)
 public interface IssubmitDeptMapper {
 
-    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate,
-                                  @Param("endDate") Date endDate,
-                                  @Param("offset") int offset,
-                                  @Param("pageSize") int pageSize);
+    List<Map<String, Object>> page(@Param("startDate") Date startDate,
+                                   @Param("endDate") Date endDate,
+                                   @Param("offset") int offset,
+                                   @Param("pageSize") int pageSize);
+
+
+    List<Map<String, Object>> BatchForJZH(@Param("jzhs") List<String> jzhs);
+
+    List<Map<String, Object>> BatchForJZHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForZYHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForEXAMTIME(@Param("datas") List<Map<String, Object>> datas);
 
 
 }
diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java
index 14e4202..b7baf71 100644
--- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java
+++ b/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/IIssubmitService.java
@@ -1,16 +1,6 @@
 package com.docus.server.issubmit.service;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.client.api.IHospitalApi;
 
-import java.util.Date;
-import java.util.List;
-
-public interface IIssubmitService {
-    List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize);
+public interface IIssubmitService extends IHospitalApi {
 }
diff --git a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java b/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java
index 52da928..86232b2 100644
--- a/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java
+++ b/issubmit-sysem/src/main/java/com/docus/server/issubmit/service/impl/IssubmitServiceImpl.java
@@ -1,40 +1,44 @@
 package com.docus.server.issubmit.service.impl;
 
+import com.docus.server.issubmit.common.DSKeyConstants;
 import com.docus.server.issubmit.infrastructure.mapper.IssubmitDeptMapper;
-import com.docus.server.issubmit.infrastructure.mapper.IssubmitTBasicMapper;
-import com.docus.server.issubmit.infrastructure.mapper.IssubmitUserMapper;
 import com.docus.server.issubmit.service.IIssubmitService;
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
-@Component
+@Component(DSKeyConstants.DS_KEY + "ServiceImpl")
 @AllArgsConstructor
 public class IssubmitServiceImpl implements IIssubmitService {
 
-    private final IssubmitDeptMapper hisDeptMapper;
-    private final IssubmitUserMapper hisUserMapper;
-    private final IssubmitTBasicMapper hisTBasicMapper;
+    private final IssubmitDeptMapper issubmitDeptMapper;
 
     @Override
-    public List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> page(Date startDate, Date endDate, int pageNum, int pageSize) {
+        return issubmitDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
     }
 
+    @Override
+    public List<Map<String, Object>> BatchForJZH(List<String> jzhs) {
+        return issubmitDeptMapper.BatchForJZH(jzhs);
+    }
+
+    @Override
+    public List<Map<String, Object>> BatchForJZHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return issubmitDeptMapper.BatchForJZHAndAdmissTimes(datas);
+    }
 
     @Override
-    public List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForZYHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return issubmitDeptMapper.BatchForZYHAndAdmissTimes(datas);
     }
 
     @Override
-    public List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForEXAMTIME(List<Map<String, Object>> datas) {
+        return issubmitDeptMapper.BatchForEXAMTIME(datas);
     }
 
 }
diff --git a/issubmit-sysem/src/main/resources/mapper/IssubmitDeptMapper.xml b/issubmit-sysem/src/main/resources/mapper/IssubmitDeptMapper.xml
index e93e773..c6c0764 100644
--- a/issubmit-sysem/src/main/resources/mapper/IssubmitDeptMapper.xml
+++ b/issubmit-sysem/src/main/resources/mapper/IssubmitDeptMapper.xml
@@ -4,13 +4,144 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.issubmit.infrastructure.mapper.IssubmitDeptMapper">
 
-    <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
-        WHERE  update_time between #{startDate}  and  #{endDate}
-        order by update_time asc
+    <!--根据更新时间分页查询-->
+    <select id="page" resultType="java.util.Map">
+        SELECT DISTINCT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND AFFIRM_TIME <![CDATA[ > ]]> #{startDate}
+        AND AFFIRM_TIME <![CDATA[ <= ]]> #{endDate}
+        ORDER BY
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC
         LIMIT #{offset}, #{pageSize}
     </select>
 
+    <!--根据jzh取得所需采集的批量数据-->
+    <select id="BatchForJZH" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND JZH IN
+        <foreach item="item" index="index" collection="jzhs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+    <!--记账号+住院次数-->
+    <select id="BatchForJZHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (JZH =#{item.FVISIT_ID} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForZYHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForEXAMTIME" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and EXAM_TIME <![CDATA[ >= ]]>  STR_TO_DATE(#{item.admiss_date})
+            <if test="item.dis_date != null">
+                and EXAM_TIME <![CDATA[ <= ]]> STR_TO_DATE(#{item.dis_date})
+            </if>
+        </foreach>
+        )
+    </select>
+
 
     <!--  mysql
     <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
diff --git a/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java b/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java
index 1ae751d..c36f702 100644
--- a/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java
+++ b/lis-sysem/src/main/java/com/docus/server/lis/service/ILisService.java
@@ -1,7 +1,9 @@
 package com.docus.server.lis.service;
 
-import com.docus.server.common.IHospital;
+import com.docus.server.client.api.IHospitalApi;
 
-public interface ILisService extends IHospital {
+public interface ILisService extends IHospitalApi {
+
+    void get();
 
 }
diff --git a/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java b/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java
index e394c33..3e26959 100644
--- a/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java
+++ b/lis-sysem/src/main/java/com/docus/server/lis/service/impl/LisServiceImpl.java
@@ -1,5 +1,6 @@
 package com.docus.server.lis.service.impl;
 
+import com.docus.server.lis.common.DSKeyConstants;
 import com.docus.server.lis.infrastructure.mapper.LisDeptMapper;
 import com.docus.server.lis.service.ILisService;
 import lombok.AllArgsConstructor;
@@ -9,7 +10,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-@Component
+@Component(DSKeyConstants.DS_KEY + "ServiceImpl")
 @AllArgsConstructor
 public class LisServiceImpl implements ILisService {
 
@@ -40,4 +41,8 @@ public class LisServiceImpl implements ILisService {
         return hisDeptMapper.BatchForEXAMTIME(datas);
     }
 
+    @Override
+    public void get() {
+
+    }
 }
diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsDeptMapper.java b/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsDeptMapper.java
index dbacbd4..0268dda 100644
--- a/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsDeptMapper.java
+++ b/pacs-sysem/src/main/java/com/docus/server/pacs/infrastructure/mapper/PacsDeptMapper.java
@@ -2,21 +2,30 @@ package com.docus.server.pacs.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.docus.server.pacs.common.DSKeyConstants;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @DS(DSKeyConstants.DS_KEY)
 public interface PacsDeptMapper {
 
-    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate,
-                                  @Param("endDate") Date endDate,
-                                  @Param("offset") int offset,
-                                  @Param("pageSize") int pageSize);
+    List<Map<String, Object>> page(@Param("startDate") Date startDate,
+                                   @Param("endDate") Date endDate,
+                                   @Param("offset") int offset,
+                                   @Param("pageSize") int pageSize);
+
+
+    List<Map<String, Object>> BatchForJZH(@Param("jzhs") List<String> jzhs);
+
+    List<Map<String, Object>> BatchForJZHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForZYHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForEXAMTIME(@Param("datas") List<Map<String, Object>> datas);
 
 
 }
diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java b/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java
index c0160df..bc999e5 100644
--- a/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java
+++ b/pacs-sysem/src/main/java/com/docus/server/pacs/service/IPacsService.java
@@ -1,16 +1,6 @@
 package com.docus.server.pacs.service;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.client.api.IHospitalApi;
 
-import java.util.Date;
-import java.util.List;
-
-public interface IPacsService {
-    List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize);
+public interface IPacsService extends IHospitalApi {
 }
diff --git a/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java b/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java
index 97c9960..dd0a2f7 100644
--- a/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java
+++ b/pacs-sysem/src/main/java/com/docus/server/pacs/service/impl/PacsServiceImpl.java
@@ -1,40 +1,45 @@
 package com.docus.server.pacs.service.impl;
 
+import com.docus.server.pacs.common.DSKeyConstants;
 import com.docus.server.pacs.infrastructure.mapper.PacsDeptMapper;
-import com.docus.server.pacs.infrastructure.mapper.PacsTBasicMapper;
-import com.docus.server.pacs.infrastructure.mapper.PacsUserMapper;
 import com.docus.server.pacs.service.IPacsService;
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
-@Component
+@Component(DSKeyConstants.DS_KEY + "ServiceImpl")
 @AllArgsConstructor
 public class PacsServiceImpl implements IPacsService {
 
-    private final PacsDeptMapper hisDeptMapper;
-    private final PacsUserMapper hisUserMapper;
-    private final PacsTBasicMapper hisTBasicMapper;
+    private final PacsDeptMapper pacsDeptMapper;
 
     @Override
-    public List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> page(Date startDate, Date endDate, int pageNum, int pageSize) {
+        return pacsDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
     }
 
+    @Override
+    public List<Map<String, Object>> BatchForJZH(List<String> jzhs) {
+        return pacsDeptMapper.BatchForJZH(jzhs);
+    }
+
+    @Override
+    public List<Map<String, Object>> BatchForJZHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return pacsDeptMapper.BatchForJZHAndAdmissTimes(datas);
+    }
 
     @Override
-    public List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForZYHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return pacsDeptMapper.BatchForZYHAndAdmissTimes(datas);
     }
 
     @Override
-    public List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForEXAMTIME(List<Map<String, Object>> datas) {
+        return pacsDeptMapper.BatchForEXAMTIME(datas);
     }
 
+
 }
diff --git a/pacs-sysem/src/main/resources/mapper/PacsDeptMapper.xml b/pacs-sysem/src/main/resources/mapper/PacsDeptMapper.xml
index 528fd4c..2e97219 100644
--- a/pacs-sysem/src/main/resources/mapper/PacsDeptMapper.xml
+++ b/pacs-sysem/src/main/resources/mapper/PacsDeptMapper.xml
@@ -4,13 +4,144 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.pacs.infrastructure.mapper.PacsDeptMapper">
 
-    <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
-        WHERE  update_time between #{startDate}  and  #{endDate}
-        order by update_time asc
+    <!--根据更新时间分页查询-->
+    <select id="page" resultType="java.util.Map">
+        SELECT DISTINCT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND AFFIRM_TIME <![CDATA[ > ]]> #{startDate}
+        AND AFFIRM_TIME <![CDATA[ <= ]]> #{endDate}
+        ORDER BY
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC
         LIMIT #{offset}, #{pageSize}
     </select>
 
+    <!--根据jzh取得所需采集的批量数据-->
+    <select id="BatchForJZH" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND JZH IN
+        <foreach item="item" index="index" collection="jzhs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+    <!--记账号+住院次数-->
+    <select id="BatchForJZHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (JZH =#{item.FVISIT_ID} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForZYHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForEXAMTIME" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and EXAM_TIME <![CDATA[ >= ]]>  STR_TO_DATE(#{item.admiss_date})
+            <if test="item.dis_date != null">
+                and EXAM_TIME <![CDATA[ <= ]]> STR_TO_DATE(#{item.dis_date})
+            </if>
+        </foreach>
+        )
+    </select>
+
 
     <!--  mysql
     <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
diff --git a/pom.xml b/pom.xml
index fe26a0a..d0854f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,8 @@
         <module>pacs-sysem</module>
         <module>vte-sysem</module>
         <module>zz-sysem</module>
-        <module>docus-common</module>
+        <module>docus-api-common</module>
+        <module>docus-client-interface</module>
     </modules>
     <dependencies>
 
diff --git a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteDeptMapper.java b/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteDeptMapper.java
index 847083e..1df8b95 100644
--- a/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteDeptMapper.java
+++ b/vte-sysem/src/main/java/com/docus/server/vte/infrastructure/mapper/VteDeptMapper.java
@@ -1,22 +1,30 @@
 package com.docus.server.vte.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.vte.common.DSKeyConstants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @DS(DSKeyConstants.DS_KEY)
 public interface VteDeptMapper {
 
-    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate,
-                                  @Param("endDate") Date endDate,
-                                  @Param("offset") int offset,
-                                  @Param("pageSize") int pageSize);
+    List<Map<String, Object>> page(@Param("startDate") Date startDate,
+                                   @Param("endDate") Date endDate,
+                                   @Param("offset") int offset,
+                                   @Param("pageSize") int pageSize);
 
 
+    List<Map<String, Object>> BatchForJZH(@Param("jzhs") List<String> jzhs);
+
+    List<Map<String, Object>> BatchForJZHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForZYHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForEXAMTIME(@Param("datas") List<Map<String, Object>> datas);
+
 }
diff --git a/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java b/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java
index 04627f5..4ba9052 100644
--- a/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java
+++ b/vte-sysem/src/main/java/com/docus/server/vte/service/IVteService.java
@@ -1,16 +1,6 @@
 package com.docus.server.vte.service;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.client.api.IHospitalApi;
 
-import java.util.Date;
-import java.util.List;
-
-public interface IVteService {
-    List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize);
+public interface IVteService extends IHospitalApi {
 }
diff --git a/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java b/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java
index 67ff142..5f6df8c 100644
--- a/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java
+++ b/vte-sysem/src/main/java/com/docus/server/vte/service/impl/VteServiceImpl.java
@@ -1,40 +1,44 @@
 package com.docus.server.vte.service.impl;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.docus.server.vte.infrastructure.mapper.VteDeptMapper;
-import com.docus.server.vte.infrastructure.mapper.VteTBasicMapper;
-import com.docus.server.vte.infrastructure.mapper.VteUserMapper;
 import com.docus.server.vte.service.IVteService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Component
 @AllArgsConstructor
 public class VteServiceImpl implements IVteService {
 
-    private final VteDeptMapper hisDeptMapper;
-    private final VteUserMapper hisUserMapper;
-    private final VteTBasicMapper hisTBasicMapper;
+    private final VteDeptMapper vteDeptMapper;
 
     @Override
-    public List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> page(Date startDate, Date endDate, int pageNum, int pageSize) {
+        return vteDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
     }
 
+    @Override
+    public List<Map<String, Object>> BatchForJZH(List<String> jzhs) {
+        return vteDeptMapper.BatchForJZH(jzhs);
+    }
+
+    @Override
+    public List<Map<String, Object>> BatchForJZHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return vteDeptMapper.BatchForJZHAndAdmissTimes(datas);
+    }
 
     @Override
-    public List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForZYHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return vteDeptMapper.BatchForZYHAndAdmissTimes(datas);
     }
 
     @Override
-    public List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForEXAMTIME(List<Map<String, Object>> datas) {
+        return vteDeptMapper.BatchForEXAMTIME(datas);
     }
 
+
 }
diff --git a/vte-sysem/src/main/resources/mapper/VteDeptMapper.xml b/vte-sysem/src/main/resources/mapper/VteDeptMapper.xml
index 7121829..7a8d88f 100644
--- a/vte-sysem/src/main/resources/mapper/VteDeptMapper.xml
+++ b/vte-sysem/src/main/resources/mapper/VteDeptMapper.xml
@@ -4,13 +4,144 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.vte.infrastructure.mapper.VteDeptMapper">
 
-    <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
-        WHERE  update_time between #{startDate}  and  #{endDate}
-        order by update_time asc
+    <!--根据更新时间分页查询-->
+    <select id="page" resultType="java.util.Map">
+        SELECT DISTINCT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND AFFIRM_TIME <![CDATA[ > ]]> #{startDate}
+        AND AFFIRM_TIME <![CDATA[ <= ]]> #{endDate}
+        ORDER BY
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC
         LIMIT #{offset}, #{pageSize}
     </select>
 
+    <!--根据jzh取得所需采集的批量数据-->
+    <select id="BatchForJZH" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND JZH IN
+        <foreach item="item" index="index" collection="jzhs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+    <!--记账号+住院次数-->
+    <select id="BatchForJZHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (JZH =#{item.FVISIT_ID} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForZYHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForEXAMTIME" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and EXAM_TIME <![CDATA[ >= ]]>  STR_TO_DATE(#{item.admiss_date})
+            <if test="item.dis_date != null">
+                and EXAM_TIME <![CDATA[ <= ]]> STR_TO_DATE(#{item.dis_date})
+            </if>
+        </foreach>
+        )
+    </select>
+
 
     <!--  mysql
     <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
diff --git a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzDeptMapper.java b/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzDeptMapper.java
index f4dbb64..6132acb 100644
--- a/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzDeptMapper.java
+++ b/zz-sysem/src/main/java/com/docus/server/zz/infrastructure/mapper/ZzDeptMapper.java
@@ -1,22 +1,31 @@
 package com.docus.server.zz.infrastructure.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.docus.server.zz.common.DSKeyConstants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @DS(DSKeyConstants.DS_KEY)
 public interface ZzDeptMapper {
 
-    List<DeptDTO> getDeptListView(@Param("startDate") Date startDate,
-                                  @Param("endDate") Date endDate,
-                                  @Param("offset") int offset,
-                                  @Param("pageSize") int pageSize);
+    List<Map<String, Object>> page(@Param("startDate") Date startDate,
+                                   @Param("endDate") Date endDate,
+                                   @Param("offset") int offset,
+                                   @Param("pageSize") int pageSize);
+
+
+    List<Map<String, Object>> BatchForJZH(@Param("jzhs") List<String> jzhs);
+
+    List<Map<String, Object>> BatchForJZHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForZYHAndAdmissTimes(@Param("datas") List<Map<String, Object>> datas);
+
+    List<Map<String, Object>> BatchForEXAMTIME(@Param("datas") List<Map<String, Object>> datas);
 
 
 }
diff --git a/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java b/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java
index 8cacf2e..c820b66 100644
--- a/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java
+++ b/zz-sysem/src/main/java/com/docus/server/zz/service/IZzService.java
@@ -1,16 +1,6 @@
 package com.docus.server.zz.service;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.client.api.IHospitalApi;
 
-import java.util.Date;
-import java.util.List;
-
-public interface IZzService {
-    List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize);
-
-    List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize);
+public interface IZzService extends IHospitalApi {
 }
diff --git a/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java b/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java
index 3540f25..3b34416 100644
--- a/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java
+++ b/zz-sysem/src/main/java/com/docus/server/zz/service/impl/ZzServiceImpl.java
@@ -1,40 +1,45 @@
 package com.docus.server.zz.service.impl;
 
-import com.docus.server.record.common.pojo.dto.TBasicDTO;
-import com.docus.server.sys.common.pojo.dto.DeptDTO;
-import com.docus.server.sys.common.pojo.dto.UserDTO;
+import com.docus.server.zz.common.DSKeyConstants;
 import com.docus.server.zz.infrastructure.mapper.ZzDeptMapper;
-import com.docus.server.zz.infrastructure.mapper.ZzTBasicMapper;
-import com.docus.server.zz.infrastructure.mapper.ZzUserMapper;
 import com.docus.server.zz.service.IZzService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
-@Component
+@Component(DSKeyConstants.DS_KEY + "ServiceImpl")
 @AllArgsConstructor
 public class ZzServiceImpl implements IZzService {
 
-    private final ZzDeptMapper hisDeptMapper;
-    private final ZzUserMapper hisUserMapper;
-    private final ZzTBasicMapper hisTBasicMapper;
+    private final ZzDeptMapper zzDeptMapper;
 
     @Override
-    public List<DeptDTO> getDeptListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisDeptMapper.getDeptListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> page(Date startDate, Date endDate, int pageNum, int pageSize) {
+        return zzDeptMapper.page(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
     }
 
+    @Override
+    public List<Map<String, Object>> BatchForJZH(List<String> jzhs) {
+        return zzDeptMapper.BatchForJZH(jzhs);
+    }
+
+    @Override
+    public List<Map<String, Object>> BatchForJZHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return zzDeptMapper.BatchForJZHAndAdmissTimes(datas);
+    }
 
     @Override
-    public List<UserDTO> getUserListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisUserMapper.getUserListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForZYHAndAdmissTimes(List<Map<String, Object>> datas) {
+        return zzDeptMapper.BatchForZYHAndAdmissTimes(datas);
     }
 
     @Override
-    public List<TBasicDTO> getTBasicListView(Date startDate, Date endDate, int pageNum, int pageSize) {
-        return hisTBasicMapper.getTBasicListView(startDate, endDate, (pageNum - 1) * pageSize, pageSize);
+    public List<Map<String, Object>> BatchForEXAMTIME(List<Map<String, Object>> datas) {
+        return zzDeptMapper.BatchForEXAMTIME(datas);
     }
 
+
 }
diff --git a/zz-sysem/src/main/resources/mapper/ZzDeptMapper.xml b/zz-sysem/src/main/resources/mapper/ZzDeptMapper.xml
index 7e244f1..b4f27ea 100644
--- a/zz-sysem/src/main/resources/mapper/ZzDeptMapper.xml
+++ b/zz-sysem/src/main/resources/mapper/ZzDeptMapper.xml
@@ -4,13 +4,143 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.docus.server.zz.infrastructure.mapper.ZzDeptMapper">
 
-    <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">
-        SELECT `update_time` as update_time ,`dept_code` as dept_code,`dept_name` as dept_name FROM `his_dept`
-        WHERE  update_time between #{startDate}  and  #{endDate}
-        order by update_time asc
+    <!--根据更新时间分页查询-->
+    <select id="page" resultType="java.util.Map">
+        SELECT DISTINCT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND AFFIRM_TIME <![CDATA[ > ]]> #{startDate}
+        AND AFFIRM_TIME <![CDATA[ <= ]]> #{endDate}
+        ORDER BY
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') DESC
         LIMIT #{offset}, #{pageSize}
     </select>
 
+    <!--根据jzh取得所需采集的批量数据-->
+    <select id="BatchForJZH" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        AND JZH IN
+        <foreach item="item" index="index" collection="jzhs" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
+    <!--记账号+住院次数-->
+    <select id="BatchForJZHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (JZH =#{item.FVISIT_ID} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForZYHAndAdmissTimes" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and ADMISS_TIMES=#{item.ADMISS_TIMES}) or
+        </foreach>
+        )
+    </select>
+    <select id="BatchForEXAMTIME" resultType="java.util.Map">
+        SELECT
+        '6' AS SYS_CODE,
+        ZYH AS ZYH,
+        JZH AS FVISIT_ID,
+        FILE_NAME AS REPORT_NAME,
+        '' AS BGLX,
+        '1503577916225949698' AS ASSORTID,
+        EXAM_NO AS RP_EXAM_NO,
+        1 AS PATH_TYPE,
+        FILE_PATHFILE_PATH AS FILE_PATH,
+        0 AS ISDELETE,
+        0 AS state,
+        '' AS jch,
+        '' AS checktime,
+        date_format(AFFIRM_TIME, '%Y-%m-%d %H:%i:%s') AS MODIFYTIME
+        FROM
+        V_JSWZH_LISRECORD
+        WHERE
+        1 = 1
+        and (
+        <foreach item="item" index="index" collection="datas" open="(" separator="," close=")">
+            (ZYH =#{item.ZYH} and EXAM_TIME <![CDATA[ >= ]]>  STR_TO_DATE(#{item.admiss_date})
+            <if test="item.dis_date != null">
+                and EXAM_TIME <![CDATA[ <= ]]> STR_TO_DATE(#{item.dis_date})
+            </if>
+        </foreach>
+        )
+    </select>
 
     <!--  mysql
     <select id="getDeptListView" resultType="com.docus.server.sys.common.pojo.dto.DeptDTO">