jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 74e06aaf2f69bd431cddfd8b7245c635b3177d3c

Authored by liquanyu
1 parent 123955f3b5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童营养报告

Showing 5 changed files with 187 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionModel.java View file @ 74e06aa
... ... @@ -103,6 +103,60 @@
103 103 //喂养方式
104 104 private String feedType;
105 105  
  106 + //干果及硬果类
  107 + private List<Map> oilGg;
  108 +
  109 + //干豆类
  110 + private List<Map> beansGd;
  111 + //豆类制品
  112 + private List<Map> beansDl;
  113 +
  114 + //水果类;
  115 + private List<Map> fruits;
  116 +
  117 + //鲜豆类
  118 + private List<Map> vegXd;
  119 +
  120 + public List<Map> getOilGg() {
  121 + return oilGg;
  122 + }
  123 +
  124 + public void setOilGg(List<Map> oilGg) {
  125 + this.oilGg = oilGg;
  126 + }
  127 +
  128 + public List<Map> getBeansGd() {
  129 + return beansGd;
  130 + }
  131 +
  132 + public void setBeansGd(List<Map> beansGd) {
  133 + this.beansGd = beansGd;
  134 + }
  135 +
  136 + public List<Map> getBeansDl() {
  137 + return beansDl;
  138 + }
  139 +
  140 + public void setBeansDl(List<Map> beansDl) {
  141 + this.beansDl = beansDl;
  142 + }
  143 +
  144 + public List<Map> getFruits() {
  145 + return fruits;
  146 + }
  147 +
  148 + public void setFruits(List<Map> fruits) {
  149 + this.fruits = fruits;
  150 + }
  151 +
  152 + public List<Map> getVegXd() {
  153 + return vegXd;
  154 + }
  155 +
  156 + public void setVegXd(List<Map> vegXd) {
  157 + this.vegXd = vegXd;
  158 + }
  159 +
