From cde730faa51faadf532e4917ad62c6d1eaea86ba Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Mon, 27 May 2019 15:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E8=86=B3=E9=A3=9F=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/biz/BasicConfigServiceTest.java  |  3 +++
 .../com/lyms/platform/pojo/BabyNutritionModel.java | 20 ++++++++++++++++++++
 .../operate/web/request/BabyNutritionRequest.java  | 22 +++++++++++++++++++++-
 .../operate/web/result/BabyNutritionResult.java    | 21 +++++++++++++++++++++
 4 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
index 67f7716..20a1a3a 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
@@ -4299,6 +4299,9 @@ public class BasicConfigServiceTest {
                     mongoTemplate.save(babyDiet);
                 }
             }
+
+
+
         } catch (IOException e) {
             e.printStackTrace();
         } catch (BiffException e) {
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
index 493689f..1acc2a6 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java
@@ -116,6 +116,26 @@ public class BabyNutritionModel {
 
     //鲜豆类
     private List<Map> vegXd;
+    //秦皇岛定制
+    private List<String> foods;
+
+    private String remark;
+
+    public List<String> getFoods() {
+        return foods;
+    }
+
+    public void setFoods(List<String> foods) {
+        this.foods = foods;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public List<Map> getOilGg() {
         return oilGg;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
index 451ca70..a3dccc7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java
@@ -65,7 +65,6 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
     private List<Map> meatYz;
 
 
-
     //肉产品使用频率 次/周
     private String meatCz;
     //肉产品使用频率 为主
@@ -125,6 +124,10 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
 
     //鲜豆类
     private List<Map> vegXd;
+    //秦皇岛定制字段
+    private List<String> foods;
+
+    private String remark;
 
 
     @Override
@@ -172,9 +175,26 @@ public class BabyNutritionRequest implements IBasicRequestConvert<BabyNutritionM
         model.setBeansDl(beansDl);
         model.setVegXd(vegXd);
         model.setFruits(fruits);
+        model.setFoods(foods);
+        model.setRemark(remark);
         return model;
     }
 
+    public List<String> getFoods() {
+        return foods;
+    }
+
+    public void setFoods(List<String> foods) {
+        this.foods = foods;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 
     public List<Map> getOilGg() {
         return oilGg;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
index acec0a0..1d9cea3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java
@@ -119,6 +119,9 @@ public class BabyNutritionResult {
     //鲜豆类
     private List<Map> vegXd;
 
+    private List<String> foods;
+
+    private String remark;
 
     public BabyNutritionResult convertToResult(BabyNutritionModel model) {
         setId(model.getId());
@@ -166,9 +169,27 @@ public class BabyNutritionResult {
         setBeansDl(model.getBeansDl());
         setVegXd(model.getVegXd());
         setFruits(model.getFruits());
+        setFoods(model.getFoods());
+        setRemark(model.getRemark());
         return this;
     }
 
+    public List<String> getFoods() {
+        return foods;
+    }
+
+    public void setFoods(List<String> foods) {
+        this.foods = foods;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public String getHospitalName() {
         return hospitalName;
     }
-- 
1.8.3.1