From add66cd4587974e3677b9fb0127ace6fb6d6e699 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Fri, 29 Mar 2019 17:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=A1=B9bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/dal/ITemporaryWeightDao.java | 12 ++ .../biz/dal/impl/TemporaryWeightDaoImpl.java | 26 +++ .../service/impl/CheckItemManageServiceImpl.java | 6 +- .../java/com/lyms/platform/beans/SerialIdEnum.java | 3 + .../lyms/platform/pojo/TemporaryWeightModel.java | 200 +++++++++++++++++++++ .../web/controller/PatientWeightController.java | 12 +- .../web/controller/TemporaryWeightController.java | 64 +++++++ .../operate/web/service/PatientWeightService.java | 3 + .../web/service/TemporaryWeightService.java | 21 +++ .../web/service/impl/PatientWeightServiceImpl.java | 2 +- .../service/impl/TemporaryWeightServiceImpl.java | 162 +++++++++++++++++ 11 files changed, 500 insertions(+), 11 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java new file mode 100644 index 0000000..f1b8301 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java @@ -0,0 +1,12 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.pojo.TemporaryWeightModel; +import org.springframework.data.mongodb.core.query.Query; + +public interface ITemporaryWeightDao { + public void addTemporaryWeight(TemporaryWeightModel weightModel); + + void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel); + + void deleteTemporaryWeight(Query query); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.java new file mode 100644 index 0000000..a4f2e38 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.java @@ -0,0 +1,26 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.ITemporaryWeightDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.pojo.TemporaryWeightModel; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.stereotype.Repository; + + +@Repository("temporaryWeightDao") +public class TemporaryWeightDaoImpl extends BaseMongoDAOImpl implements ITemporaryWeightDao { + @Override + public void addTemporaryWeight(TemporaryWeightModel weightModel) { + save(weightModel); + } + + @Override + public void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel) { + update(query, weightModel); + } + + @Override + public void deleteTemporaryWeight(Query query) { + delete(query); + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java index 133cf78..5211618 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java @@ -2,6 +2,7 @@ package com.lyms.platform.permission.service.impl; import com.lyms.platform.biz.AntExChuModelTemp; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.permission.dao.master.MasterCheckItemManageMapper; import com.lyms.platform.permission.dao.master.MasterCheckItemMapper; import com.lyms.platform.permission.model.CheckItem; @@ -91,9 +92,7 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { }); //获取排序后对象中的第一条数据 AntenatalExaminationModel examinationModels = antenatalExaminationModels.get(0); - if (examinationModels != null && examinationModels.getConfigItemId() != null) { - System.out.println("=======>复诊" + examinationModels.getConfigItemId()); - System.out.println("=====>时间" + DateUtil.getyyyy_MM_dd_hms(examinationModels.getModified())); + if (examinationModels != null && StringUtils.isNotEmpty(examinationModels.getConfigItemId())) { String strCept = examinationModels.getConfigItemId(); String[] string = strCept.split(","); for (String s1 : string) { @@ -114,7 +113,6 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { //获取初诊 AntExChuModelTemp antExChuModelTemps = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModelTemp.class); if (antExChuModelTemps != null && antExChuModelTemps.getConfigItemId() != null) { - System.out.println("========初诊:" + antExChuModelTemps.getConfigItemId()); String[] str = antExChuModelTemps.getConfigItemId().split(","); for (String s2 : str) { List list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s2).intValue()); diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index 41260d0..a7aa9e0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -80,10 +80,13 @@ public enum SerialIdEnum { BabySieveModel("BabySieveModel", 97531049991L), PostpartumRecords("PostpartumRecords", 97521049991L), QuestionModel("QuestionModel", 97521049991L), + TemporaryWeightModel("TemporaryWeightModel", 97531049591L), BabyEyeCheck("BabyEyeCheck", 97521039591L); + private String cname; private Long cid; + private SerialIdEnum(String cname, Long cid) { this.cid = cid; this.cname = cname; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java new file mode 100644 index 0000000..ea4cccd --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryWeightModel.java @@ -0,0 +1,200 @@ +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.util.Date; +import java.util.List; +import java.util.Map; + +@Document(collection = "lyms_temporary_weigh") +public class TemporaryWeightModel extends BaseModel { + private static final long serialVersionUID = SerialIdEnum.TemporaryWeightModel.getCid(); + + private String id; + private String userName; + private Integer age; + private Integer yn; + private String weeks; + // 孕前体重 + private String beforeWeight; + + // 孕前身高 + private String beforeHeight; + + // 当前体重 + private String nowWeight; + + // 前囟 单胎/双胎/多胎 + private String bregmatic; + + + private Date created; + + private Date modified; + //记录次数 + private Integer number; + + private String phone; + //高危因素 + private List riskFactorId; + //末次月经 + private Date lastMenses; + + private String bmi; + + private String cardID; + + public String getCardID() { + return cardID; + } + + public void setCardID(String cardID) { + this.cardID = cardID; + } + + // 存储 年月日 = xxKG + private Map dayWeights; + + public Map getDayWeights() { + return dayWeights; + } + + + public Date getLastMenses() { + return lastMenses; + } + + public void setLastMenses(Date lastMenses) { + this.lastMenses = lastMenses; + } + + public void setDayWeights(Map dayWeights) { + this.dayWeights = dayWeights; + } + + public String getBmi() { + return bmi; + } + + public void setBmi(String bmi) { + this.bmi = bmi; + } + + public List getRiskFactorId() { + return riskFactorId; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public void setRiskFactorId(List riskFactorId) { + this.riskFactorId = riskFactorId; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getWeeks() { + return weeks; + } + + public void setWeeks(String weeks) { + this.weeks = weeks; + } + + public String getBeforeWeight() { + return beforeWeight; + } + + public void setBeforeWeight(String beforeWeight) { + this.beforeWeight = beforeWeight; + } + + public String getBeforeHeight() { + return beforeHeight; + } + + public void setBeforeHeight(String beforeHeight) { + this.beforeHeight = beforeHeight; + } + + public String getNowWeight() { + return nowWeight; + } + + public void setNowWeight(String nowWeight) { + this.nowWeight = nowWeight; + } + + public String getBregmatic() { + return bregmatic; + } + + public void setBregmatic(String bregmatic) { + this.bregmatic = bregmatic; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index c64b48c..e8c0a26 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -32,6 +32,12 @@ public class PatientWeightController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.POST) + + + + + + @TokenRequired public BaseResponse addOrUpdate(PatientWeight patientWeight, HttpServletRequest request) { return patientWeightService.addOrUpdate(getUserId(request), patientWeight); @@ -256,12 +262,6 @@ public class PatientWeightController extends BaseController { * @param pid * @return */ -/* - public BaseResponse report(@PathVariable String id, - HttpServletRequest request, - @RequestParam(value = "rid", required = false) String rid) { - return patientWeightService.report(id, getUserId(request), rid); - }*/ @ResponseBody @RequestMapping(value = "/getWeightsReport/{pid}", method = RequestMethod.GET) @TokenRequired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java new file mode 100644 index 0000000..9f5277d --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java @@ -0,0 +1,64 @@ +package com.lyms.platform.operate.web.controller; + + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.service.TemporaryWeightService; +import com.lyms.platform.pojo.TemporaryWeightModel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; + +@Controller +@RequestMapping("/temporary/weight") +public class TemporaryWeightController { + + @Autowired + private TemporaryWeightService temporaryWeightService; + + @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST) + @TokenRequired + @ResponseBody + public BaseResponse addTemporaryWeight(TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return temporaryWeightService.addTemporaryWeight(temporaryWeightModel); + } + + @RequestMapping(value = "/update", method = RequestMethod.PUT) + @TokenRequired + public BaseResponse udateTemporaryWeight() { + return new BaseResponse(); + } + + @RequestMapping(value = "/delete", method = RequestMethod.DELETE) + @TokenRequired + @ResponseBody + public BaseResponse delete(@RequestParam(value = "phone") String phone) { + return temporaryWeightService.deleteTemporaryWeight(phone); + } + + @RequestMapping(value = "/queryOne", method = RequestMethod.GET) + @TokenRequired + @ResponseBody + public BaseResponse queryOne(String phone) { + return temporaryWeightService.queryOne(phone); + } + + @RequestMapping(value = "/queryAll", method = RequestMethod.GET) + @TokenRequired + @ResponseBody + public BaseResponse queryAll(Integer page, Integer limit) { + return temporaryWeightService.queryAll(page, limit); + } + + @ResponseBody + @TokenRequired + @RequestMapping(value = "/info/{phone}", method = RequestMethod.GET) + public BaseResponse info(@PathVariable String phone) { + return temporaryWeightService.info(phone); + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java index 9df2960..75d37e5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java @@ -56,4 +56,7 @@ public interface PatientWeightService extends IBaseService { public void getSeries(Map series, String bmiStr, String bregmatic); BaseResponse getWeightsReport(String pid, Integer userId, String rid); + + public void setReport(Map restMap, Map weights, String beforeWeight, + String bmi, Map dayWeights, String bregmatic); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java new file mode 100644 index 0000000..3ea9086 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java @@ -0,0 +1,21 @@ +package com.lyms.platform.operate.web.service; + +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.pojo.TemporaryWeightModel; +import org.springframework.data.mongodb.core.query.Query; + +public interface TemporaryWeightService extends IBaseService { + + BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel); + + void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel); + + BaseResponse deleteTemporaryWeight(String Phone); + + BaseResponse queryOne(String phone); + + BaseResponse queryAll(Integer page, Integer limit); + + BaseResponse info(String phone); + +} 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 8a4e5d9..65cbd38 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 @@ -1315,6 +1315,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return restList; } + @Override public void setReport(Map restMap, Map weights, String beforeWeight, String bmi, Map dayWeights, String bregmatic) { List> restList = new ArrayList<>(); @@ -2323,7 +2324,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return 0.0; } - public double getDiabetes(double height, Integer weeks) { if (weeks > 0 && weeks <= 12) { return height * height * 21 * 30; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java new file mode 100644 index 0000000..2bac871 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java @@ -0,0 +1,162 @@ +package com.lyms.platform.operate.web.service.impl; + +import com.lyms.platform.biz.dal.ITemporaryWeightDao; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.BregmaticEnums2; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.result.PageResult; +import com.lyms.platform.common.result.RespBuilder; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.ReflectionUtils; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.service.PatientWeightService; +import com.lyms.platform.operate.web.service.TemporaryWeightService; +import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.pojo.TemporaryWeightModel; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; +import org.springframework.stereotype.Service; + +import java.util.*; + +@Service +public class TemporaryWeightServiceImpl extends BaseServiceImpl implements TemporaryWeightService { + + @Autowired + private ITemporaryWeightDao temporaryWeightDao; + + @Autowired + private MongoTemplate mongoTemplate; + + @Autowired + private PatientWeightService patientWeightService; + + @Override + public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel) { + if (StringUtils.isNotEmpty(weightModel.getPhone())) { + TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(weightModel.getPhone())), TemporaryWeightModel.class); + if (temporaryWeightModel != null) { + if (StringUtils.isNotEmpty(temporaryWeightModel.getPhone())) { + weightModel.setModified(new Date()); + temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("phone").is(temporaryWeightModel.getPhone())), weightModel); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); + } + } else { + weightModel.setYn(1); + weightModel.setModified(new Date()); + weightModel.setCreated(new Date()); + Map dayWeights = new LinkedHashMap<>(); + List> dayWeights2 = new ArrayList<>(); + /* if (MapUtils.isNotEmpty(temporaryWeightModel.getDayWeights())) { + dayWeights = temporaryWeightModel.getDayWeights(); + }*/ + dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight()); + weightModel.setDayWeights(dayWeights); + weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight())); + temporaryWeightDao.addTemporaryWeight(weightModel); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); + + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请填写电话号码"); + } + + @Override + public void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel) { + + } + + @Override + public BaseResponse deleteTemporaryWeight(String phone) { + mongoTemplate.updateFirst(Query.query(Criteria.where("phone").is(phone)), Update.update("yn", 1), TemporaryWeightModel.class); + return RespBuilder.buildSuccess(); + } + + @Override + public BaseResponse queryOne(String phone) { + if (StringUtils.isNotEmpty(phone)) { + TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(phone)), TemporaryWeightModel.class); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(temporaryWeightModel); + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录"); + } + + @Override + public BaseResponse queryAll(Integer page, Integer limit) { + Criteria criteria = Criteria.where("yn").ne(0); + PageResult pageResult = findMongoPage(TemporaryWeightModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(pageResult); + } + + + @Override + public BaseResponse info(String phone) { + TemporaryWeightModel template = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(phone)), TemporaryWeightModel.class); + if (template != null) { + /* Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); + if (patients == null) { + return RespBuilder.buildSuccess("建档数据未找到"); + }*/ + Map map = ReflectionUtils.beanToMap(template); + //http://jira.healthbaby.com.cn/browse/WEB-2744 + String bregmatic = ""; + try { + if (org.apache.commons.lang.StringUtils.isEmpty(template.getBregmatic()) || "null".equals(template.getBregmatic())) { + bregmatic = "未知"; + } else { + bregmatic = BregmaticEnums2.getName(template.getBregmatic()); + } + } catch (Exception e) { + bregmatic = "未知"; + } + + map.put("bregmatic", bregmatic); + map.put("bim", template.getBmi()); // 体质指数（BMI）=体重（kg）÷身高^2（m） + + Map dayWeights = template.getDayWeights(); + dayWeights = sortMapByKey(dayWeights); + Map weights = new LinkedHashMap<>(); + if (MapUtils.isNotEmpty(dayWeights)) { + Set> entries = dayWeights.entrySet(); + for (Map.Entry entry : entries) { + weights.put(DateUtil.getWeek2(template.getLastMenses(), DateUtil.parseYMD(entry.getKey())), entry.getValue()); + } + } + + if (dayWeights != null && dayWeights.size() > 0 && org.apache.commons.lang.StringUtils.isNotEmpty(dayWeights.get(DateUtil.getyyyy_MM_dd(new Date())))) { + map.put("isShow", true); + } else { + map.put("isShow", false); + } + patientWeightService.setReport(map, weights, template.getBeforeWeight(), template.getBmi(), template.getDayWeights(), template.getBregmatic()); + + CollectionUtils.removeNullValue(map); + return RespBuilder.buildSuccess(map); + } + return RespBuilder.buildSuccess(); + } + + private Map sortMapByKey(Map dayWeights) { + if (MapUtils.isNotEmpty(dayWeights)) { + Map temp = new TreeMap<>(new Comparator() { + @Override + public int compare(String o1, String o2) { + return o1.compareTo(o2); + } + }); + for (Map.Entry entry : dayWeights.entrySet()) { + temp.put(entry.getKey(), entry.getValue()); + } + return temp; + } + return dayWeights; + } + + +} \ No newline at end of file -- 1.8.3.1