From 24009cd38230362e4c463a0525309180d5f3e492 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sat, 1 Aug 2020 10:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A1=E6=B0=B4=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/MatDeliverController.java       |  2 +-
 .../operate/web/facade/MatDeliverFacade.java       |  2 +-
 .../operate/web/worker/MaterDeliverWorker.java     | 28 ++++++++++++++++------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index cc4b1e2..0a50c1e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -251,7 +251,7 @@ public class MatDeliverController extends BaseController {
 
             String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
 
-            String hsColum = "vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation";
+            String hsColum = "livingNumber,vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation";
 
             Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId));
             if (o != null && "12".equals(o.getCityId()))
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index f49b208..b07a2e7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -2545,7 +2545,7 @@ public class MatDeliverFacade {
             List<MaternalDeliverModel> mlist = maternalDeliverModelList.subList(i, end);
             Callable c = new MaterDeliverWorker(organizationService, usersService,
                     babyService, basicConfigService, childbirthManagerRequest.getInitQuery(),
-                    mlist, patientsMap, postpartumRecordsService, recordsService);
+                    mlist, patientsMap, postpartumRecordsService, recordsService,childbirthManagerRequest.getShowDetail());
             Future f = commonThreadPool.submit(c);
             if (f != null) {
                 futures.add(f);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
index 89ed287..8555a6b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
@@ -40,11 +40,12 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
     private Map<String, Patients> patientsMap;
     private PostpartumRecordsService postpartumRecordsService;
     private RecordsService recordsService;
+    private int showDetail;
 
     public MaterDeliverWorker(OrganizationService organizationService,UsersService usersService,
                               BabyService babyService,BasicConfigService basicConfigService,String initQuery,
                               List<MaternalDeliverModel> maternalDeliverModelList,Map<String, Patients> patientsMap,
-                              PostpartumRecordsService postpartumRecordsService,RecordsService recordsService) {
+                              PostpartumRecordsService postpartumRecordsService,RecordsService recordsService,int showDetail) {
         this.maternalDeliverModelList = maternalDeliverModelList;
         this.patientsMap = patientsMap;
         this.organizationService = organizationService;
@@ -54,6 +55,7 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
         this.basicConfigService = basicConfigService;
         this.postpartumRecordsService = postpartumRecordsService;
         this.recordsService = recordsService;
+        this.showDetail = showDetail;
     }
 
     @Override
@@ -116,13 +118,25 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                     childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(),
                             patients.getStreetId(), patients.getAddress(), basicConfigService));
                 }
-                // 电话转换
-                childbirthManagerQueryModel.setPhone(patients.getPhone());
-                childbirthManagerQueryModel.setHusbandPhone(patients.getHusbandPhone());
+
+                //带*
+                if (showDetail == 1)
+                {
+                    childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
+                    childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone()));
+
+                    childbirthManagerQueryModel.setHusbandCardNo(DefenceUtils.getCardNo(patients.getHcertificateNum()));
+                    childbirthManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
+                }
+                else
+                {
+                    childbirthManagerQueryModel.setPhone(patients.getPhone());
+                    childbirthManagerQueryModel.setHusbandPhone(patients.getHusbandPhone());
+                    childbirthManagerQueryModel.setHusbandCardNo(patients.getHcertificateNum());
+                    childbirthManagerQueryModel.setCardNo(patients.getCardNo());
+                }
                 childbirthManagerQueryModel.setHusbandName(patients.getHusbandName());
-                childbirthManagerQueryModel.setHusbandCardNo(patients.getHcertificateNum());
-                // 加密身份证号
-                childbirthManagerQueryModel.setCardNo(patients.getCardNo());
+
                 //  年龄
                 childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
                 childbirthManagerQueryModel.setFileCode(maternalDeliverModel.getBhNum());
-- 
1.8.3.1