扫描同步-未完成-临时

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>docus-webservice-gdszy</artifactId>
+    <artifactId>docus-collect-gdszy-patient-scan</artifactId>
     <dependencies>
 
         <dependency>
@@ -47,10 +47,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
+
-            <groupId>com.docus</groupId>
-            <artifactId>docus-mybatisplus-starter</artifactId>
-        </dependency>
         <!--nacos-->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -99,6 +96,17 @@
             <version>3.4.1</version>
             <scope>compile</scope>
         </dependency>
+        <!--mybatis plus-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.4.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
@@ -173,7 +181,12 @@
             <scope>test</scope>
         </dependency>
 
-
+        <!--sqlserver驱动-->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>sqljdbc4</artifactId>
+            <version>4.0</version>
+        </dependency>
     </dependencies>
     <build>
         <resources>

src/main/java/com/docus/server/collect/controller/PatientScanController.java

@@ -0,0 +1,39 @@
+package com.docus.server.collect.controller;
+
+import com.docus.core.util.Func;
+import com.docus.infrastructure.web.api.CommonResult;
+import com.docus.server.collect.dto.PatientScanConditionDTO;
+import com.docus.server.collect.service.PatientScanService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 患者扫描控制层
+ *
+ * @author wyb
+ */
+@Api("患者扫描控制")
+@RestController
+@RequestMapping("/gdszy/patscan")
+public class PatientScanController {
+    @Resource
+    private PatientScanService patientScanService;
+
+
+    @PostMapping("/collect/byInpatientNoAndTimes")
+    @ApiOperation("根据住院号和住院次数，进行患者电子病历扫描数据采集！")
+    public CommonResult<String> collectByInpatientNoAndTimes(@RequestBody List<PatientScanConditionDTO> patientScanConditionDTOList) {
+        if (Func.isEmpty(patientScanConditionDTOList)) {
+            return CommonResult.failed("请输入正确的请求参数！");
+        }
+        patientScanService.collectByInpatientNoAndTimes(patientScanConditionDTOList);
+        return CommonResult.success("采集成功！");
+    }
+}

src/main/java/com/docus/server/collect/dto/PatientScanConditionDTO.java

@@ -0,0 +1,23 @@
+package com.docus.server.collect.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 患者扫描条件
+ * @author wyb
+ */
+@Data
+@ApiModel("患者扫描条件传输对象")
+public class PatientScanConditionDTO {
+    @ApiModelProperty("住院号")
+    @NotBlank(message = "住院号不能为空!")
+    private String inpatientNo;
+
+    @ApiModelProperty("住院次数")
+    @NotBlank(message = "住院次数不能为空!")
+    private String admissTimes;
+}

src/main/java/com/docus/server/collect/entity/PatientScan.java

@@ -0,0 +1,50 @@
+package com.docus.server.collect.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 患者扫描数据  - pat_sm 视图
+ * @author wyb
+ */
+@ApiModel(value = "患者扫描数据", description = "患者扫描数据")
+@Data
+public class PatientScan implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "患者主键")
+    private String id;
+
+    @ApiModelProperty(value = "住院号")
+    private String inpatientNo;
+
+    @ApiModelProperty(value = "住院次数")
+    private String admissTimes;
+
+    @ApiModelProperty(value = "病人姓名")
+    private String name;
+
+    @ApiModelProperty(value = "出院日期")
+    private String disDate;
+
+    @ApiModelProperty(value = "图像路径")
+    private String imagePath;
+
+    @ApiModelProperty(value = "文件名")
+    private String  fileName;
+
+    @ApiModelProperty(value = "分段名称")
+    private String zdAssortName;
+
+    @ApiModelProperty(value = "分类id")
+    private String zdAssortId;
+
+    @ApiModelProperty(value = "扫描日期")
+    private String scanDate;
+
+    @ApiModelProperty(value = "扫描盘号")
+    private String ph;
+}

src/main/java/com/docus/server/collect/infrastructure/mapper/CollectTaskMapper.java

@@ -0,0 +1,12 @@
+package com.docus.server.collect.infrastructure.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author wyb
+ */
+@DS("archive-mysql")
+@Mapper
+public interface CollectTaskMapper {
+}

src/main/java/com/docus/server/collect/infrastructure/mapper/DownloadTaskMapper.java

@@ -1,5 +1,6 @@
 package com.docus.server.collect.infrastructure.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.docus.server.collect.dto.TBasicQrDto;
 import com.docus.server.collect.entity.DownloadTask;
