feat: 梅州三院同步科室，nacos依赖去除，配置暂留

1 month ago · 36af870240
parent 8bac6fdc54
commit 36af870240
9 changed files with 117 additions and 39 deletions
--- a/pom.xml
+++ b/pom.xml
@ -23,21 +23,7 @@
            <version>2.5.1</version>
        </dependency>

-        <!--配置中心客户端-->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>checker-qual</artifactId>
-                    <groupId>org.checkerframework</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>error_prone_annotations</artifactId>
-                    <groupId>com.google.errorprone</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
@ -53,21 +39,7 @@
            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
            <version>3.4.0</version>
        </dependency>
-        <!--nacos-->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>HdrHistogram</artifactId>
-                    <groupId>org.hdrhistogram</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jsr305</artifactId>
-                    <groupId>com.google.code.findbugs</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
--- a/src/main/java/com/docus/server/AppRunBootstrap.java
+++ b/src/main/java/com/docus/server/AppRunBootstrap.java
@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;

 import java.util.Properties;

@ -16,7 +15,6 @@ import java.util.Properties;
@Slf4j
@SpringBootApplication(scanBasePackages ={"com.docus"})
@MapperScan("com.docus.server.**.mapper")
-@EnableFeignClients(basePackages = {"com.docus"})
 public class AppRunBootstrap {
    public static void main(String[] args) {
        Properties props = System.getProperties();
--- a/src/main/java/com/docus/server/archive/entity/TBasicZkInfo.java
+++ b/src/main/java/com/docus/server/archive/entity/TBasicZkInfo.java
@ -0,0 +1,49 @@
+package com.docus.server.archive.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 转科信息
+ *
+ * @author YongBin Wen
+ * @date 2024/4/9 13:53
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TBasicZkInfo {
+    /**
+     * 主键
+     **/
+    private Long id;
+    /**
+     * 病案主键
+     **/
+    private String patientId;
+    /**
+     * 转出科室编号
+     **/
+    private String outDeptCode;
+    /**
+     * 转出科室名称
+     **/
+    private String outDeptName;
+    /**
+     * 转出日期
+     **/
+    private Date outDate;
+    /**
+     * 转入科室编号
+     **/
+    private String inDeptCode;
+    /**
+     * 转入科室名称
+     **/
+    private String inDeptName;
+    /**
+     * 数据创建时间
+     **/
+    private Date createTime;
+}
--- a/src/main/java/com/docus/server/archive/mapper/TBasicMapper.java
+++ b/src/main/java/com/docus/server/archive/mapper/TBasicMapper.java
@ -2,6 +2,7 @@ package com.docus.server.archive.mapper;


 import com.docus.server.archive.entity.TBasic;
+import com.docus.server.archive.entity.TBasicZkInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

@ -24,4 +25,7 @@ public interface TBasicMapper {

    int updateExtend(@Param("basicList") List<TBasic> basicList);

+    int delZkInfo(@Param("patientId") String patientId);
+
+    int addZkInfo(@Param("basicZkList") List<TBasicZkInfo> tBasicZkInfoList);
 }
--- a/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java
+++ b/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java
@ -7,6 +7,7 @@ import com.docus.server.archive.constans.SyncConstant;
 import com.docus.server.archive.converter.MzsyPatientInfoConverter;
 import com.docus.server.archive.entity.PowerUser;
 import com.docus.server.archive.entity.TBasic;
+import com.docus.server.archive.entity.TBasicZkInfo;
 import com.docus.server.archive.mapper.PowerUserMapper;
 import com.docus.server.archive.mapper.TBasicMapper;
 import com.docus.server.archive.service.PatientInfoSyncService;
@ -53,7 +54,7 @@ public class MzsyPatientInfoSyncServiceImpl implements PatientInfoSyncService {
    public void syncByModifyTimeAndCyrq(String cyrqStart, String startTime) {
        int size = 1000;
        int pageNumber = 1;
-        log.info("参数"+cyrqStart+startTime);
+        log.info("参数" + cyrqStart + startTime);
        while (true) {
            List<MzsyPatientInfoView> patientInfoViews = mzsyPatientInfoViewMapper.pageByViwe(cyrqStart, startTime, pageNumber, size);
            if (Func.isNotEmpty(patientInfoViews)) {
@ -62,11 +63,11 @@ public class MzsyPatientInfoSyncServiceImpl implements PatientInfoSyncService {
                        .collect(Collectors.toList());
                List<String> collect = basicList.stream().map(TBasic::getAttending).collect(Collectors.toList());
                List<PowerUser> byUserNames = powerUserMapper.findByUserNames(collect);
-                if(ObjectUtil.isNotEmpty(byUserNames)){
+                if (ObjectUtil.isNotEmpty(byUserNames)) {
                    Map<String, String> map = byUserNames.stream().collect(Collectors.toMap(PowerUser::getUserName, PowerUser::getName));
                    for (TBasic tBasic : basicList) {
                        String attending = tBasic.getAttending();
-                        if(ObjectUtil.isNotEmpty(attending)) {
+                        if (ObjectUtil.isNotEmpty(attending)) {
                            tBasic.setAttendingName(map.get(attending));
                        }
                    }
@ -125,7 +126,7 @@ public class MzsyPatientInfoSyncServiceImpl implements PatientInfoSyncService {
                tBasic.setFileSource(iuBasic.getFileSource());
                tBasic.setUpdateTime(nowDate);
                updateBasicList.add(tBasic);
-                if(ObjectUtil.isNotEmpty(iuBasic.getLeaveMethod())){
+                if (ObjectUtil.isNotEmpty(iuBasic.getLeaveMethod())) {
                    tBasic.setLeaveMethod(iuBasic.getLeaveMethod());
                    leaveMethodList.add(tBasic);
                }
@ -135,7 +136,7 @@ public class MzsyPatientInfoSyncServiceImpl implements PatientInfoSyncService {
            iuBasic.setCreateTime(nowDate);
            iuBasic.setUpdateTime(nowDate);
            iuBasic.setIsArchive(0);
-            if(ObjectUtil.isNotEmpty(iuBasic.getLeaveMethod())){
+            if (ObjectUtil.isNotEmpty(iuBasic.getLeaveMethod())) {
                leaveMethodList.add(iuBasic);
            }
            insertBasicList.add(iuBasic);
@ -143,12 +144,38 @@ public class MzsyPatientInfoSyncServiceImpl implements PatientInfoSyncService {

        if (Func.isNotEmpty(insertBasicList)) {
            tBasicMapper.insertBatch(insertBasicList);
+            syncZkInfo(insertBasicList);
        }
        if (Func.isNotEmpty(updateBasicList)) {
            tBasicMapper.updateBatch(updateBasicList);
+            syncZkInfo(updateBasicList);
        }
        if (Func.isNotEmpty(leaveMethodList)) {
            tBasicMapper.updateExtend(leaveMethodList);
        }
    }
+
+    /**
+     * 同步转科信息
+     */
+    private void syncZkInfo(List<TBasic> tBasicList) {
+        try {
+            for (TBasic tBasic : tBasicList) {
+                List<TBasicZkInfo> tBasicZkInfoList = mzsyPatientInfoViewMapper.listZkInfo(tBasic.getJzh());
+                if (Func.isNotEmpty(tBasicZkInfoList)) {
+                    tBasicMapper.delZkInfo(tBasic.getPatientId());
+                    for (TBasicZkInfo tBasicZkInfo : tBasicZkInfoList) {
+                        tBasicZkInfo.setId(idService.getDateSeq());
+                        tBasicZkInfo.setPatientId(tBasic.getPatientId());
+                        tBasicZkInfo.setCreateTime(new Date());
+                    }
+                    tBasicMapper.addZkInfo(tBasicZkInfoList);
+                }
+            }
+        } catch (Exception e) {
+            log.error("添加转科信息出错了：" + e.getMessage(), e);
+        }
+
+    }
+
 }
--- a/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java
+++ b/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java
@ -1,6 +1,7 @@
 package com.docus.server.mzsy.mapper;

 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.docus.server.archive.entity.TBasicZkInfo;
 import com.docus.server.mzsy.entity.MzsyPatientInfoView;
 import org.apache.ibatis.annotations.Param;

@ -17,5 +18,5 @@ public interface MzsyPatientInfoViewMapper {
    List<MzsyPatientInfoView> pageByViwe(@Param("cyrqStart") String cyrqStart,@Param("startTime") String startTime,@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);


-
+    List<TBasicZkInfo> listZkInfo(@Param("jzh") String jzh);
 }
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@ -133,11 +133,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: nacos.docus.cn
+        server-addr: nacos.docus.cn:8848
        namespace: 34acdf7a-9fc6-4bbd-8aea-9a47c8007ad5
+        username: nacos
+        password: docus@702docus@702
      config:
        server-addr: ${spring.cloud.nacos.discovery.server-addr}
        namespace: 34acdf7a-9fc6-4bbd-8aea-9a47c8007ad5
+        username: nacos
+        password: docus@702docus@702
        file-extension: yml
        shared-configs:
          - comm.${spring.cloud.nacos.config.file-extension}
--- a/src/main/resources/mapper/MzsyPatientInfoViewMapper.xml
+++ b/src/main/resources/mapper/MzsyPatientInfoViewMapper.xml
@ -13,4 +13,14 @@
        WHERE v.ROWNUMBER BETWEEN ${(pageNum-1)*pageSize+1}
        AND ${pageNum*pageSize}
    </select>
+    <select id="listZkInfo" resultType="com.docus.server.archive.entity.TBasicZkInfo">
+        select jzh
+                out_dept_code as outDeptCode,
+                out_dept_name as outDeptName,
+                out_date as outDate,
+                in_dept_code as inDeptCode,
+                in_dept_name as inDeptName
+        from dbo.V_JSWZH_BASE_ZK
+        where jzh = #{jzh}
+    </select>
 </mapper>
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@ -26,6 +26,16 @@
                )
            </foreach>
    </insert>
+    <insert id="addZkInfo">
+        INSERT INTO docus_medicalrecord.t_basic_zk_info
+            (id, patient_id, out_dept_code, out_dept_name, out_date, in_dept_code, in_dept_name, create_time)
+        VALUES
+            <foreach collection="basicZkList" separator="," item="zk">
+                (
+                 #{zk.id},#{zk.patientId},#{zk.outDeptCode},#{zk.outDeptName},#{zk.outDate},#{zk.inDeptCode},#{zk.inDeptName},#{zk.createTime}
+                )
+            </foreach>
+    </insert>
    <update id="updateBatch">
        <foreach collection="basicList"  item="basic">
          UPDATE  `docus_medicalrecord`.`t_basic`
@ -51,6 +61,9 @@
            leave_method=#{basic.leaveMethod};
        </foreach>
    </update>
+    <delete id="delZkInfo">
+        delete from docus_medicalrecord.t_basic_zk_info where patient_id = #{patientId}
+    </delete>

    <select id="getByJzh" resultType="com.docus.server.archive.entity.TBasic">
        select `patient_id`, `admiss_times`, `inpatient_no`,  `name`, `name_spell`,