diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index 1951fe4..9aadf38 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -10,6 +10,7 @@ import com.lyms.platform.operate.web.request.BabyNutritionRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.PatientWeightService; +import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.MeasureDataInfoService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; @@ -42,6 +43,9 @@ public class BabyNutritionFacade { @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private OrganizationService organizationService; + public BaseObjectResponse queryBabyNutritionRecord(String babyId) { Map resMap = new HashMap<>(); @@ -127,6 +131,8 @@ public class BabyNutritionFacade { { BabyNutritionResult result = new BabyNutritionResult(); result.convertToResult(models.get(0)); + Organization org = organizationService.getOrganization(Integer.parseInt(result.getHospitalId())); + result.setHospitalName(org.getName()); objectResponse.setData(result); } @@ -145,4 +151,13 @@ public class BabyNutritionFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + + public List getFoods(String ids) { + Map map = new HashMap(); + map.put("ids",ids); + String data = HttpClientUtil.doGet(amsUrl + "/v1/getFoodsByIds", map, "utf-8", "3d19960bf3e81e7d816c4f26051c49ba"); + List results = JsonUtil.toList(data, FoodResult.class); + return results; + } } \ No newline at end of file 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 7be09b7..acec0a0 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 @@ -22,6 +22,7 @@ public class BabyNutritionResult { private String babyId; private String hospitalId; + private String hospitalName; private String doctorId; @@ -168,6 +169,14 @@ public class BabyNutritionResult { return this; } + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + public List getOilGg() { return oilGg; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FoodResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FoodResult.java new file mode 100644 index 0000000..eef3f08 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FoodResult.java @@ -0,0 +1,53 @@ +package com.lyms.platform.operate.web.result; + +/** + * Created by Administrator on 2019-01-29. + */ +public class FoodResult { + + private Integer id; + private Integer protein; + private Integer categoryId; + private Integer nutritionId; + private Integer unitId; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getProtein() { + return protein; + } + + public void setProtein(Integer protein) { + this.protein = protein; + } + + public Integer getCategoryId() { + return categoryId; + } + + public void setCategoryId(Integer categoryId) { + this.categoryId = categoryId; + } + + public Integer getNutritionId() { + return nutritionId; + } + + public void setNutritionId(Integer nutritionId) { + this.nutritionId = nutritionId; + } + + public Integer getUnitId() { + return unitId; + } + + public void setUnitId(Integer unitId) { + this.unitId = unitId; + } +}