From 4866018724d888d2119a9d7348cac982ac58b219 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 19 Jul 2019 09:43:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MeasureInfoFacade.java      | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index 1a431fa..1b62c54 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -11,6 +11,7 @@ import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.result.RespBuilder;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.ExceptionUtils;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.request.MeasureAllInfoRequest;
 import com.lyms.platform.operate.web.request.MeasureBabyInfoRequest;
 import com.lyms.platform.operate.web.request.MeasureInfoRequest;
@@ -28,6 +29,7 @@ import com.lyms.platform.permission.service.MeasureUserInfoService;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
+import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.dbutils.DbUtils;
@@ -91,6 +93,10 @@ public class MeasureInfoFacade {
     @Autowired
     private AutoMatchFacade autoMatchFacade;
 
+
+    @Autowired
+    private ArchiveDataServicer archiveDataServicer;
+
     private static String[] blood_item = new String[]{"--", "--", "--", "--", "--", "--", "--", "--", "--"};
 
     private static Integer MAX_TODAY_COUNT = 10000;
@@ -897,9 +903,42 @@ public class MeasureInfoFacade {
                 beforeHeight = chuModel.getHeight() == null ? "" : chuModel.getHeight();
                 tireNumber = chuModel.getTireNumber() == null ? "" : chuModel.getTireNumber();
                 bmi = chuModel.getBaricIndex() == null ? "" : chuModel.getBaricIndex();
+
+
             }
         }
 
+        //如果初诊也没有孕前体重和身高 就在预约建档信息中获取
+        if (StringUtils.isEmpty(beforeHeight))
+        {
+            try {
+                ArchiveDataQuery query = new ArchiveDataQuery();
+                query.setIdCard(pat.getCardNo());
+                List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
+                if (CollectionUtils.isNotEmpty(list))
+                {
+                    ArchiveData data = list.get(0);
+                    String json = data.getJsonData();
+                    if (StringUtils.isNotEmpty(json))
+                    {
+                        JSONObject jsonObject = JsonUtil.getObj(json);
+                        if (jsonObject != null && jsonObject.getJSONObject("history") != null)
+                        {
+                            JSONObject historyJsonObj = jsonObject.getJSONObject("history");
+
+                            beforeWeight = historyJsonObj.get("yqWeight") == null ? "" : historyJsonObj.get("yqWeight").toString();
+                            beforeHeight = historyJsonObj.get("height") == null ? "" : historyJsonObj.get("height").toString();
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                ExceptionUtils.catchException(e, " 就在预约建档信息中获取错误");
+            }
+
+        }
+
         patInfo.put("beforeWeight", beforeWeight);
         patInfo.put("beforeHeight", beforeHeight);
         patInfo.put("tireNumber", tireNumber);
-- 
1.8.3.1