From b28de96d0b511d9495c223462aa1d374cae98b0c Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Mon, 23 Sep 2024 11:05:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8B=B1=E5=BE=B7=E4=B8=AD=E5=8C=BB?=
 =?UTF-8?q?=E9=99=A2pacs=E8=A1=A5=E5=81=BF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ydzyy/controller/ApiController.java       | 30 ++++++++++++++++---
 .../server/ydzyy/job/PacsCollectJob.java      |  2 +-
 src/main/resources/mapper/TBasicMapper.xml    |  2 +-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/docus/server/ydzyy/controller/ApiController.java b/src/main/java/com/docus/server/ydzyy/controller/ApiController.java
index ef0304f..3131c4a 100644
--- a/src/main/java/com/docus/server/ydzyy/controller/ApiController.java
+++ b/src/main/java/com/docus/server/ydzyy/controller/ApiController.java
@@ -2,29 +2,51 @@ package com.docus.server.ydzyy.controller;
 
 
 import com.docus.infrastructure.web.api.CommonResult;
+import com.docus.server.archive.entity.TBasic;
+import com.docus.server.archive.mapper.TBasicMapper;
 import com.docus.server.rpc.YdZyyPacsService;
+import com.docus.server.ydzyy.job.PacsCollectJob;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * api测试类
  */
 @RestController
 @RequestMapping("/ydzyyApi")
+@Api(tags = "英德中医院文件采集接口")
 public class ApiController {
     @Autowired
     private YdZyyPacsService pacsService;
+    @Autowired
+    private PacsCollectJob pacsCollectJob;
+    @Autowired
+    private TBasicMapper tBasicMapper;
 
     /**
      * 测试
      */
     @GetMapping("/pacs/xml")
+    @ApiOperation("pacs接口测试")
     public CommonResult<String> lisXmlTest(@RequestParam(name = "remark") String remark) {
         String base64 = pacsService.getJpgReportBase64(remark);
         return CommonResult.success(base64);
     }
 
+    /**
+     * 补采
+     */
+    @PostMapping("/pacs/collect")
+    @ApiOperation("pacs采集")
+    public CommonResult<String> collectPacs(@RequestBody List<String> patientIds) {
+        List<TBasic> basics = tBasicMapper.getTbasicByPatientIds(patientIds);
+        for (TBasic basic : basics) {
+            pacsCollectJob.collectPacs(basic);
+        }
+        return CommonResult.success("采集完成");
+    }
 }
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 6ee371c..961cb26 100644
--- a/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java
+++ b/src/main/java/com/docus/server/ydzyy/job/PacsCollectJob.java
@@ -182,7 +182,7 @@ public class PacsCollectJob {
         System.out.println(Func.formatDateTime(new Date()).substring(0, 10));
     }
 
-    private void collectPacs(TBasic basic) {
+    public void collectPacs(TBasic basic) {
         String collectorId = "3";
         String assortId = "AC2C8F4A88884DC894630302C61C6A07";
         String patientId = basic.getPatientId();
diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml
index 457080c..60f9af3 100644
--- a/src/main/resources/mapper/TBasicMapper.xml
+++ b/src/main/resources/mapper/TBasicMapper.xml
@@ -43,7 +43,7 @@
         where
         file_source = 1
         and   DATE_FORMAT(admiss_date, '%Y-%m-%d')  <![CDATA[ <= ]]>  #{sendDateStr}
-        and dis_date >=  #{sendDateStr}
+        and (dis_date >=  #{sendDateStr} or dis_date is null)
         and (id_card=#{idCard} or inpatient_no=#{inpatientNo})
     </select>
     <select id="getCollectTaskByPatAndSource" resultType="com.docus.server.archive.entity.AfCollectTask">