From ec311f57aaa569f635ef968d4354a07ff5704155 Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Sat, 12 Oct 2024 14:04:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8B=B1=E5=BE=B7=E4=B8=AD=E5=8C=BB?=
 =?UTF-8?q?=E9=99=A2=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=87=8D=E9=87=87pacs?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=8D=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docus/server/ydzyy/dto/YdZyyPacsViewCondition.java |  5 +++++
 .../com/docus/server/ydzyy/job/PacsCollectJob.java     | 10 ++++++++++
 src/main/resources/mapper/YdZyyPacsViewMapper.xml      |  3 +++
 3 files changed, 18 insertions(+)

diff --git a/src/main/java/com/docus/server/ydzyy/dto/YdZyyPacsViewCondition.java b/src/main/java/com/docus/server/ydzyy/dto/YdZyyPacsViewCondition.java
index 8c287b7..816d5ba 100644
--- a/src/main/java/com/docus/server/ydzyy/dto/YdZyyPacsViewCondition.java
+++ b/src/main/java/com/docus/server/ydzyy/dto/YdZyyPacsViewCondition.java
@@ -37,4 +37,9 @@ public class YdZyyPacsViewCondition {
      * 身份证号码
      */
     private String idCard;
+
+    /**
+     * 报告唯一值
+     */
+    private String remark;
 }
diff --git a/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java b/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java
index 3302f36..045ca65 100644
--- a/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java
+++ b/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java
@@ -194,6 +194,16 @@ public class PacsCollectJob {
                 List<AfCollectTask> reCollectTask = tasks.stream().filter(task -> !notReCollectState.contains(task.getState())).collect(Collectors.toList());
                 for (AfCollectTask task : reCollectTask) {
                     String remark = task.getC1();
+                    YdZyyPacsViewCondition viewCondition = new YdZyyPacsViewCondition();
+                    viewCondition.setRemark(remark);
+                    List<YdZyyPacsView> pacsViews = ydZyyPacsViewMapper.pacsViews(viewCondition);
+                    if(Func.isEmpty(pacsViews)){
+                        tBasicMapper.delTaskById(task.getId());
+                        tBasicMapper.flushPatTaskEndTime (patientId, Func.formatDateTime(new Date()));
+                        log.warn("remark:{} ,patientId:{} 视图已经不存在pacs报告信息,删除任务！", remark,patientId);
+                        continue;
+                    }
+
                     String base64 = ydZyyPacsService.getJpgReportBase64(remark);
                     if (Func.isBlank(base64)) {
                         log.info("remark:{} 获取pacs图片报告base64失败！", remark);
diff --git a/src/main/resources/mapper/YdZyyPacsViewMapper.xml b/src/main/resources/mapper/YdZyyPacsViewMapper.xml
index 5f6afa5..dd99d91 100644
--- a/src/main/resources/mapper/YdZyyPacsViewMapper.xml
+++ b/src/main/resources/mapper/YdZyyPacsViewMapper.xml
@@ -40,6 +40,9 @@
         <if test="condition.idCard != null and condition.idCard != ''">
             and IDCARD = #{condition.idCard}
         </if>
+        <if test="condition.remark != null and condition.remark != ''">
+            and REMARK=#{condition.remark}
+        </if>
         order by CREATETIMESTR asc
     </select>
 </mapper>