From 9652b8abd0fd97ec854a44b6df4a1e0104e4996b Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Mon, 29 Apr 2019 11:37:20 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/TemporaryBloodSugar.java | 90 ++------ .../com/lyms/platform/pojo/TemporaryUserModel.java | 2 + .../controller/TemporaryBloodSugarController.java | 11 +- .../web/controller/TemporaryUserController.java | 3 +- .../web/controller/TemporaryWeightController.java | 12 +- .../operate/web/facade/HealthChargeFacade.java | 8 +- .../web/service/ITemporaryBloodSugarService.java | 4 +- .../web/service/TemporaryWeightService.java | 4 +- .../impl/TemporaryBloodSugarServiceImpl.java | 245 ++++++++------------- .../service/impl/TemporaryWeightServiceImpl.java | 16 +- 10 files changed, 136 insertions(+), 259 deletions(-) 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 baa03a4..c8772b2 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 @@ -13,18 +13,7 @@ public class TemporaryBloodSugar extends BaseModel { private static final long serialVersionUID = SerialIdEnum.TemporaryBloodSugarModel.getCid(); private String id; - private String userName; - - private Integer age; - - private String phone; - - private Date lastMenses; - // 孕前体重 - private String beforeWeight; - // 孕前身高 - private String beforeHeight; - // 当前体重 + //当前体重 private String nowWeight; private String cardID; @@ -32,9 +21,8 @@ public class TemporaryBloodSugar extends BaseModel { private Date created; private Date modified; - private List riskFactorId; - // 其他高危 - private String highriskDesc; + + //高危补充说明 private List otherRisk; //监测状态 1 非药物治疗，监测不足 2 非药物治疗，监测次数达标，血糖控制不理想 @@ -68,6 +56,16 @@ public class TemporaryBloodSugar extends BaseModel { private Integer status; private Integer yn; + private String temporaryUserId; + + public String getTemporaryUserId() { + return temporaryUserId; + } + + public void setTemporaryUserId(String temporaryUserId) { + this.temporaryUserId = temporaryUserId; + } + public String getHospitalId() { return hospitalId; } @@ -133,53 +131,6 @@ public class TemporaryBloodSugar extends BaseModel { 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 getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public Date getLastMenses() { - return lastMenses; - } - - public void setLastMenses(Date lastMenses) { - this.lastMenses = lastMenses; - } - - 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; @@ -213,21 +164,6 @@ public class TemporaryBloodSugar extends BaseModel { this.modified = modified; } - public List getRiskFactorId() { - return riskFactorId; - } - - public void setRiskFactorId(List riskFactorId) { - this.riskFactorId = riskFactorId; - } - - public String getHighriskDesc() { - return highriskDesc; - } - - public void setHighriskDesc(String highriskDesc) { - this.highriskDesc = highriskDesc; - } public List getOtherRisk() { return otherRisk; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java index 9256e35..be71ad0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java @@ -35,6 +35,8 @@ public class TemporaryUserModel extends BaseModel { private List riskFactorId; // 其他高危 private String highriskDesc; + + //高危补充说明 private List otherRisk; // 前囟 单胎/双胎/多胎 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 bd29ba3..fdc1905 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 @@ -23,10 +23,10 @@ public class TemporaryBloodSugarController extends BaseController { @Autowired private ITemporaryBloodSugarService bloodSugarService; - @RequestMapping(value = "/addAndUpate", method = RequestMethod.POST) + @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST) @TokenRequired @ResponseBody - public BaseResponse addTempraryBloodSugar(@Valid @RequestBody TemporaryBloodSugar bloodSugar, HttpServletRequest request) { + public BaseResponse addTempraryBloodSugar(TemporaryBloodSugar bloodSugar, HttpServletRequest request) { return bloodSugarService.addAndUpdate(bloodSugar, getUserId(request)); } @@ -39,13 +39,13 @@ public class TemporaryBloodSugarController extends BaseController { } - @RequestMapping(value = "/queryOne", method = RequestMethod.GET) + /* @RequestMapping(value = "/queryOne", method = RequestMethod.GET) @TokenRequired @ResponseBody public BaseResponse queryOne(@RequestParam(value = "id") String id) { return bloodSugarService.queryOne(id); - } + }*/ @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @@ -61,10 +61,11 @@ public class TemporaryBloodSugarController extends BaseController { return bloodSugarService.info(id, type, time); } + /** * 院内系统血糖报告 * - * @param id + * @param * @return */ @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java index 0bd1a22..e1cd142 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java @@ -24,8 +24,7 @@ public class TemporaryUserController extends BaseController { @ResponseBody @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST) @TokenRequired - - public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) { + public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, HttpServletRequest request) { return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request)); } 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 80f4ba5..a6ac416 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 @@ -44,7 +44,7 @@ public class TemporaryWeightController extends BaseController { return temporaryWeightService.deleteTemporaryWeight(id); } - @RequestMapping(value = "/queryOne", method = RequestMethod.GET) + /*@RequestMapping(value = "/queryOne", method = RequestMethod.GET) @TokenRequired @ResponseBody public BaseResponse queryOne(String id) { @@ -66,12 +66,12 @@ public class TemporaryWeightController extends BaseController { } - /** + *//** * 体重营养管理报表 * * @param id * @return - */ + *//* @ResponseBody @RequestMapping(value = "/getWeightsReport/{id}", method = RequestMethod.GET) @TokenRequired @@ -85,12 +85,12 @@ public class TemporaryWeightController extends BaseController { } - /** + *//** * 体重标准报告 * * @param id * @return - */ + *//* @ResponseBody @RequestMapping(value = "report/{id}", method = RequestMethod.GET) @TokenRequired @@ -98,7 +98,7 @@ public class TemporaryWeightController extends BaseController { HttpServletRequest request, @RequestParam(value = "rid", required = false) String rid) { return temporaryWeightService.report(id, getUserId(request), rid); - } + }*/ protected Integer getUserId(HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java index 47f92aa..ba3a3ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java @@ -175,7 +175,8 @@ public class HealthChargeFacade { getTemporaryWeightInfo(map, model.getForeignId(), model.getCreated()); break; case 2: - getTemporaryBloodSugarInfo(map, model.getForeignId(), model.getCreated()); + //全俞 + //getTemporaryBloodSugarInfo(map, model.getForeignId(), model.getCreated()); break; case 3: //全俞 @@ -214,13 +215,14 @@ public class HealthChargeFacade { * @param id * @param created */ - private void getTemporaryBloodSugarInfo(Map map, String id, Date created) { + //全俞 + /* private void getTemporaryBloodSugarInfo(Map map, String id, Date created) { TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id).and("yn").is(YnEnums.YES.getId())), TemporaryBloodSugar.class); if (temporaryBloodSugar != null) { setMap(map, temporaryBloodSugar.getUserName(), temporaryBloodSugar.getAge(), temporaryBloodSugar.getLastMenses(), created); } - } + }*/ /** * 临时血压信息 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 b6b839c..5febd72 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 @@ -11,8 +11,8 @@ public interface ITemporaryBloodSugarService extends IBaseService { BaseResponse deleteBloodSugar(String id); - BaseResponse queryOne(String id); - + /*BaseResponse queryOne(String id); + */ BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); BaseResponse info(String parentId, Integer type, Date time); 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 index a7f5122..62b3922 100644 --- 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 @@ -12,7 +12,7 @@ public interface TemporaryWeightService extends IBaseService { BaseResponse deleteTemporaryWeight(String Phone); - BaseResponse queryOne(String id); + /*BaseResponse queryOne(String id); BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId); @@ -20,6 +20,6 @@ public interface TemporaryWeightService extends IBaseService { BaseResponse getWeightsReport(String phone, Integer userId, String rid); - BaseResponse report(String id, Integer userId, String rid); + BaseResponse report(String id, Integer userId, String rid);*/ } 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 bd833ed..ee93ae5 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 @@ -7,6 +7,7 @@ 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.enums.YnEnums; import com.lyms.platform.common.result.*; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; @@ -65,89 +66,24 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I @Override public BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar, Integer userId) { - List bloodSugars = mongoTemplate.findAll(TemporaryBloodSugar.class); - if (CollectionUtils.isNotEmpty(bloodSugars)) { - TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(bloodSugar.getPhone()).and("bloodSugarType").is(bloodSugar.getBloodSugarType()).and("yn").is(1)), TemporaryBloodSugar.class); - if (temporaryBloodSugar != null) { - bloodSugar.setModified(new Date()); - Map dayWeights = new LinkedHashMap<>(); - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight()); - bloodSugar.setDayWeights(dayWeights); - temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(bloodSugar.getId()).and("bloodSugarType").is(bloodSugar.getBloodSugarType()).and("yn").is(1)), bloodSugar); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); - } else if (null != bloodSugar.getId() && null == temporaryBloodSugar) { - TemporaryBloodSugar sugar = new TemporaryBloodSugar(); - for (TemporaryBloodSugar sugarList : bloodSugars) { - if (bloodSugar.getId().equals(sugarList.getId())) { - sugar.setModified(new Date()); - sugar.setCreated(new Date()); - sugar.setYn(1); - sugar.setUserName(sugarList.getUserName()); - sugar.setPhone(sugarList.getPhone()); - sugar.setAge(sugarList.getAge()); - sugar.setBeforeHeight(sugarList.getBeforeHeight()); - sugar.setNowWeight(bloodSugar.getNowWeight()); - sugar.setBloodSugar(bloodSugar.getBloodSugar()); - sugar.setBloodSugarType(bloodSugar.getBloodSugarType()); - sugar.setLastMenses(sugarList.getLastMenses()); - sugar.setBeforeWeight(sugarList.getBeforeWeight()); - sugar.setBregmatic(sugarList.getBregmatic()); - sugar.setCardID(sugarList.getCardID()); - Map dayWeights = new LinkedHashMap<>(); - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight()); - sugar.setDayWeights(dayWeights); - sugar.setRiskFactorId(sugarList.getRiskFactorId()); - sugar.setRiskLevelId(sugarList.getRiskLevelId()); - sugar.setHospitalId(sugarList.getHospitalId()); - sugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date())); - temporaryBloodSugarDao.addTemporaryBloodSugar(sugar); - } - } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("增加成功"); - } else { - bloodSugar.setModified(new Date()); - bloodSugar.setCreated(new Date()); - bloodSugar.setYn(1); - Map dayWeights = new LinkedHashMap<>(); - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight()); - bloodSugar.setDayWeights(dayWeights); - 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)); - String hospitalId = autoMatchFacade.getHospitalId(userId); - bloodSugar.setHospitalId(hospitalId); - bloodSugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date())); - 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); - Map dayWeights = new LinkedHashMap<>(); - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight()); - bloodSugar.setDayWeights(dayWeights); - 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)); - bloodSugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date())); - String hospitalId = autoMatchFacade.getHospitalId(userId); - bloodSugar.setHospitalId(hospitalId); - TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); + TemporaryBloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("temporaryUserId").is(bloodSugar.getTemporaryUserId()).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugar.getBloodSugarType())), TemporaryBloodSugar.class); + if (one != null) { + one.setModified(new Date()); + one.setBloodSugar(bloodSugar.getBloodSugar()); + temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(one.getId())), one); + return RespBuilder.buildSuccess(one.getId()); } + bloodSugar.setHospitalId(autoMatchFacade.getHospitalId(userId)); + bloodSugar.setCreated(new Date()); + bloodSugar.setYn(YnEnums.YES.getId()); + bloodSugar.setModified(new Date()); + bloodSugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date())); + temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); + + Update up = new Update(); + up.set("exceptionSend", 0); + mongoTemplate.updateMulti(Query.query(Criteria.where("temporaryUserId").is(bloodSugar.getTemporaryUserId())), up, TemporaryBloodSugar.class); + return RespBuilder.buildSuccess(bloodSugar.getId()); } @Override @@ -159,59 +95,59 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录"); } - @Override - public BaseResponse queryOne(String id) { - if (StringUtils.isNotEmpty(id)) { - TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class); - 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 + public BaseResponse queryOne(String id) { + if (StringUtils.isNotEmpty(id)) { + TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class); + 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 public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { boolean flag = false; @@ -233,47 +169,45 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I flag = true; } if (flag) { - List patients = mongoTemplate.find(Query.query(pCriteria), TemporaryBloodSugar.class); + List patients = mongoTemplate.find(Query.query(pCriteria), TemporaryUserModel.class); List ids = new ArrayList<>(); if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patients)) { - for (TemporaryBloodSugar patient : patients) { + for (TemporaryUserModel patient : patients) { ids.add(patient.getId()); } } - criteria.and("_id").in(ids); + criteria.and("temporaryUserId").in(ids); } PageResult pageResult = findMongoPage(TemporaryBloodSugar.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); 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); + TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodSugar.getTemporaryUserId())), TemporaryUserModel.class); temp.put("id", bloodSugar.getId()); if (bloodSugars != null) { - temp.put("username", bloodSugar.getUserName()); + temp.put("username", temporaryUser.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("age", DateUtil.getAge(temporaryUser.getBirth())); + temp.put("week", DateUtil.getWeekDesc(temporaryUser.getLastMenses(), new Date())); temp.put("riskLevel", commonService.findRiskLevel(bloodSugar.getRiskLevelId())); //高危等级（颜色） - String rFactor = commonService.resloveFactor(bloodSugar.getRiskFactorId()); - if (bloodSugar.getHighriskDesc() != null && !"null".equals(bloodSugar.getHighriskDesc())) { + String rFactor = commonService.resloveFactor(temporaryUser.getRiskFactorId()); + if (temporaryUser.getHighriskDesc() != null && !"null".equals(temporaryUser.getHighriskDesc())) { if (StringUtils.isNotEmpty(rFactor)) { - rFactor += "," + bloodSugar.getHighriskDesc(); + rFactor += "," + temporaryUser.getHighriskDesc(); } else { - rFactor = bloodSugar.getHighriskDesc(); + rFactor = temporaryUser.getHighriskDesc(); } } temp.put("riskFactor", rFactor); // 高危因素 Calendar rightNow = Calendar.getInstance(); - rightNow.setTime(bloodSugar.getLastMenses()); + rightNow.setTime(temporaryUser.getLastMenses()); rightNow.add(Calendar.DAY_OF_YEAR, 280); temp.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime())); 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("bregmatic", bloodSugar.getBregmatic()); temp.put("cardNo", bloodSugar.getCardID()); } @@ -352,6 +286,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } + @Override public BaseResponse getSysBloodSugarReport(String id, Integer userId) { BaseObjectResponse resp = new BaseObjectResponse(); @@ -360,7 +295,9 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I //Patients patients = patientsService.findOnePatientById(patientId); - List risks = bloodSugar.getRiskFactorId(); //妊娠期糖尿病（无需药物治疗） //糖尿病合并妊娠（无需药物治疗） + TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodSugar.getTemporaryUserId())), TemporaryUserModel.class); + + List risks = temporaryUser.getRiskFactorId(); //妊娠期糖尿病（无需药物治疗） //糖尿病合并妊娠（无需药物治疗） if (!(com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(risks) && (risks.contains("5aab6d3d422b03d4ad2bf83e") || risks.contains("5aab6d3e422b03d4ad2bf83f") //需药物治疗的糖尿病 || risks.contains("de7468e6-1bb5-4fab-ae84-78857868409a")))) { @@ -388,7 +325,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I String rid = ""; - int week = DateUtil.getWeek(bloodSugar.getLastMenses(), new Date()); + int week = DateUtil.getWeek(temporaryUser.getLastMenses(), new Date()); if (week < 6) { resp.setErrorcode(ResponseCode.DATA_ERROR.getCode()); @@ -414,11 +351,11 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I //算出bmi值 - String bmiStr = patientWeightService.getBmi(bloodSugar.getBeforeWeight(), bloodSugar.getBeforeHeight()); + String bmiStr = patientWeightService.getBmi(temporaryUser.getBeforeWeight(), temporaryUser.getBeforeHeight()); double bmi = Double.parseDouble(bmiStr); //根据高危获取不同的卡路里计算公式 - Map kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(bloodSugar.getBeforeWeight()), - Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, bloodSugar.getBregmatic(), bloodSugar.getBeforeHeight()); + Map kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(temporaryUser.getBeforeWeight()), + Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, bloodSugar.getBregmatic(), temporaryUser.getBeforeHeight()); String weekYyzl = ""; 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 9526688..a57f670 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 @@ -137,7 +137,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录"); } - @Override + /* @Override public BaseResponse queryOne(String id) { if (StringUtils.isNotEmpty(id)) { TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); @@ -249,10 +249,10 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo public BaseResponse info(String id) { TemporaryWeightModel template = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); if (template != null) { - /* Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); + *//* 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 = ""; @@ -319,19 +319,19 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo } - /** + *//** * 体重标准报告 - */ + *//* @Override public BaseResponse report(String id, Integer userId, String rid) { TemporaryWeightModel template = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); String hospitalId = autoMatchFacade.getHospitalId(userId); Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(org.getProvinceId()); - /* PatientWeight patientWeight = mongoTemplate.findById(id, PatientWeight.class);*/ + *//* PatientWeight patientWeight = mongoTemplate.findById(id, PatientWeight.class);*//* if (template != null) { Map map = new LinkedHashMap<>(); - /* Patients patients = mongoTemplate.findById(template.getPatientId(), Patients.class);*/ + *//* Patients patients = mongoTemplate.findById(template.getPatientId(), Patients.class);*//* Integer week = null; //if (patients != null) { //map.put("vcCard", patients.getVcCardNo()); @@ -1466,5 +1466,5 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo } return 0.0; } - +*/ } \ No newline at end of file -- 1.8.3.1