From 87c96c6a8be3f2d9a4033006378b3ecea7b17751 Mon Sep 17 00:00:00 2001
From: lzy <qQ123456>
Date: Fri, 3 Dec 2021 14:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docus-webservice/dataConfig/homeQualitySet.json             | 6 +++---
 .../com/docus/webservice/service/PcmachineServiceImpl.java  | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docus-webservice/dataConfig/homeQualitySet.json b/docus-webservice/dataConfig/homeQualitySet.json
index 36b6a68..8038652 100644
--- a/docus-webservice/dataConfig/homeQualitySet.json
+++ b/docus-webservice/dataConfig/homeQualitySet.json
@@ -11,14 +11,14 @@
       "serialNumber": "2",
       "tableName": "t_basic",
       "columnName": "emp_id",
-      "qualityColumn": "ACCOUNT_NUM",
+      "qualityColumn": "EMPI_ID",
       "byNull":0
     },
     {
       "serialNumber": "3",
       "tableName": "t_basic",
       "columnName": "admiss_id",
-      "qualityColumn": "INHOSP_INDEX_NO",
+      "qualityColumn": "ACCOUNT_NUM",
       "byNull":0
     },
     {
@@ -81,7 +81,7 @@
       "serialNumber": "12",
       "tableName": "t_basic",
       "columnName": "jzh",
-      "qualityColumn": "EMPI_ID",
+      "qualityColumn": "INHOSP_INDEX_NO",
       "byNull":0
     },
     {
diff --git a/docus-webservice/src/main/java/com/docus/webservice/service/PcmachineServiceImpl.java b/docus-webservice/src/main/java/com/docus/webservice/service/PcmachineServiceImpl.java
index 258e2d9..5541e8a 100644
--- a/docus-webservice/src/main/java/com/docus/webservice/service/PcmachineServiceImpl.java
+++ b/docus-webservice/src/main/java/com/docus/webservice/service/PcmachineServiceImpl.java
@@ -91,7 +91,9 @@ public class PcmachineServiceImpl implements IPcmachineService {
                 Integer task_count = JSON.parseObject(String.valueOf(jsonMap.get(Codes.JSON_TASK_COUNT.getMessage())), Integer.class);
 
                 List<CollectList> collectLists = JSON.parseArray(String.valueOf(jsonMap.get(Codes.JSON_COLLECTLIST_ROOT.getMessage())), CollectList.class);
-
+                if(collectLists==null||collectLists.size()==0){
+                    return;
+                }
                 //添加省中医病案采集
                 SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
                 AfInterfaceCollect afc = new AfInterfaceCollect();
@@ -106,6 +108,7 @@ public class PcmachineServiceImpl implements IPcmachineService {
                 }
                 //添加省中医病案采集-子任务
                 List<AfInterfaceCollectSub> list = new ArrayList<>();
+
                 for (CollectList collectList : collectLists) {
                     AfInterfaceCollectSub afInterfaceCollectSub = new AfInterfaceCollectSub();
                     Long afcsId = idWorker.nextId();