From 322fa140f135dc4168f9bebe90458b4f3d5ca454 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 21 Apr 2020 10:58:29 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/pojo/BabyEyeCheck.java  | 65 ++++++++++++++++++++++
 .../web/service/impl/BabyEyeCheckServiceImpl.java  | 21 ++++++-
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
index 38d6359..be610bc 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
@@ -308,6 +308,71 @@ public class BabyEyeCheck extends BaseModel {
     //删除文件路径
     private List<String> delFiles;
 
+
+    //④视力：增加3个选项：
+    // 标准对视远视力表、0 未选择 1选择
+    private Integer visionJudgment1;
+    //儿童对数视力表、0 未选择 1选择
+    private Integer visionJudgment2;
+    //欠合作。0 未选择 1选择
+    private Integer visionJudgment3;
+
+    //三棱镜左
+    private String prismLeft;
+    //三棱镜右
+    private String prismRight;
+
+    //合作  0合作 1签合作
+    private Integer cooperation;
+
+    public Integer getVisionJudgment1() {
+        return visionJudgment1;
+    }
+
+    public void setVisionJudgment1(Integer visionJudgment1) {
+        this.visionJudgment1 = visionJudgment1;
+    }
+
+    public Integer getVisionJudgment3() {
+        return visionJudgment3;
+    }
+
+    public void setVisionJudgment3(Integer visionJudgment3) {
+        this.visionJudgment3 = visionJudgment3;
+    }
+
+    public Integer getVisionJudgment2() {
+        return visionJudgment2;
+    }
+
+    public void setVisionJudgment2(Integer visionJudgment2) {
+        this.visionJudgment2 = visionJudgment2;
+    }
+
+    public String getPrismLeft() {
+        return prismLeft;
+    }
+
+    public void setPrismLeft(String prismLeft) {
+        this.prismLeft = prismLeft;
+    }
+
+    public String getPrismRight() {
+        return prismRight;
+    }
+
+    public void setPrismRight(String prismRight) {
+        this.prismRight = prismRight;
+    }
+
+    public Integer getCooperation() {
+        return cooperation;
+    }
+
+    public void setCooperation(Integer cooperation) {
+        this.cooperation = cooperation;
+    }
+
     public FilePathModel getFilePath() {
         return filePath;
     }
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 2689fa4..522e11a 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
@@ -96,9 +96,12 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
 
             if ("yang".equals(babyEyeCheck.getExtRightEyelook()) || "yang".equals(babyEyeCheck.getExtLeftEyelook()) || "yang".equals(babyEyeCheck.getBlinkRightReflex())
                     || "yang".equals(babyEyeCheck.getBlinkLefttReflex()) || "yang".equals(babyEyeCheck.getPupillaryRightReflex()) || "yang".equals(babyEyeCheck.getPupillaryLeftReflex())
-                    || "yang".equals(babyEyeCheck.getRedRightReflex()) || "yang".equals(babyEyeCheck.getRedLeftReflex()) || "yang".equals(babyEyeCheck.getRedReflex())
+                    || "yang".equals(babyEyeCheck.getRedRightReflex()) || "yang".equals(babyEyeCheck.getRedLeftReflex()) || "yang".equals(babyEyeCheck.getRedReflex()) ||  "ruoyang".equals(babyEyeCheck.getRedReflex())
                     || "yang".equals(babyEyeCheck.getConjunctiva()) || "yang".equals(babyEyeCheck.getCorneal()) || "yang".equals(babyEyeCheck.getLacrimalApparatus())
                     || "yang".equals(babyEyeCheck.getNystagmus()) || "yang".equals(babyEyeCheck.getExtEyelook())
+                    || "ruoyang".equals(babyEyeCheck.getRedRightReflex()) || "ruoyang".equals(babyEyeCheck.getRedLeftReflex())
+
+
             ) {
                 //器械判定阳性
                 babyEyeCheck.setApparatus("2");
@@ -314,6 +317,14 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
         map.put("y2", "yang".equals(babyEyeCheck.getY2()) ? "医生判定阳性" : "");
         map.put("refraction2", "yang".equals(babyEyeCheck.getRefraction2()) ? "医生判定阳性" : "");
 
+        map.put("visionJudgment1", babyEyeCheck.getVisionJudgment1() == null ? "" :  babyEyeCheck.getVisionJudgment1() == 0 ? "" : "标准对视远视力表");
+        map.put("visionJudgment2", babyEyeCheck.getVisionJudgment2() == null ? "" :  babyEyeCheck.getVisionJudgment2() == 0 ? "" : "儿童对数视力表");
+        map.put("visionJudgment3", babyEyeCheck.getVisionJudgment3() == null ? "" :  babyEyeCheck.getVisionJudgment3() == 0 ? "" : "欠合作");
+
+        map.put("prismLeft", babyEyeCheck.getPrismLeft());
+        map.put("prismRight", babyEyeCheck.getPrismRight());
+        map.put("cooperation", babyEyeCheck.getCooperation() == null ? "" :  babyEyeCheck.getCooperation() == 0 ? "合作" : "欠合作");
+
         FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getId());
         map.put("filePath", filePath);
         //
@@ -333,12 +344,20 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
                 } else if ("yang".equals(s)) {
                     return "+ （" + other + "）";
                 }
+                else  if ("ruoyang".equals(s))
+                {
+                    return "稍减弱";
+                }
             } else {
                 if ("yin".equals(s)) {
                     return "-";
                 } else if ("yang".equals(s)) {
                     return "+";
                 }
+                else  if ("ruoyang".equals(s))
+                {
+                    return "稍减弱";
+                }
             }
         }
         return "";
-- 
1.8.3.1