From 66e6feddfebf39b41744ca7b0e70b1f1c07e137d Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Thu, 18 Jun 2020 11:21:11 +0800
Subject: [PATCH] update

---
 .../main/java/com/lyms/platform/operate/web/facade/SieveFacade.java | 4 +++-
 .../java/com/lyms/platform/operate/web/worker/SieveWorker2.java     | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 69346bb..e819204 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -2564,7 +2564,7 @@ public class SieveFacade {
                     data.put("HC", sive.gethC());
                     data.put("MannualEntry", sive.getMannualEntry());//B超孕天
                     data.put("NT", sive.getnT());
-                    data.put("ResponsibleCode", sive.getApplyDoctor());//送检单位编号(送检医院)
+                    data.put("ResponsibleCode", sive.getResponsibleCode());//送检单位编号(送检医院)
                     data.put("T21", sive.getT21());//既往T21
                     data.put("T18", sive.getT18());//既往T18
                     data.put("NTD", sive.getnTD());//既往NTD
@@ -2775,6 +2775,8 @@ public class SieveFacade {
                         sieveAddRequest.setId(sieveResultModel.getId());
                         addOneSieve(sieveAddRequest, id);
                     }
+                    sieveAddRequest.setExamineId(String.valueOf(id)); //审核者
+                    sieveAddRequest.setCheckerId(String.valueOf(id)); //检验者
                     addOneSieve(sieveAddRequest, id);
                     //记录一下添加成功内容
                     operateLogFacade.addModifyOptLog(id, Integer.parseInt(hospitalId),sieveAddRequest, sieveAddRequest, OptActionEnums.UPDATE.getId(), "导入添加产筛信息");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java
index 6a9e73c..6773b18 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java
@@ -230,9 +230,11 @@ public class SieveWorker2 implements Callable<List<SieveListResult2>> {
                 //出生年月日
                 sieveListResult.setBirthday(DateUtil.getyyyy_MM_dd(patients.getBirth()));
                 //身份证号码
-                sieveListResult.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
+//                sieveListResult.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
+                sieveListResult.setCardNo(patients.getCardNo());
                 //电话号码
-                sieveListResult.setPhone(DefenceUtils.getPhone(patients.getPhone()));
+//                sieveListResult.setPhone(DefenceUtils.getPhone(patients.getPhone()));
+                sieveListResult.setPhone(patients.getPhone());
                 //户籍地
                 sieveListResult.setPlaceDomicile(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(),
                         patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
-- 
1.8.3.1