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 b4cc1db..9256e35 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 @@ -32,7 +32,7 @@ public class TemporaryUserModel extends BaseModel { //记录次数 private Integer number; //高危因素 - private List riskFactorId; + private List riskFactorId; // 其他高危 private String highriskDesc; //高危补充说明 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java index 1c1184a..635eaa7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java @@ -45,6 +45,7 @@ public class TemporaryBloodController extends BaseController { return temporaryBloodService.deleteTemporaryBlood(id); } + @RequestMapping(value = "/queryOne", method = RequestMethod.GET) @TokenRequired @ResponseBody @@ -76,6 +77,7 @@ public class TemporaryBloodController extends BaseController { return temporaryBloodService.getXyPresentation(id, getUserId(request)); } + protected Integer getUserId(HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Assert.notNull(loginState, "未登录"); 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 6eeda68..115e0d5 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 @@ -3,16 +3,17 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.enums.PihEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.service.ITemporaryUserService; import com.lyms.platform.pojo.TemporaryUserModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; @Controller @RequestMapping(value = "/temporary") @@ -25,7 +26,8 @@ public class TemporaryUserController extends BaseController { @ResponseBody @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST) @TokenRequired - public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) { + //@Valid @RequestBody + public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, HttpServletRequest request) { return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request)); } @@ -40,7 +42,16 @@ public class TemporaryUserController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(String key, Integer age, Integer currentWeekStart, Integer currentWeekEnd, Integer page, Integer limit, HttpServletRequest request) { - return temporaryUserService.queryAll(key, age, currentWeekStart, currentWeekEnd, page, limit, getUserId(request)); + public BaseResponse queryAll(String key, Integer age, Integer startWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) { + return temporaryUserService.queryAll(key, age, startWeek, endWeek, page, limit, getUserId(request)); } + + + @RequestMapping(value = "/queryOne", method = RequestMethod.GET) + @TokenRequired + @ResponseBody + public BaseResponse queryOne(String id, String cardNo, String pone) { + return temporaryUserService.query(id, cardNo, pone); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryUserService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryUserService.java index 2cf1348..fc22b27 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryUserService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryUserService.java @@ -11,4 +11,6 @@ public interface ITemporaryUserService extends IBaseService { BaseResponse deleteTemporaryUser(String id); BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); + + BaseResponse query(String id, String no, String pone); } 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 a8339d6..4caec78 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 @@ -137,7 +137,6 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo @Override public BaseResponse queryOne(String id) { TemporaryBloodModel bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodModel.class); - if (bloodModel != null) { Map requestMap = new HashMap<>(); List rists = bloodModel.getRiskFactorId(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java index c4afad5..790342c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java @@ -3,12 +3,14 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.dal.ITemporaryUserDao; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; +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; import com.lyms.platform.common.result.RespBuilder; 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.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.ITemporaryUserService; @@ -25,9 +27,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; @Service public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITemporaryUserService { @@ -116,4 +116,62 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor pageResult.setGrid(bloodSugars); return RespBuilder.buildSuccess(pageResult); } + + @Override + public BaseResponse query(String id, String cardID, String phone) { + Criteria criteria; + /* criteria.orOperator(Criteria.where("id").is(id), Criteria.where("cardID").is(cardID), Criteria.where("phone").is(phone));*/ + if (StringUtils.isNotEmpty(id)) { + criteria = Criteria.where("id").is(id); + } else if (StringUtils.isNotEmpty(cardID)) { + criteria = Criteria.where("cardID").is(cardID); + } else if (StringUtils.isNotEmpty(phone)) { + criteria = Criteria.where("phone").is(phone); + } else { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请输入"); + } + TemporaryUserModel bloodModel = mongoTemplate.findOne(Query.query(criteria), TemporaryUserModel.class); + System.out.println(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); + riskScore += Integer.valueOf(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", bloodModel.getUserName()); + requestMap.put("age", DateUtil.getAge(bloodModel.getBirth())); + 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("请选择一条记录"); + } }