From 926b18d9b34525f600fd83b3b4d0fcc2661386bf Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 8 Jun 2018 10:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/BasicConfigServiceTest.java | 6 +- .../com/lyms/platform/pojo/WeightConfigModel.java | 2 +- .../platform/pojo/WeightManageConfigModel.java | 203 --------------------- .../web/service/impl/PatientWeightServiceImpl.java | 16 -- 4 files changed, 4 insertions(+), 223 deletions(-) delete mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/WeightManageConfigModel.java 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 ceafc32..f10d588 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 @@ -1012,9 +1012,9 @@ public class BasicConfigServiceTest { public static void main(String[] args) { - weightWeek("F:\\体重与营养管理\\体重与营养管理第三版（北方）.xls"); - weightMange("F:\\体重与营养管理\\体重与营养管理第三版（北方）.xls"); - weightFood("F:\\体重与营养管理\\体重与营养管理第三版（北方）.xls"); + weightWeek("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls"); + weightMange("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls"); + weightFood("F:\\体重与营养管理\\体重与营养管理第三版（北方）改标红“、冰淇淋”-晓萌.xls"); } public static void addBaby(ApplicationContext applicationContext) { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/WeightConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/WeightConfigModel.java index 6cbcf14..92828b7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/WeightConfigModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/WeightConfigModel.java @@ -8,7 +8,7 @@ import java.util.List; /** * Created by Administrator on 2018-06-04. */ -@Document(collection = "lyms_weight_config_test") +@Document(collection = "lyms_weight_config") public class WeightConfigModel { private String id; private String week;//孕周 diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/WeightManageConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/WeightManageConfigModel.java deleted file mode 100644 index c69f657..0000000 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/WeightManageConfigModel.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.lyms.platform.pojo; - -import com.lyms.platform.beans.SerialIdEnum; -import com.lyms.platform.common.result.BaseModel; -import org.springframework.data.mongodb.core.mapping.Document; - -import java.io.Serializable; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -/** - * 体重营养管理基础配置数据模型 - * - */ -@Document(collection = "lyms_weight_config") -public class WeightManageConfigModel extends BaseModel { - - private static final long serialVersionUID = SerialIdEnum.WeightManageConfigModel.getCid(); - private String id; - private String week;//孕周 - private String example;//营养食谱举例 - private String breakfast;//早餐 - private String breakfastAdd;//上午加餐 - private String lunch;//午餐 - private String lunchAdd;//下午加餐 - private String dinner;//晚餐 - private String dinnerAdd;//晚加餐 - - //食谱 - private List cookbooks; - - private String weightType;//体重类型 - private List suggests;//建议 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getWeek() { - return week; - } - - public void setWeek(String week) { - this.week = week; - } - - public String getExample() { - return example; - } - - public void setExample(String example) { - this.example = example; - } - - public String getBreakfast() { - return breakfast; - } - - public void setBreakfast(String breakfast) { - this.breakfast = breakfast; - } - - public String getBreakfastAdd() { - return breakfastAdd; - } - - public void setBreakfastAdd(String breakfastAdd) { - this.breakfastAdd = breakfastAdd; - } - - public String getLunch() { - return lunch; - } - - public void setLunch(String lunch) { - this.lunch = lunch; - } - - public List getCookbooks() { - return cookbooks; - } - - public void setCookbooks(List cookbooks) { - this.cookbooks = cookbooks; - } - - public String getLunchAdd() { - return lunchAdd; - } - - public void setLunchAdd(String lunchAdd) { - this.lunchAdd = lunchAdd; - } - - public String getDinner() { - return dinner; - } - - public void setDinner(String dinner) { - this.dinner = dinner; - } - - public String getDinnerAdd() { - return dinnerAdd; - } - - public void setDinnerAdd(String dinnerAdd) { - this.dinnerAdd = dinnerAdd; - } - - - public String getWeightType() { - return weightType; - } - - public void setWeightType(String weightType) { - this.weightType = weightType; - } - - public List getSuggests() { - return suggests; - } - - public void setSuggests(List suggests) { - this.suggests = suggests; - } - - - - @Override - public String toString() { - return "WeightManageConfigModel{" + - "id='" + id + '\'' + - ", week='" + week + '\'' + - ", example='" + example + '\'' + - ", breakfast='" + breakfast + '\'' + - ", breakfastAdd='" + breakfastAdd + '\'' + - ", lunch='" + lunch + '\'' + - ", lunchAdd='" + lunchAdd + '\'' + - ", dinner='" + dinner + '\'' + - ", dinnerAdd='" + dinnerAdd + '\'' + - ", weightType='" + weightType + '\'' + - ", suggests='" + suggests + '\'' + - '}'; - } - - public static class Cookbook implements Serializable { - private static final long serialVersionUID = SerialIdEnum.Cookbook.getCid(); - private String vegetable;//菜名称 - private String foodMaterial; //食材 - private List makeMethod;//制作方法 - private String weightType;//体重类型 - private String week; - - public String getWeightType() { - return weightType; - } - - public void setWeightType(String weightType) { - this.weightType = weightType; - } - - public String getWeek() { - return week; - } - - public void setWeek(String week) { - this.week = week; - } - - public String getVegetable() { - return vegetable; - } - - public void setVegetable(String vegetable) { - this.vegetable = vegetable; - } - - public String getFoodMaterial() { - return foodMaterial; - } - - public void setFoodMaterial(String foodMaterial) { - this.foodMaterial = foodMaterial; - } - - public List getMakeMethod() { - return makeMethod; - } - - public void setMakeMethod(List makeMethod) { - this.makeMethod = makeMethod; - } - } -} - - diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 74ac17c..9ffd150 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -13,7 +13,6 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.result.ResponseCode; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; -import com.lyms.platform.operate.web.facade.BasicConfigFacade; import com.lyms.platform.operate.web.facade.OperateLogFacade; import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.PatientWeightService; @@ -23,7 +22,6 @@ import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.permission.service.impl.OrganizationServiceImpl; import com.lyms.platform.pojo.*; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -1279,20 +1277,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } - /** - * 获取体重配置 - * @param week 孕周 - * @param weightType - * @return - */ - private WeightManageConfigModel getWeightConfig(String week,String weightType) - { - WeightManageConfigModel weightManageConfigModel = mongoTemplate.findOne(Query.query(Criteria.where("week").is(week).and("weightType").is(weightType)), - WeightManageConfigModel.class); - return weightManageConfigModel; - } - - private WeightConfigModel getWeightConfigBykcal(Map map,String northSouth) { if (map.get("kulStart") == null) -- 1.8.3.1