From 81c2922b03e420d8ee0eacb78706047223073dcf Mon Sep 17 00:00:00 2001
From: lzy <qQ123456>
Date: Mon, 28 Feb 2022 15:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A2=85=E5=B7=9E=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/docus/bgts/handler/TBasicWebService.java  | 2 ++
 .../com/docus/bgts/service/AfCollectTaskServiceImpl.java    | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/docus/bgts/handler/TBasicWebService.java b/src/main/java/com/docus/bgts/handler/TBasicWebService.java
index f5b31cf..5fe79a8 100644
--- a/src/main/java/com/docus/bgts/handler/TBasicWebService.java
+++ b/src/main/java/com/docus/bgts/handler/TBasicWebService.java
@@ -170,10 +170,12 @@ public class TBasicWebService implements ITBasicWebService {
         } catch (RuntimeException e) {
             e.printStackTrace();
             mrReportErrorService.insert(xml);
+            logger.error(e.getMessage());
             return ResultUtils.fail(e.getMessage());
         } catch (Exception e) {
             e.printStackTrace();
             mrReportErrorService.insert(xml);
+            logger.error(e.getMessage());
             return ResultUtils.fail(e.getMessage());
         }
     }
diff --git a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
index 1353c7e..49b53e2 100644
--- a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
+++ b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java
@@ -72,7 +72,7 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
         for (ReportDownScanFileDto scanfile : scanfiles) {
             // 判断任务是否已存在
             afCollectTask = afCollectTaskMapper.selectOne(new QueryWrapper<AfCollectTask>().eq("C1", scanfile.getSerialnum()).eq("sysflag", reportDownDto.getCollectorid()));
-            if (afCollectTask == null) {
+            if (afCollectTask == null || afCollectTask.getId() == null) {
                 //不存在 新增
                 afCollectTask = new AfCollectTask();
                 afCollectTask.setPatientId(patientId);
@@ -99,9 +99,9 @@ public class AfCollectTaskServiceImpl extends ServiceImpl<AfCollectTaskMapper, A
                 log.info("任务表操作出错");
                 throw new RuntimeException("插入病案任务表数据出错");
             }
-            if(afCollectTask.getId()!=null){
+            if (afCollectTask.getId() != null) {
                 scanfile.setTaskid(afCollectTask.getId());
-            }else {
+            } else {
                 log.info("插入任务id为空！");
                 throw new RuntimeException("插入任务id为空");
             }