diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java index 45a4eb8..bd74e23 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java @@ -59,6 +59,16 @@ public class TemporaryBloodSugar extends BaseModel { // 前囟 单胎/双胎/多胎 private String bregmatic; + private String riskLevelId; + + public String getRiskLevelId() { + return riskLevelId; + } + + public void setRiskLevelId(String riskLevelId) { + this.riskLevelId = riskLevelId; + } + public String getBregmatic() { return bregmatic; } 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 86daef5..513bd81 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 @@ -38,7 +38,7 @@ public class TemporaryBloodSugarController extends BaseController { } - @RequestMapping(value = "/querOne", method = RequestMethod.GET) + @RequestMapping(value = "/queryOne", method = RequestMethod.GET) @TokenRequired @ResponseBody public BaseResponse queryOne(@RequestParam(value = "id") String id) { 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 a760941..54c1870 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 @@ -156,7 +156,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo requestMap.put("id", bloodModel.getId()); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap); } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(bloodModel); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录"); } @Override 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 47508a0..9c8bed6 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 @@ -6,8 +6,10 @@ 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; +import com.lyms.platform.common.enums.HisptialRiskTypeEnum; import com.lyms.platform.common.result.*; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.ITemporaryBloodSugarService; @@ -67,6 +69,16 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I bloodSugar.setModified(new Date()); bloodSugar.setCreated(new Date()); bloodSugar.setYn(1); + List riskLevelIdList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(bloodSugar.getRiskFactorId())) { + List riskFactor = bloodSugar.getRiskFactorId(); + for (String risk : riskFactor) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(risk); + riskLevelIdList.add(basicConfig.getParentId()); + } + } + bloodSugar.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList)); + TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); } @@ -74,6 +86,15 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I bloodSugar.setModified(new Date()); bloodSugar.setCreated(new Date()); bloodSugar.setYn(1); + List riskLevelIdList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(bloodSugar.getRiskFactorId())) { + List riskFactor = bloodSugar.getRiskFactorId(); + for (String risk : riskFactor) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(risk); + riskLevelIdList.add(basicConfig.getParentId()); + } + } + bloodSugar.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList)); TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); } @@ -88,7 +109,52 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I @Override public BaseResponse queryOne(String id) { TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(bloodModel); + if (bloodModel != null) { + Map requestMap = new HashMap<>(); + List rists = bloodModel.getRiskFactorId(); + List listMap = new ArrayList<>(); + Integer riskScore = 0; + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) { + for (String rist : rists) { + Map map = new HashMap(); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); + if (basicConfig != null) { + riskScore += Integer.valueOf(basicConfig.getCode()); + if (StringUtils.isNotEmpty(basicConfig.getParentId())) { + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) { + map.put("color", HisptialRiskTypeEnum.YBFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) { + map.put("color", HisptialRiskTypeEnum.JGFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) { + map.put("color", HisptialRiskTypeEnum.GFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) { + map.put("color", HisptialRiskTypeEnum.CRB.getColor()); + } + if (basicConfig.getParentId().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", bloodModel.getUserName()); + requestMap.put("age", bloodModel.getAge()); + requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date())); + requestMap.put("phone", bloodModel.getPhone()); + requestMap.put("id", bloodModel.getId()); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap); + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录"); + } @Override @@ -132,11 +198,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I 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())); //高危等级（颜色） - - + temp.put("riskLevel", commonService.findRiskLevel(bloodSugar.getRiskLevelId())); //高危等级（颜色） String rFactor = commonService.resloveFactor(bloodSugar.getRiskFactorId()); if (bloodSugar.getHighriskDesc() != null && !"null".equals(bloodSugar.getHighriskDesc())) { if (StringUtils.isNotEmpty(rFactor)) { @@ -153,6 +215,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar())); //temp.put("vcCardNo", p.getVcCardNo()); // temp.put("pcerteTypeId", p.getPcerteTypeId()); + temp.put("bregmatic", bloodSugar.getBregmatic()); temp.put("cardNo", bloodSugar.getCardID()); } restList.add(temp); 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 0116fbe..c3a4284 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 @@ -139,26 +139,28 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo 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()); + + if (StringUtils.isNotEmpty(basicConfig.getParentId())) { + map.put("code", basicConfig.getCode()); + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) { + map.put("color", HisptialRiskTypeEnum.YBFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) { + map.put("color", HisptialRiskTypeEnum.JGFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) { + map.put("color", HisptialRiskTypeEnum.GFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) { + map.put("color", HisptialRiskTypeEnum.CRB.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) { + map.put("color", HisptialRiskTypeEnum.JK.getColor()); + } + map.put("name", basicConfig.getName()); + map.put("id", basicConfig.getId()); + listMap.add(map); } - map.put("name", basicConfig.getName()); - map.put("id", basicConfig.getId()); - listMap.add(map); } } requestMap.put("riskScore", riskScore);