@@ -9,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+@DS("archive-mysql")
 @Mapper
 public interface DownloadTaskMapper extends BaseMapper<DownloadTask> {
     /**

src/main/java/com/docus/server/collect/infrastructure/mapper/PatientBasicMapper.java

@@ -0,0 +1,12 @@
+package com.docus.server.collect.infrastructure.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author wyb
+ */
+@DS("archive-mysql")
+@Mapper
+public interface PatientBasicMapper {
+}

src/main/java/com/docus/server/collect/infrastructure/mapper/PatientScanMapper.java

@@ -0,0 +1,36 @@
+package com.docus.server.collect.infrastructure.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.docus.server.collect.dto.PatientScanConditionDTO;
+import com.docus.server.collect.entity.PatientScan;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 患者扫描数据mapper
+ * @author wyb
+ */
+@DS("scan-sqlserver")
+@Mapper
+public interface PatientScanMapper {
+
+    /**
+     * 根据住院号和住院次数条件，查询扫描的文件数据
+     * @param patientScanConditionDto 住院号和住院次数条件
+     * @return 该患者的扫描病案
+     */
+    List<PatientScan> getScanData(@Param("dto") PatientScanConditionDTO patientScanConditionDto);
+
+
+    /**
+     * 根据扫描时间，查询住院号和住院次数条件
+     * @param scanStartTime 扫描时间开始时间
+     * @param scanEndTime 扫描时间结束时间
+     * @return 住院号和住院次数条件
+     */
+    List<PatientScanConditionDTO> getScanPatientCondition(@Param("start")String scanStartTime,@Param("end") String scanEndTime);
+
+
+}

src/main/java/com/docus/server/collect/service/PatientScanService.java

@@ -0,0 +1,23 @@
+package com.docus.server.collect.service;
+
+import com.docus.server.collect.dto.PatientScanConditionDTO;
+import com.docus.server.collect.entity.PatientScan;
+
+import java.util.List;
+
+/**
+ * @author wyb
+ */
+public interface PatientScanService {
+    /**
+     * 根据患者住院号和住院次数采集-批量
+     * @param patientScanConditionDTOList 患者扫描条件传输对象集合
+     */
+    void collectByInpatientNoAndTimes(List<PatientScanConditionDTO> patientScanConditionDTOList);
+
+    /**
+     * 根据患者住院号和住院次数采集-单个
+     * @param patientScanConditionDto 患者扫描条件传输对象
+     */
+    List<PatientScan> collectByInpatientNoAndTimes(PatientScanConditionDTO patientScanConditionDto);
+}

src/main/java/com/docus/server/collect/service/impl/PatientScanServiceImpl.java

@@ -0,0 +1,59 @@
+package com.docus.server.collect.service.impl;
+
+import com.docus.server.collect.dto.PatientScanConditionDTO;
+import com.docus.server.collect.entity.PatientScan;
+import com.docus.server.collect.infrastructure.mapper.DownloadTaskMapper;
+import com.docus.server.collect.infrastructure.mapper.PatientScanMapper;
+import com.docus.server.collect.service.PatientScanService;
+import groovy.util.logging.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wyb
+ */
+@Service
+@Slf4j
+public class PatientScanServiceImpl implements PatientScanService {
+    @Resource
+    private PatientScanMapper patientScanMapper;
+    @Override
+    public void collectByInpatientNoAndTimes(List<PatientScanConditionDTO> patientScanConditionDTOList) {
+        List<PatientScanConditionDTO> distinctPatientScanConditionDTOList = distinctForInpatientNoAndTimes(patientScanConditionDTOList);
+        for (PatientScanConditionDTO patientScanConditionDTO : distinctPatientScanConditionDTOList) {
+            collectByInpatientNoAndTimes(patientScanConditionDTO);
+        }
+    }
+
+
+    @Override
+    public List<PatientScan> collectByInpatientNoAndTimes(PatientScanConditionDTO patientScanConditionDto) {
+        return  patientScanMapper.getScanData(patientScanConditionDto);
+    }
+
+    /**
+     * 集合根据患者住院号和住院次数去重
+     *
+     * @param patientScanConditionDTOList 带患者住院号和住院次数条件
+     * @return 去重后的集合
+     */
+    private List<PatientScanConditionDTO> distinctForInpatientNoAndTimes(List<PatientScanConditionDTO> patientScanConditionDTOList) {
+        Map<String, String> duplicateValidators = new HashMap<>();
+        LinkedList<PatientScanConditionDTO> list = new LinkedList<>();
+        for (PatientScanConditionDTO dto : patientScanConditionDTOList) {
+            String key = dto.getInpatientNo() + "valid" + dto.getAdmissTimes();
+            // 病案号和住院次数生成key，根据哈希map的特性，去重
+            if (duplicateValidators.containsKey(key)) {
+                continue;
+            }
+            duplicateValidators.put(key, null);
+            list.add(dto);
+        }
+        return list;
+    }
+}

src/main/resources/bootstrap.yml

@@ -4,27 +4,56 @@ spring:
   application:
     name: @artifactId@
   datasource:
-    url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    dynamic:
-    username: docus
+      primary: archive-mysql
-    password: docus702
+      #是否用严格模式，如果启用在味匹配到指定数据源时抛出异常
-    driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+      strict: false
-    type: com.alibaba.druid.pool.DruidDataSource
+      datasource:
-    # 初始化配置
+        # 多数据源
-    initial-size: 3
+        archive-mysql:
-    # 最小连接数
+          url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    min-idle: 3
+          username: docus
-    # 最大连接数
+          password: docus702
-    max-active: 15
+          driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-    # 获取连接超 时时间
+          type: com.alibaba.druid.pool.DruidDataSource
-    max-wait: 5000
+          # 初始化配置
-    # 连接有效性检测时间
+          initial-size: 3
-    time-between-eviction-runs-millis: 90000
+          # 最小连接数
-    # 最大空闲时间
+          min-idle: 3
-    min-evictable-idle-time-millis: 1800000
+          # 最大连接数
-    test-while-idle: true
+          max-active: 15
-    test-on-borrow: false
+          # 获取连接超 时时间
-    test-on-return: false
+          max-wait: 5000
-    validation-query: select 1
+          # 连接有效性检测时间
+          time-between-eviction-runs-millis: 90000
+          # 最大空闲时间
+          min-evictable-idle-time-millis: 1800000
+          test-while-idle: true
+          test-on-borrow: false
+          test-on-return: false
+          validation-query: select 1
+        scan-sqlserver:
+          url: jdbc:sqlserver://192.168.16.103\DOCUS;DatabaseName=zj_power
+          username: sa
+          password: docus702
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+          type: com.alibaba.druid.pool.DruidDataSource
+          # 初始化配置
+          initial-size: 3
+          # 最小连接数
+          min-idle: 3
+          # 最大连接数
+          max-active: 15
+          # 获取连接超 时时间
+          max-wait: 5000
+          # 连接有效性检测时间
+          time-between-eviction-runs-millis: 90000
+          # 最大空闲时间
+          min-evictable-idle-time-millis: 1800000
+          test-while-idle: true
+          test-on-borrow: false
+          test-on-return: false
+          validation-query: select 1
 
   redis:
     host: redis.docus.cn
@@ -65,9 +94,9 @@ xxl:
     admin:
       addresses: http://job.docus.cn:8180/xxl-job-admin
     executor:
-      appname: docus-collect-gdszy
+      appname: docus-collect-gdszy-patient-scan
       address:
       ip:
       port: 19311
       logretentiondays: 30
-      logpath: D:/xxl-job/docus-collect-gdszy
+      logpath: D:/xxl-job/docus-collect-gdszy-patient-scan

src/main/resources/mapper/PatientScanMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.docus.server.collect.infrastructure.mapper.PatientScanMapper">
+
+    <select id="getScanData" resultType="com.docus.server.collect.entity.PatientScan">
+        select
+            主键 as id,
+            住院号 as inpatientNo,
+            次数 as admissTimes,
+            病人姓名 as name,
+            出院日期 as disDate,
+            图像路径 as imagePath,
+            文件名 as fileName,
+            分段名称 as zdAssortName,
+            分类id as zdAssortId,
+            扫描日期 as scanDate,
+            扫描盘号 as ph
+        from pat_sm
+        where
+            住院号=#{dto.inpatientNo}
+            and 次数=#{dto.admissTimes}
+            and 扫描盘号 like 'G%'
+    </select>
+    <select id="getScanPatientCondition" resultType="com.docus.server.collect.dto.PatientScanConditionDTO">
+        select 住院号 as inpatientNo,
+               次数  as admissTimes
+        from pat_sm
+        where 扫描日期 between #{start} and #{end}
+          and 扫描盘号 like 'G%'
+        group by 住院号, 次数
+    </select>
+
+
+</mapper>

src/main/resources/mapper/TBasicMapper.xml

@@ -19,26 +19,26 @@
 
     <select id="getBasicInfo" resultType="com.docus.server.collect.entity.TBasic">
         select
-            <include refid="basicInfoColumns"></include>
+        <include refid="basicInfoColumns"></include>
         FROM
-            `docus_medicalrecord`.`t_basic`
+        `docus_medicalrecord`.`t_basic`
         WHERE
-            is_cancel=0
+        is_cancel=0
-            <if test="basic.patientId != null and basic.patientId != ''">
+        <if test="basic.patientId != null and basic.patientId != ''">
-                and `patient_id` = #{basic.patientId}
+            and `patient_id` = #{basic.patientId}
-            </if>
+        </if>
-            <if test="basic.jzh != null and basic.jzh != ''">
+        <if test="basic.jzh != null and basic.jzh != ''">
-                and `jzh` = #{basic.jzh}
+            and `jzh` = #{basic.jzh}
-            </if>
+        </if>
-            <if test="basic.empId != null and basic.empId != ''">
+        <if test="basic.empId != null and basic.empId != ''">
-                and `emp_id` = #{basic.empId}
+            and `emp_id` = #{basic.empId}
-            </if>
+        </if>
-            <if test="basic.inpatientNo != null and basic.inpatientNo != ''">
+        <if test="basic.inpatientNo != null and basic.inpatientNo != ''">
-                and `inpatient_no` = #{basic.inpatientNo}
+            and `inpatient_no` = #{basic.inpatientNo}
-            </if>
+        </if>
-            <if test="basic.admisstimes != null">
+        <if test="basic.admisstimes != null">
-                and `admiss_times` = #{basic.admissTimes}
+            and `admiss_times` = #{basic.admissTimes}
-            </if>
+        </if>
         limit 2
     </select>