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 vegXd; + //秦皇岛定制 + private List foods; + + private String remark; + + public List getFoods() { + return foods; + } + + public void setFoods(List foods) { + this.foods = foods; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } public List 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 meatYz; - //肉产品使用频率 次/周 private String meatCz; //肉产品使用频率 为主 @@ -125,6 +124,10 @@ public class BabyNutritionRequest implements IBasicRequestConvert vegXd; + //秦皇岛定制字段 + private List foods; + + private String remark; @Override @@ -172,9 +175,26 @@ public class BabyNutritionRequest implements IBasicRequestConvert getFoods() { + return foods; + } + + public void setFoods(List foods) { + this.foods = foods; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } public List 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 vegXd; + private List 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 getFoods() { + return foods; + } + + public void setFoods(List foods) { + this.foods = foods; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + public String getHospitalName() { return hospitalName; }