106 160 public Date getNutritiTime() {
107 161 return nutritiTime;
108 162 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ 74e06aa
... ... @@ -139,7 +139,7 @@
139 139 BaseObjectResponse objectResponse = new BaseObjectResponse();
140 140 Map<String,String> map = new HashMap<String, String>();
141 141 String data = HttpClientUtil.doGet(amsUrl + "/v1/getPlatfromCategoryFoods", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba");
142   - NutritionFoodResult result = JsonUtil.str2Obj(data, NutritionFoodResult.class);
  142 + NutritionFoodResult result = JsonUtil.jkstr2Obj(data, NutritionFoodResult.class);
143 143 objectResponse.setData(result);
144 144 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
145 145 objectResponse.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionRequest.java View file @ 74e06aa
... ... @@ -64,6 +64,8 @@
64 64 //油脂及其他
65 65 private List<Map> meatYz;
66 66  
  67 +
  68 +
67 69 //肉产品使用频率 次/周
68 70 private String meatCz;
69 71 //肉产品使用频率 为主
70 72  
... ... @@ -110,7 +112,21 @@
110 112 //营养填写日期
111 113 private String nutritiTime;
112 114  
  115 + //干果及硬果类
  116 + private List<Map> oilGg;
113 117  
  118 + //干豆类
  119 + private List<Map> beansGd;
  120 + //豆类制品
  121 + private List<Map> beansDl;
  122 +
  123 + //水果类;
  124 + private List<Map> fruits;
  125 +
  126 + //鲜豆类
  127 + private List<Map> vegXd;
  128 +
  129 +
114 130 @Override
115 131 public BabyNutritionModel convertToDataModel() {
116 132 BabyNutritionModel model = new BabyNutritionModel();
117 133  
... ... @@ -151,7 +167,53 @@
151 167 model.setMeal(JsonUtil.obj2JsonString(meal));
152 168 model.setFeedType(feedType);
153 169 model.setNutritiTime(DateUtil.parseYMD(nutritiTime));
  170 + model.setOilGg(oilGg);
  171 + model.setBeansGd(beansGd);
  172 + model.setBeansDl(beansDl);
  173 + model.setVegXd(vegXd);
  174 + model.setFruits(fruits);
154 175 return model;
  176 + }
  177 +
  178 +
  179 + public List<Map> getOilGg() {
  180 + return oilGg;
  181 + }
  182 +
  183 + public void setOilGg(List<Map> oilGg) {
  184 + this.oilGg = oilGg;
  185 + }
  186 +
  187 + public List<Map> getBeansGd() {
  188 + return beansGd;
  189 + }
  190 +
  191 + public void setBeansGd(List<Map> beansGd) {
  192 + this.beansGd = beansGd;
  193 + }
  194 +
  195 + public List<Map> getBeansDl() {
  196 + return beansDl;
  197 + }
  198 +
  199 + public void setBeansDl(List<Map> beansDl) {
  200 + this.beansDl = beansDl;
  201 + }
  202 +
  203 + public List<Map> getFruits() {
  204 + return fruits;
  205 + }
  206 +
  207 + public void setFruits(List<Map> fruits) {
  208 + this.fruits = fruits;
  209 + }
  210 +
  211 + public List<Map> getVegXd() {
  212 + return vegXd;
  213 + }
  214 +
  215 + public void setVegXd(List<Map> vegXd) {
  216 + this.vegXd = vegXd;
155 217 }
156 218  
157 219 public String getNutritiTime() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionResult.java View file @ 74e06aa
... ... @@ -104,6 +104,21 @@
104 104 //喂养方式
105 105 private String feedType;
106 106  
  107 + //干果及硬果类
  108 + private List<Map> oilGg;
  109 +
  110 + //干豆类
  111 + private List<Map> beansGd;
  112 + //豆类制品
  113 + private List<Map> beansDl;
  114 +
  115 + //水果类;
  116 + private List<Map> fruits;
  117 +
  118 + //鲜豆类
  119 + private List<Map> vegXd;
  120 +
  121 +
107 122 public BabyNutritionResult convertToResult(BabyNutritionModel model) {
108 123 setId(model.getId());
109 124 setHospitalId(model.getHospitalId());
110 125  
... ... @@ -144,7 +159,53 @@
144 159 setCreated(DateUtil.getyyyy_MM_dd(model.getCreated()));
145 160 setModified(DateUtil.getyyyy_MM_dd(model.getModified()));
146 161 setNutritiTime(DateUtil.getyyyy_MM_dd(model.getNutritiTime()));
  162 +
  163 + setOilGg(model.getOilGg());
  164 + setBeansGd(model.getBeansGd());
  165 + setBeansDl(model.getBeansDl());
  166 + setVegXd(model.getVegXd());
  167 + setFruits(model.getFruits());
147 168 return this;
  169 + }
  170 +
  171 + public List<Map> getOilGg() {
  172 + return oilGg;
  173 + }
  174 +
  175 + public void setOilGg(List<Map> oilGg) {
  176 + this.oilGg = oilGg;
  177 + }
  178 +
  179 + public List<Map> getBeansGd() {
  180 + return beansGd;
  181 + }
  182 +
  183 + public void setBeansGd(List<Map> beansGd) {
  184 + this.beansGd = beansGd;
  185 + }
  186 +
  187 + public List<Map> getBeansDl() {
  188 + return beansDl;
  189 + }
  190 +
  191 + public void setBeansDl(List<Map> beansDl) {
  192 + this.beansDl = beansDl;
  193 + }
  194 +
  195 + public List<Map> getFruits() {
  196 + return fruits;
  197 + }
  198 +
  199 + public void setFruits(List<Map> fruits) {
  200 + this.fruits = fruits;
  201 + }
  202 +
  203 + public List<Map> getVegXd() {
  204 + return vegXd;
  205 + }
  206 +
  207 + public void setVegXd(List<Map> vegXd) {
  208 + this.vegXd = vegXd;
148 209 }
149 210  
150 211 public String getNutritiTime() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NutritionFoodResult.java View file @ 74e06aa
... ... @@ -13,6 +13,15 @@
13 13 private List<foods> fruitsFoods;
14 14 private List<foods> eggFoods;
15 15 private List<foods> beanFoods;
  16 + private List<foods> oilFoods;
  17 +
  18 + public List<foods> getOilFoods() {
  19 + return oilFoods;
  20 + }
  21 +
  22 + public void setOilFoods(List<foods> oilFoods) {
  23 + this.oilFoods = oilFoods;
  24 + }
16 25  
17 26 public List<foods> getMainFoods() {
18 27 return mainFoods;