liquanyu / regional-platform

Download as
Browse Code »

Commit cde730faa51faadf532e4917ad62c6d1eaea86ba

Authored by wangbo
1 parent 82118ac61e
Exists in master and in 1 other branch dev

儿童膳食报告字段添加

Showing 4 changed files with 65 additions and 1 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java View file @ cde730f
... ... @@ -4299,6 +4299,9 @@
4299 4299 mongoTemplate.save(babyDiet);
4300 4300 }
4301 4301 }
  4302 +
  4303 +
  4304 +
4302 4305 } catch (IOException e) {
4303 4306 e.printStackTrace();
4304 4307 } catch (BiffException e) {
platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java View file @ cde730f
... ... @@ -116,6 +116,26 @@
116 116  
117 117 //鲜豆类
118 118 private List<Map> vegXd;
  119 + //秦皇岛定制
  120 + private List<String> foods;
  121 +
  122 + private String remark;
  123 +
  124 + public List<String> getFoods() {
  125 + return foods;
  126 + }
  127 +
  128 + public void setFoods(List<String> foods) {
  129 + this.foods = foods;
  130 + }
  131 +
  132 + public String getRemark() {
  133 + return remark;
  134 + }
  135 +
  136 + public void setRemark(String remark) {
  137 + this.remark = remark;
  138 + }
119 139  
120 140 public List<Map> getOilGg() {
121 141 return oilGg;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java View file @ cde730f
... ... @@ -65,7 +65,6 @@
65 65 private List<Map> meatYz;
66 66  
67 67  
68   -
69 68 //肉产品使用频率 次/周
70 69 private String meatCz;
71 70 //肉产品使用频率 为主
72 71  
73 72  
... ... @@ -125,8 +124,12 @@
125 124  
126 125 //鲜豆类
127 126 private List<Map> vegXd;
  127 + //秦皇岛定制字段
  128 + private List<String> foods;
128 129  
  130 + private String remark;
129 131  
  132 +
130 133 @Override
131 134 public BabyNutritionModel convertToDataModel() {
132 135 BabyNutritionModel model = new BabyNutritionModel();
133 136  
... ... @@ -172,9 +175,26 @@
172 175 model.setBeansDl(beansDl);
173 176 model.setVegXd(vegXd);
174 177 model.setFruits(fruits);
  178 + model.setFoods(foods);
  179 + model.setRemark(remark);
175 180 return model;
176 181 }
177 182  
  183 + public List<String> getFoods() {
  184 + return foods;
  185 + }
  186 +
  187 + public void setFoods(List<String> foods) {
  188 + this.foods = foods;
  189 + }
  190 +
  191 + public String getRemark() {
  192 + return remark;
  193 + }
  194 +
  195 + public void setRemark(String remark) {
  196 + this.remark = remark;
  197 + }
178 198  
179 199 public List<Map> getOilGg() {
180 200 return oilGg;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java View file @ cde730f
... ... @@ -119,7 +119,10 @@
119 119 //鲜豆类
120 120 private List<Map> vegXd;
121 121  
  122 + private List<String> foods;
122 123  
  124 + private String remark;
  125 +
123 126 public BabyNutritionResult convertToResult(BabyNutritionModel model) {
124 127 setId(model.getId());
125 128 setHospitalId(model.getHospitalId());
126 129  
... ... @@ -166,7 +169,25 @@
166 169 setBeansDl(model.getBeansDl());
167 170 setVegXd(model.getVegXd());
168 171 setFruits(model.getFruits());
  172 + setFoods(model.getFoods());
  173 + setRemark(model.getRemark());
169 174 return this;
  175 + }
  176 +
  177 + public List<String> getFoods() {
  178 + return foods;
  179 + }
  180 +
  181 + public void setFoods(List<String> foods) {
  182 + this.foods = foods;
  183 + }
  184 +
  185 + public String getRemark() {
  186 + return remark;
  187 + }
  188 +
  189 + public void setRemark(String remark) {
  190 + this.remark = remark;
170 191 }
171 192  
172 193 public String getHospitalName() {