feat: 英德中医院pacs补偿接口

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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
+
-import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 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("采集完成");
+    }
 }

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();

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">