From 37660741221b3171d4dbdadfa04a79dfb41c99a2 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 26 May 2021 09:25:41 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/pojo/BabyPsychologistModel.java    | 10 ++++++++++
 .../operate/web/facade/BabyPsychologistFacade.java       |  1 +
 .../platform/operate/web/facade/HealthChargeFacade.java  |  1 +
 .../operate/web/request/BabyPsychologistRequest.java     | 10 ++++++++++
 .../operate/web/result/BabyPsychologistResult.java       | 16 ++++++++++++++++
 5 files changed, 38 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java
index 5d48e16..d683462 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java
@@ -194,6 +194,16 @@ public class BabyPsychologistModel extends BaseModel {
     //发育迟缓专科检查 cz初诊，fz复诊
     private String czOrfzProject;
     private String czOrfzProjectName;
+    //学习情况
+    private String xxqk;
+
+    public String getXxqk() {
+        return xxqk;
+    }
+
+    public void setXxqk(String xxqk) {
+        this.xxqk = xxqk;
+    }
 
 
     public String getCjfy() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java
index 7cc6c99..8ca7761 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java
@@ -160,6 +160,7 @@ public class BabyPsychologistFacade extends BaseServiceImpl {
         model.setPresentIllness(request.getPresentIllness());
         model.setCzOrfzProject(request.getCzOrfzProject());
 //        model.setCzOrfzProjectName(request.getCzOrfzProjectName());
+        model.setXxqk(request.getXxqk());
         return model;
 
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java
index 2b47b91..e2a8ade 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java
@@ -248,6 +248,7 @@ public class HealthChargeFacade {
                 if (map == null) {
                     continue;
                 }
+                map.put("id",model.getId());
 
                 String name = "";
                 String id = model.getDoctorId();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java
index cb4fd09..4b851f8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java
@@ -188,6 +188,16 @@ public class BabyPsychologistRequest {
 
     private String czOrfzProjectName;
 
+    //学习情况
+    private String xxqk;
+
+    public String getXxqk() {
+        return xxqk;
+    }
+
+    public void setXxqk(String xxqk) {
+        this.xxqk = xxqk;
+    }
 
     public String getCjfy() {
         return cjfy;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java
index 5e7b26f..caa4c8f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java
@@ -189,6 +189,18 @@ public class BabyPsychologistResult implements IBasicResultConvert<BabyPsycholog
     private String czOrfzProject;
     private String czOrfzProjectName;
 
+    //学习情况
+    private String xxqk;
+
+    public String getXxqk() {
+        return xxqk;
+    }
+
+    public void setXxqk(String xxqk) {
+        this.xxqk = xxqk;
+    }
+
+
     public String getCjfy() {
         return cjfy;
     }
@@ -912,6 +924,8 @@ public class BabyPsychologistResult implements IBasicResultConvert<BabyPsycholog
                 setXlzkProjectName("表达性语言障碍");
             } else if ("kc".equals(destModel.getXlzkProject())) {
                 setXlzkProjectName("口吃");
+            } else if ("qxwt".equals(destModel.getXlzkProject())) {
+                setXlzkProjectName("情绪问题");
             }
         }
 
@@ -986,6 +1000,8 @@ public class BabyPsychologistResult implements IBasicResultConvert<BabyPsycholog
             }
         }
 
+        setXxqk(destModel.getXxqk());
+
         return this;
     }
 
-- 
1.8.3.1