From d9fa7aaac2db5e9b66d7ec2d153a5d412f1494d7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 22 Nov 2019 10:10:06 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/AmniocentesisFacade.java    | 56 +++++++++++++++-------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
index 30acd02..cfec9d4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
@@ -1,9 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
-import com.lyms.platform.biz.service.AmniocentesisInfoService;
-import com.lyms.platform.biz.service.AmniocentesisRecordService;
-import com.lyms.platform.biz.service.AmniocentesisResultService;
-import com.lyms.platform.biz.service.PatientsService;
+import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
@@ -22,14 +19,8 @@ import com.lyms.platform.operate.web.result.AmniocentesisInfoView;
 import com.lyms.platform.operate.web.utils.ResponseUtil;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.service.OrganizationService;
-import com.lyms.platform.pojo.AmniocentesisInfoModel;
-import com.lyms.platform.pojo.AmniocentesisRecordModel;
-import com.lyms.platform.pojo.AmniocentesisResultModel;
-import com.lyms.platform.pojo.Patients;
-import com.lyms.platform.query.AmniocentesisInfoQuery;
-import com.lyms.platform.query.AmniocentesisRecordQuery;
-import com.lyms.platform.query.AmniocentesisResultQuery;
-import com.lyms.platform.query.PatientsQuery;
+import com.lyms.platform.pojo.*;
+import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -64,6 +55,9 @@ public class AmniocentesisFacade {
     @Autowired
     private PatientsService patientsService;
 
+    @Autowired
+    private AntenatalExaminationService antenatalExaminationService;
+
     public BaseResponse queryAmniocentesisInfo(String cardNo, String vcCardNo, Integer userId) {
 
         Map data = new HashMap<>();
@@ -103,7 +97,8 @@ public class AmniocentesisFacade {
         patientsQuery.setYn(YnEnums.YES.getId());
         patientsQuery.setVcCardNo(vcCardNo);
         patientsQuery.setCardNo(cardNo);
-        patientsQuery.setHospitalId(hospitalId);
+        patientsQuery.setType(1);
+        //patientsQuery.setHospitalId(hospitalId);
 
         List<Patients> patientses = patientsService.queryPatient(patientsQuery);
         if (CollectionUtils.isNotEmpty(patientses))
@@ -134,7 +129,34 @@ public class AmniocentesisFacade {
             data.put("mensStopStartDay",pat.getMensStopStartDay());
             data.put("mensStopEndDay",pat.getMensStopEndDay());
 
-            data.put("week",DateUtil.getWeekDesc(pat.getLastMenses(),new Date()));
+            data.put("week",DateUtil.getWeekDesc(pat.getLastMenses(), new Date()));
+
+
+
+            data.put("hbirthday", DateUtil.getyyyy_MM_dd(pat.getHusbandBirth()));
+
+
+
+            AntExChuQuery antExChuQuery = new AntExChuQuery();
+            antExChuQuery.setYn(YnEnums.YES.getId());
+            antExChuQuery.setParentId(pat.getId());
+
+            String weight = "";
+            String pregnancyTimes = "";
+            String prodTime = "";
+            List<AntExChuModel> list = antenatalExaminationService.queryAntExChu(antExChuQuery);
+            if (CollectionUtils.isNotEmpty(list))
+            {
+                AntExChuModel model = list.get(0);
+                weight = model.getWeight();
+                pregnancyTimes = model.getPregnancyTimes() == null ? "" :  String.valueOf(model.getPregnancyTimes());
+                prodTime = model.getProdTime() == null ? "" :  String.valueOf(model.getProdTime());
+            }
+
+            data.put("weight",weight);
+            data.put("pregnancyTimes",pregnancyTimes);
+            data.put("prodTime",prodTime);
+
         }
 
         return data;
@@ -340,7 +362,7 @@ public class AmniocentesisFacade {
         {
             String[] arrs = queryParam.getApplyDate().split(" - ");
             amniocentesisInfoQuery.setApplyDateStart(DateUtil.parseYMD(arrs[0]));
-            amniocentesisInfoQuery.setApplyDateEnd(DateUtil.parseYMDHMS(arrs[0]+" 23:59:59"));
+            amniocentesisInfoQuery.setApplyDateEnd(DateUtil.parseYMDHMS(arrs[1]+" 23:59:59"));
         }
 
         //手术日期
@@ -348,14 +370,14 @@ public class AmniocentesisFacade {
         {
             String[] arrs = queryParam.getOperationDate().split(" - ");
             amniocentesisInfoQuery.setOperationDateStart(DateUtil.parseYMD(arrs[0]));
-            amniocentesisInfoQuery.setOperationDateEnd(DateUtil.parseYMDHMS(arrs[0] + " 23:59:59"));
+            amniocentesisInfoQuery.setOperationDateEnd(DateUtil.parseYMDHMS(arrs[1] + " 23:59:59"));
         }
         //预约日期
         if (StringUtils.isNotEmpty(queryParam.getOrderDate()))
         {
             String[] arrs = queryParam.getOrderDate().split(" - ");
             amniocentesisInfoQuery.setOrderDateStart(DateUtil.parseYMD(arrs[0]));
-            amniocentesisInfoQuery.setOrderDateEnd(DateUtil.parseYMDHMS(arrs[0] + " 23:59:59"));
+            amniocentesisInfoQuery.setOrderDateEnd(DateUtil.parseYMDHMS(arrs[1] + " 23:59:59"));
         }
         //预产期
         if (StringUtils.isNotEmpty(queryParam.getDueDate()))
-- 
1.8.3.1