jiangjiazhi / regional-platform

Commit 732465f95322fde745423c7d3b759e75622df525

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

临时qurOne查询接口提交

Showing 6 changed files with 83 additions and 11 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryUserService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java

...	...	@@ -32,7 +32,7 @@
32	32	//记录次数
33	33	private Integer number;
34	34	//高危因素
35		- private List riskFactorId;
	35	+ private List<String> riskFactorId;
36	36	// 其他高危
37	37	private String highriskDesc;
38	38	//高危补充说明

...	...	@@ -45,6 +45,7 @@
45	45	return temporaryBloodService.deleteTemporaryBlood(id);
46	46	}
47	47
	48	+
48	49	@RequestMapping(value = "/queryOne", method = RequestMethod.GET)
49	50	@TokenRequired
50	51	@ResponseBody
...	...	@@ -75,6 +76,7 @@
75	76	}
76	77	return temporaryBloodService.getXyPresentation(id, getUserId(request));
77	78	}
	79	+
78	80
79	81	protected Integer getUserId(HttpServletRequest request) {
80	82	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");

...	...	@@ -3,16 +3,17 @@
3	3
4	4	import com.lyms.platform.common.annotation.TokenRequired;
5	5	import com.lyms.platform.common.base.BaseController;
6		-import com.lyms.platform.common.enums.PihEnums;
7	6	import com.lyms.platform.common.result.BaseResponse;
8	7	import com.lyms.platform.operate.web.service.ITemporaryUserService;
9	8	import com.lyms.platform.pojo.TemporaryUserModel;
10	9	import org.springframework.beans.factory.annotation.Autowired;
11	10	import org.springframework.stereotype.Controller;
12		-import org.springframework.web.bind.annotation.*;
	11	+import org.springframework.web.bind.annotation.RequestMapping;
	12	+import org.springframework.web.bind.annotation.RequestMethod;
	13	+import org.springframework.web.bind.annotation.RequestParam;
	14	+import org.springframework.web.bind.annotation.ResponseBody;
13	15
14	16	import javax.servlet.http.HttpServletRequest;
15		-import javax.validation.Valid;
16	17
17	18	@Controller
18	19	@RequestMapping(value = "/temporary")
...	...	@@ -25,7 +26,8 @@
25	26	@ResponseBody
26	27	@RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST)
27	28	@TokenRequired
28		- public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) {
	29	+ //@Valid @RequestBody
	30	+ public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, HttpServletRequest request) {
29	31	return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request));
30	32
31	33	}
32	34
...	...	@@ -40,8 +42,17 @@
40	42	@RequestMapping(value = "/queryAll", method = RequestMethod.GET)
41	43	@TokenRequired
42	44	@ResponseBody
43		- public BaseResponse queryAll(String key, Integer age, Integer currentWeekStart, Integer currentWeekEnd, Integer page, Integer limit, HttpServletRequest request) {
44		- return temporaryUserService.queryAll(key, age, currentWeekStart, currentWeekEnd, page, limit, getUserId(request));
	45	+ public BaseResponse queryAll(String key, Integer age, Integer startWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) {
	46	+ return temporaryUserService.queryAll(key, age, startWeek, endWeek, page, limit, getUserId(request));
45	47	}
	48	+
	49	+
	50	+ @RequestMapping(value = "/queryOne", method = RequestMethod.GET)
	51	+ @TokenRequired
	52	+ @ResponseBody
	53	+ public BaseResponse queryOne(String id, String cardNo, String pone) {
	54	+ return temporaryUserService.query(id, cardNo, pone);
	55	+ }
	56	+
46	57	}

...	...	@@ -11,5 +11,7 @@
11	11	BaseResponse deleteTemporaryUser(String id);
12	12
13	13	BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId);
	14	+
	15	+ BaseResponse query(String id, String no, String pone);
14	16	}

