From ede75819299b1b3e15deb3dae0c75356b1657adc Mon Sep 17 00:00:00 2001
From: tranny <1163285868@qq.com>
Date: Sat, 28 Nov 2020 11:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=9C=BC=E4=BF=9D=E5=81=A5?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/impl/BabyEyeCheckServiceImpl.java  | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
index 5d59167..3aef5a2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
@@ -593,10 +593,16 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
      */
     @Override
     public BaseResponse infoQhd(String id) {
+
+        Map<String, Object>  map = getBabyEyeCheckViewQhd(id);
+        return RespBuilder.buildSuccess(map);
+    }
+
+
+    private Map<String, Object>  getBabyEyeCheckViewQhd(String id)
+    {
         BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class);
-        if (babyEyeCheck == null) {
-            return RespBuilder.buildSuccess();
-        }
+
         Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck);
         map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : "qhz".equals(babyEyeCheck.getEyeMovementsId()) ? "欠合作" : "");
         map.put("nystagmus", parseYinYang(babyEyeCheck.getNystagmus()));
@@ -761,7 +767,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
         map.put("filePath", filePath);
         //
         CollectionUtils.removeNullValue(map);
-        return RespBuilder.buildSuccess(map);
+        return map;
     }
 
     private String parseYinYang(String s) {
@@ -2007,8 +2013,15 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
             temp.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));
             temp.put("type", "2");
             CollectionUtils.removeNullValue(temp);
-
-            Map<String, Object> map = getEyeCheckView(babyEyeCheck.getId());
+            Map<String, Object>  map = null;
+            if ("216".equals(hospitalId))
+            {
+                map = getBabyEyeCheckViewQhd(babyEyeCheck.getId());
+            }
+            else
+            {
+                map = getEyeCheckView(babyEyeCheck.getId());
+            }
             temp.put("viewData",map);
 
             datas.add(temp);
-- 
1.8.3.1