From 69f2603413410a79afc0523b6e88b62b8e830665 Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Mon, 2 May 2022 10:10:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A2=85=E5=B7=9E=E5=A2=9E=E5=8A=A0=E6=8C=89jz?=
 =?UTF-8?q?h=E6=9F=A5=E4=BB=BB=E5=8A=A1=E8=A7=86=E5=9B=BE=E8=A1=A5?=
 =?UTF-8?q?=E5=81=BF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/docus/bgts/service/MzSyncService.java | 20 ++++++++++++++++---
 src/main/resources/application.yml            |  1 +
 .../mapper/dbmysql/TScanAssortMapper.xml      | 15 +++++++-------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/docus/bgts/service/MzSyncService.java b/src/main/java/com/docus/bgts/service/MzSyncService.java
index 0ea5e72..80e55a4 100644
--- a/src/main/java/com/docus/bgts/service/MzSyncService.java
+++ b/src/main/java/com/docus/bgts/service/MzSyncService.java
@@ -1,6 +1,5 @@
 package com.docus.bgts.service;
 
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.docus.bgts.entity.*;
 import com.docus.bgts.enums.Codes;
@@ -173,7 +172,6 @@ public class MzSyncService implements IMzSyncService {
         if (mzSyncs.size() != 0) {
             //List<Map> maps = afCollectAddMapper.integrality(mzSyncs);
             List<Map> maps = verifyIntegrity(mzSyncs,jzhs);
-            System.out.println(maps);
             sql = new StringBuilder();
             for (Map map : maps) {
                 sql.append("update docus_medicalrecord.t_basic set integrity_desc=");
@@ -209,13 +207,20 @@ public class MzSyncService implements IMzSyncService {
             String jzh = mzSync.getJzh();
             //遍历任务试图文件集合
             List<MzSyncDetails> mzSyncDetails = mzSync.getMzSyncDetails();
+            //定义是否存在
+            boolean recordFlag = false;
             //定义缺失文件集合
             StringBuilder faultFileTitles = new StringBuilder();
             for(MzSyncDetails mzSyncDetail : mzSyncDetails){
                 //获取文件名称
                 String fileTitle = mzSyncDetail.getFileTitle();
+                if(StringUtils.isNotBlank(fileTitle) && fileTitle.contains("急诊病历")){
+                    recordFlag = true;
+                }
                 //获取文件序列号
                 String serialnum = mzSyncDetail.getSerialnum();
+                //获取采集器标识
+                String collectid = mzSyncDetail.getCollectid();
                 //定义是否存在
                 boolean flag = false;
                 if(!CollectionUtils.isEmpty(fileList)){
@@ -227,7 +232,9 @@ public class MzSyncService implements IMzSyncService {
                             for(MzSyncDetails vo : mzSyncDetails1){
                                 //获取文件序列号
                                 String serialnum1 = vo.getSerialnum();
-                                if(vo.getFileTitle().equals(fileTitle)){
+                                //获取采集器标识
+                                String collectid1 = vo.getCollectid();
+                                if(serialnum.equals(serialnum1) && collectid.equals(collectid1)){
                                     flag = true;
                                     mzSyncDetail.setCollectid(vo.getCollectid());
                                     break;
@@ -246,6 +253,13 @@ public class MzSyncService implements IMzSyncService {
                     updateFile(jzh,mzSyncDetail);
                 }
             }
+            //添加急诊病历缺失
+            if(!recordFlag){
+                if(StringUtils.isNotBlank(faultFileTitles)){
+                    faultFileTitles.append(",");
+                }
+                faultFileTitles.append("急诊病历缺失");
+            }
             if(StringUtils.isBlank(faultFileTitles)){
                 faultFileTitles = new StringBuilder("完整");
             }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 61ece28..d51518e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -27,6 +27,7 @@ spring:
       url: jdbc:mysql://db.docus.cn:3306/docus_archivefile?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&allowMultiQueries=true
     oracle-docus:
       driver-class-name: oracle.jdbc.driver.OracleDriver
+#      url: jdbc:oracle:thin:@localhost:1521:ORCL
       url: jdbc:oracle:thin:@192.168.117.100:1521:helowin
       username: docus
       password: docus702
diff --git a/src/main/resources/mapper/dbmysql/TScanAssortMapper.xml b/src/main/resources/mapper/dbmysql/TScanAssortMapper.xml
index ec97535..fc09aa6 100644
--- a/src/main/resources/mapper/dbmysql/TScanAssortMapper.xml
+++ b/src/main/resources/mapper/dbmysql/TScanAssortMapper.xml
@@ -4,21 +4,22 @@
     <!--根据记账号集合查询文件信息集合-->
     <select id="selectFilesByJzhs" resultMap="mzSyncAnddeI">
         SELECT
-        jzh,
-        file_title,
-        source serialnum
+        C3 jzh,
+        sysflag collectid,
+        c1 serialnum,
+        c2 fileTitle
         FROM
-        t_scan_assort
-        INNER JOIN docus_medicalrecord.t_basic t_basic ON t_scan_assort.patient_id = t_basic.patient_id
+        af_collect_task
         WHERE
-        t_scan_assort.is_del != 1
-        AND jzh IN  <foreach collection="jzhs" item="jzh" close=")" open="(" separator=",">#{jzh}</foreach>
+        state = '3'
+        AND C3 IN  <foreach collection="jzhs" item="jzh" close=")" open="(" separator=",">#{jzh}</foreach>
     </select>
     <resultMap id="mzSyncAnddeI" type="com.docus.bgts.entity.MzSync">
         <result property="jzh" column="jzh"></result>
         <collection property="mzSyncDetails" ofType="com.docus.bgts.entity.MzSyncDetails">
             <result property="serialnum" column="serialnum"></result>
             <result property="fileTitle" column="file_title"></result>
+            <result property="collectid" column="collectid"></result>
         </collection>
     </resultMap>
 </mapper>