...	...	@@ -137,7 +137,6 @@
137	137	@Override
138	138	public BaseResponse queryOne(String id) {
139	139	TemporaryBloodModel bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodModel.class);
140		-
141	140	if (bloodModel != null) {
142	141	Map<String, Object> requestMap = new HashMap<>();
143	142	List<String> rists = bloodModel.getRiskFactorId();

...	...	@@ -3,12 +3,14 @@
3	3	import com.lyms.platform.biz.dal.ITemporaryUserDao;
4	4	import com.lyms.platform.biz.service.BasicConfigService;
5	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
	6	+import com.lyms.platform.common.enums.HisptialRiskTypeEnum;
6	7	import com.lyms.platform.common.result.BaseObjectResponse;
7	8	import com.lyms.platform.common.result.BaseResponse;
8	9	import com.lyms.platform.common.result.PageResult;
9	10	import com.lyms.platform.common.result.RespBuilder;
10	11	import com.lyms.platform.common.utils.DateUtil;
11	12	import com.lyms.platform.common.utils.JsonUtil;
	13	+import com.lyms.platform.common.utils.StringUtils;
12	14	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
13	15	import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade;
14	16	import com.lyms.platform.operate.web.service.ITemporaryUserService;
...	...	@@ -25,9 +27,7 @@
25	27	import org.springframework.data.mongodb.core.query.Update;
26	28	import org.springframework.stereotype.Service;
27	29
28		-import java.util.ArrayList;
29		-import java.util.Date;
30		-import java.util.List;
	30	+import java.util.*;
31	31
32	32	@Service
33	33	public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITemporaryUserService {
...	...	@@ -115,6 +115,64 @@
115	115
116	116	pageResult.setGrid(bloodSugars);
117	117	return RespBuilder.buildSuccess(pageResult);
	118	+ }
	119	+
	120	+ @Override
	121	+ public BaseResponse query(String id, String cardID, String phone) {
	122	+ Criteria criteria;
	123	+ /* criteria.orOperator(Criteria.where("id").is(id), Criteria.where("cardID").is(cardID), Criteria.where("phone").is(phone));*/
	124	+ if (StringUtils.isNotEmpty(id)) {
	125	+ criteria = Criteria.where("id").is(id);
	126	+ } else if (StringUtils.isNotEmpty(cardID)) {
	127	+ criteria = Criteria.where("cardID").is(cardID);
	128	+ } else if (StringUtils.isNotEmpty(phone)) {
	129	+ criteria = Criteria.where("phone").is(phone);
	130	+ } else {
	131	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请输入");
	132	+ }
	133	+ TemporaryUserModel bloodModel = mongoTemplate.findOne(Query.query(criteria), TemporaryUserModel.class);
	134	+ System.out.println(bloodModel);
	135	+ if (bloodModel != null) {
	136	+ Map<String, Object> requestMap = new HashMap<>();
	137	+ List<String> rists = bloodModel.getRiskFactorId();
	138	+ List<Map> listMap = new ArrayList<>();
	139	+ Integer riskScore = 0;
	140	+ if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) {
	141	+ for (String rist : rists) {
	142	+ Map<String, Object> map = new HashMap();
	143	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist);
	144	+ riskScore += Integer.valueOf(basicConfig.getCode());
	145	+ BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
	146	+ if (basicConfig1.getId().equals(HisptialRiskTypeEnum.YBFX.getId())) {
	147	+ map.put("color", HisptialRiskTypeEnum.YBFX.getColor());
	148	+ }
	149	+ if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JGFX.getId())) {
	150	+ map.put("color", HisptialRiskTypeEnum.JGFX.getColor());
	151	+ }
	152	+ if (basicConfig1.getId().equals(HisptialRiskTypeEnum.GFX.getId())) {
	153	+ map.put("color", HisptialRiskTypeEnum.GFX.getColor());
	154	+ }
	155	+ if (basicConfig1.getId().equals(HisptialRiskTypeEnum.CRB.getId())) {
	156	+ map.put("color", HisptialRiskTypeEnum.CRB.getColor());
	157	+ }
	158	+ if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JK.getId())) {
	159	+ map.put("color", HisptialRiskTypeEnum.JK.getColor());
	160	+ }
	161	+ map.put("name", basicConfig.getName());
	162	+ map.put("id", basicConfig.getId());
	163	+ listMap.add(map);
	164	+ }
	165	+ }
	166	+ requestMap.put("riskScore", riskScore);
	167	+ requestMap.put("riskFactor", listMap);
	168	+ requestMap.put("userName", bloodModel.getUserName());
	169	+ requestMap.put("age", DateUtil.getAge(bloodModel.getBirth()));
	170	+ requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date()));
	171	+ requestMap.put("phone", bloodModel.getPhone());
	172	+ requestMap.put("id", bloodModel.getId());
	173	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
	174	+ }
	175	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录");
118	176	}
119	177	}