diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodDao.java index cf1efe8..be1283a 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodDao.java @@ -5,5 +5,7 @@ import org.springframework.data.mongodb.core.query.Query; public interface ITemporaryBloodDao { + TemporaryBloodModel addTemporaryBlood(TemporaryBloodModel bloodModel); + void updateTemporaryBlood(Query query, TemporaryBloodModel weightModel); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodSugarDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodSugarDao.java index ff9b001..e32bd77 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodSugarDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodSugarDao.java @@ -5,5 +5,7 @@ import org.springframework.data.mongodb.core.query.Query; public interface ITemporaryBloodSugarDao { + TemporaryBloodSugar addTemporaryBloodSugar(TemporaryBloodSugar bloodSugar); + void updateTemporaryBloodSugar(Query query, TemporaryBloodSugar weightModel); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryBloodSugarDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryBloodSugarDaoImpl.java index e1c3fab..4bcb899 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryBloodSugarDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryBloodSugarDaoImpl.java @@ -11,6 +11,11 @@ public class TemporaryBloodSugarDaoImpl extends BaseMongoDAOImpl implements ITemporaryBloodDao { - + + @Override + public TemporaryBloodModel addTemporaryBlood(TemporaryBloodModel bloodModel) { + return save(bloodModel); + } + @Override public void updateTemporaryBlood(Query query, TemporaryBloodModel bloodModel) { update(query, bloodModel); diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java index c4cca64..340cb09 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java @@ -11,10 +11,11 @@ import java.util.Map; * @discription */ public enum HisptialRiskTypeEnum { - YBFX("315107bd-91fe-42a1-9237-752f3c046a40", "一般风险","risk_yellow"), - JGFX("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", "较高风险","risk_orange"), - GFX("eb146c03-b19f-4e28-b85f-fda574b2283b", "高风险","risk_red"), - CRB("224b2329-cb82-4da3-a071-8527f8283aab", "传染病","risk_purple"); + YBFX("315107bd-91fe-42a1-9237-752f3c046a40", "一般风险", "risk_yellow"), + JGFX("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", "较高风险", "risk_orange"), + GFX("eb146c03-b19f-4e28-b85f-fda574b2283b", "高风险", "risk_red"), + CRB("224b2329-cb82-4da3-a071-8527f8283aab", "传染病", "risk_purple"), + JK("d42eec03-aa86-45b8-a4e0-78a0ff365fb6", "健康", "risk_green"); private String id; private String name; private String color; @@ -27,6 +28,7 @@ public enum HisptialRiskTypeEnum { } return ""; } + public static List getHandlingSuggestionEnums() { List list = new ArrayList<>(); for (HisptialRiskTypeEnum e : HisptialRiskTypeEnum.values()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java index 93bf069..86daef5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java @@ -49,8 +49,8 @@ public class TemporaryBloodSugarController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(Integer page, Integer limit) { - return bloodSugarService.queryAll(page, limit); + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { + return bloodSugarService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit); } 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 index 6023f89..c133bf2 100644 --- 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 @@ -27,7 +27,7 @@ public class TemporaryWeightController extends BaseController { @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST) @TokenRequired @ResponseBody - public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) { + public BaseResponse addTemporaryWeight(TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) { return temporaryWeightService.addTemporaryWeight(temporaryWeightModel, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java index 89d490b..fa6c361 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java @@ -13,7 +13,7 @@ public interface ITemporaryBloodSugarService extends IBaseService { BaseResponse queryOne(String id); - BaseResponse queryAll(Integer page, Integer limit); + BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit); BaseResponse info(String parentId, Integer type, Date time); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index bbbe0d7..0508b15 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -1,6 +1,8 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.dal.ITemporaryBloodDao; +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -34,6 +36,10 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo @Autowired private PatientWeightService patientWeightService; + @Autowired + private CommonService commonService; + @Autowired + private BasicConfigService basicConfigService; @Override public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel) { @@ -53,8 +59,8 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo Map> infos = new LinkedHashMap<>(); infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); bloodModel.setInfos(infos); - mongoTemplate.insert(bloodModel); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); + TemporaryBloodModel temporaryBloodModel = temporaryBloodDao.addTemporaryBlood(bloodModel); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); } else { bloodModel.setModified(new Date()); temporaryBloodDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(bloodModel.getId())), bloodModel); @@ -73,8 +79,8 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo Map> infos = new LinkedHashMap<>(); infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); bloodModel.setInfos(infos); - mongoTemplate.insert(bloodModel); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); + TemporaryBloodModel temporaryBloodModel = temporaryBloodDao.addTemporaryBlood(bloodModel); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); } } @@ -127,42 +133,57 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo Map temp = new HashMap<>(); //Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class); temp.put("id", bloodPressure.getId()); - /* if (bloodPressure != null) { + if (bloodPressure != null) { temp.put("username", bloodPressure.getUserName()); temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified())); temp.put("age", bloodPressure.getAge()); temp.put("week", DateUtil.getWeekDesc(bloodPressure.getLastMenses(), new Date())); - temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色） - String rFactor = commonService.resloveFactor(p.getRiskFactorId()); - if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor())) { + // temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色） + + String rFactor = commonService.resloveFactor(bloodPressure.getRiskFactorId()); + if (bloodPressure.getHighriskDesc() != null && !"null".equals(bloodPressure.getHighriskDesc())) { if (StringUtils.isNotEmpty(rFactor)) { - rFactor += "," + p.getoRiskFactor(); + rFactor += "," + bloodPressure.getHighriskDesc(); } else { - rFactor = p.getoRiskFactor(); + rFactor = bloodPressure.getHighriskDesc(); } } temp.put("riskFactor", rFactor); // 高危因素 - temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); + // temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg"); temp.put("pulse", bloodPressure.getPulse()); temp.put("status", getPulseStatus(bloodPressure.getSsy(), bloodPressure.getSzy())); - temp.put("vcCardNo", p.getVcCardNo()); - temp.put("pcerteTypeId", p.getPcerteTypeId()); - temp.put("cardNo", p.getCardNo()); - temp.put("beforWeight", bloodPressure.getBeforWeight() == null ? "" : bloodPressure.getBeforWeight()); - temp.put("weight", bloodPressure.getWeight() == null ? "" : bloodPressure.getWeight()); - temp.put("height", bloodPressure.getHeight() == null ? "" : bloodPressure.getHeight()); - temp.put("tireNumber", bloodPressure.getTireNumber() == null ? "" : bloodPressure.getTireNumber()); + //temp.put("vcCardNo", p.getVcCardNo()); + //temp.put("pcerteTypeId", p.getPcerteTypeId()); + temp.put("cardID", bloodPressure.getCardID()); + temp.put("beforWeight", bloodPressure.getBeforeWeight() == null ? "" : bloodPressure.getBeforeWeight()); + temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight()); + temp.put("height", bloodPressure.getBeforeHeight() == null ? "" : bloodPressure.getBeforeHeight()); + temp.put("bregmatic", bloodPressure.getBregmatic() == null ? "" : bloodPressure.getBregmatic()); - }*/ + } restList.add(temp); } pageResult.setGrid(restList); return RespBuilder.buildSuccess(pageResult); } + private String getPulseStatus(String ssy, String szy) { + String status = ""; + if (StringUtils.isNotEmpty(ssy)) { + if (Double.parseDouble(ssy) < 90) { + status = "低血压"; + } else if (Double.parseDouble(ssy) > 140) { + status = "高血压"; + } else { + status = "正常"; + } + } + return status; + } + @Override public BaseResponse info(String id, Date startDate) { TemporaryBloodModel bloodPressure = mongoTemplate.findById(id, TemporaryBloodModel.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index 3e58b31..47508a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.dal.ITemporaryBloodSugarDao; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.BloodSugarEnums; import com.lyms.platform.common.enums.BloodSugarEnums2; @@ -50,6 +51,8 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I @Autowired private PatientWeightService patientWeightService; + @Autowired + private CommonService commonService; @Override public BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar) { @@ -64,15 +67,15 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I bloodSugar.setModified(new Date()); bloodSugar.setCreated(new Date()); bloodSugar.setYn(1); - mongoTemplate.insert(bloodSugar); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); + TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); } } else { bloodSugar.setModified(new Date()); bloodSugar.setCreated(new Date()); bloodSugar.setYn(1); - mongoTemplate.insert(bloodSugar); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); + TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); } } @@ -89,13 +92,88 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } @Override - public BaseResponse queryAll(Integer page, Integer limit) { + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { + boolean flag = false; + Criteria pCriteria = Criteria.where("yn").ne(0); Criteria criteria = Criteria.where("yn").ne(0); + if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { + pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); + flag = true; + } + if (stateWeek != null && endWeek != null) { + Date start = DateUtil.getWeekStart(stateWeek); + Date end = DateUtil.getWeekEnd(endWeek); + pCriteria.and("lastMenses").gt(start).lte(end); + flag = true; + } + if (bregmatic != null) { + pCriteria.and("bregmatic").is(bregmatic); + flag = true; + } + if (flag) { + List patients = mongoTemplate.find(Query.query(pCriteria), TemporaryBloodSugar.class); + List ids = new ArrayList<>(); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patients)) { + for (TemporaryBloodSugar patient : patients) { + ids.add(patient.getId()); + } + } + criteria.and("_id").in(ids); + } PageResult pageResult = findMongoPage(TemporaryBloodSugar.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(pageResult); + List bloodSugars = (List) pageResult.getGrid(); + List> restList = new ArrayList<>(); + for (TemporaryBloodSugar bloodSugar : bloodSugars) { + Map temp = new HashMap<>(); + //Patients p = mongoTemplate.findById(bloodSugar.getParentId(), Patients.class); + temp.put("id", bloodSugar.getId()); + if (bloodSugars != null) { + temp.put("username", bloodSugar.getUserName()); + temp.put("time", DateUtil.getyyyy_MM_dd(bloodSugar.getModified())); + temp.put("age", bloodSugar.getAge()); + temp.put("week", DateUtil.getWeekDesc(bloodSugar.getLastMenses(), new Date())); + + + //temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色） + + + String rFactor = commonService.resloveFactor(bloodSugar.getRiskFactorId()); + if (bloodSugar.getHighriskDesc() != null && !"null".equals(bloodSugar.getHighriskDesc())) { + if (StringUtils.isNotEmpty(rFactor)) { + rFactor += "," + bloodSugar.getHighriskDesc(); + } else { + rFactor = bloodSugar.getHighriskDesc(); + } + } + temp.put("riskFactor", rFactor); // 高危因素 + //temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); + temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L"); + temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType())); + temp.put("bloodSugarId", bloodSugar.getBloodSugarType()); + temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar())); + //temp.put("vcCardNo", p.getVcCardNo()); + // temp.put("pcerteTypeId", p.getPcerteTypeId()); + temp.put("cardNo", bloodSugar.getCardID()); + } + restList.add(temp); + } + pageResult.setGrid(restList); + return RespBuilder.buildSuccess(pageResult); } + private String getBloodSugarStatus(Integer type, String bloodSugar) { + if (type == BloodSugarEnums.A.getId()) { + return Double.parseDouble(bloodSugar) > 5.6D ? "高血糖" : Double.parseDouble(bloodSugar) < 3.3D ? "低血糖" : "正常"; + } else if (type == BloodSugarEnums.B.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { + return Double.parseDouble(bloodSugar) > 5.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 3.3D ? "低血糖" : "正常"; + } else if (type == BloodSugarEnums.I.getId()) { + return Double.parseDouble(bloodSugar) > 7.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 6.1D ? "低血糖" : "正常"; + } else { + return Double.parseDouble(bloodSugar) > 6.7D ? "高血糖" : Double.parseDouble(bloodSugar) < 4.4D ? "低血糖" : "正常"; + } + } + @Override public BaseResponse info(String id, Integer type, Date time) { List> tabList = new ArrayList<>(); 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 index ae9fa3a..73fe6df 100644 --- 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 @@ -4,6 +4,7 @@ import com.lyms.platform.biz.dal.ITemporaryWeightDao; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.BregmaticEnums2; +import com.lyms.platform.common.enums.HisptialRiskTypeEnum; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; @@ -128,18 +129,46 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo public BaseResponse queryOne(String id) { if (StringUtils.isNotEmpty(id)) { TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); - temporaryWeightModel.setWeeks(DateUtil.getWeekDesc(temporaryWeightModel.getLastMenses(), new Date())); if (temporaryWeightModel != null) { + Map requestMap = new HashMap<>(); List rists = temporaryWeightModel.getRiskFactorId(); + List listMap = new ArrayList<>(); + Integer riskScore = 0; if (CollectionUtils.isNotEmpty(rists)) { for (String rist : rists) { + Map map = new HashMap(); BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); - + riskScore += Integer.valueOf(basicConfig.getCode()); + map.put("code", basicConfig.getCode()); + BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.YBFX.getId())) { + map.put("color", HisptialRiskTypeEnum.YBFX.getColor()); + } + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JGFX.getId())) { + map.put("color", HisptialRiskTypeEnum.JGFX.getColor()); + } + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.GFX.getId())) { + map.put("color", HisptialRiskTypeEnum.GFX.getColor()); + } + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.CRB.getId())) { + map.put("color", HisptialRiskTypeEnum.CRB.getColor()); + } + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JK.getId())) { + map.put("color", HisptialRiskTypeEnum.JK.getColor()); + } + map.put("name", basicConfig.getName()); + map.put("id", basicConfig.getId()); + listMap.add(map); } - } + requestMap.put("riskScore", riskScore); + requestMap.put("riskFactor", listMap); + requestMap.put("userName", temporaryWeightModel.getUserName()); + requestMap.put("age", temporaryWeightModel.getAge()); + requestMap.put("weeks", DateUtil.getWeekDesc(temporaryWeightModel.getLastMenses(), new Date())); + requestMap.put("phone", temporaryWeightModel.getPhone()); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap); } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(temporaryWeightModel); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录"); } @@ -174,8 +203,6 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo criteria.and("_id").in(ids); } Users users = usersService.getUsers(userId); - System.out.println("=========>" + users.getAccount()); - PageResult pageResult = findMongoPage(TemporaryWeightModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); List patientWeights = (List) pageResult.getGrid(); List> restMap = new ArrayList<>();