jiangjiazhi / regional-platform

Commit 3542bf0c3adb997020efdbcc6497388cf12e9d45

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

自测bug提交

Showing 7 changed files with 129 additions and 37 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.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/service/ITemporaryBloodService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.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/TemporaryWeightServiceImpl.java

...	...	@@ -4,7 +4,7 @@
4	4	import org.springframework.data.mongodb.core.query.Query;
5	5
6	6	public interface ITemporaryWeightDao {
7		- public void addTemporaryWeight(TemporaryWeightModel weightModel);
	7	+ public TemporaryWeightModel addTemporaryWeight(TemporaryWeightModel weightModel);
8	8
9	9	void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel);
10	10

...	...	@@ -10,8 +10,8 @@
10	10	@Repository("temporaryWeightDao")
11	11	public class TemporaryWeightDaoImpl extends BaseMongoDAOImpl<TemporaryWeightModel> implements ITemporaryWeightDao {
12	12	@Override
13		- public void addTemporaryWeight(TemporaryWeightModel weightModel) {
14		- save(weightModel);
	13	+ public TemporaryWeightModel addTemporaryWeight(TemporaryWeightModel weightModel) {
	14	+ return save(weightModel);
15	15	}
16	16
17	17	@Override

...	...	@@ -53,8 +53,8 @@
53	53	@RequestMapping(value = "/queryAll", method = RequestMethod.GET)
54	54	@TokenRequired
55	55	@ResponseBody
56		- public BaseResponse queryAll(Integer page, Integer limit) {
57		- return temporaryBloodService.queryAll(page, limit);
	56	+ public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) {
	57	+ return temporaryBloodService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit);
58	58	}
59	59
60	60	@ResponseBody

...	...	@@ -13,7 +13,7 @@
13	13
14	14	BaseResponse queryOne(String id);
15	15
16		- BaseResponse queryAll(Integer page, Integer limit);
	16	+ BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit);
17	17
18	18	BaseResponse info(String id, Date startDate);
19	19

...	...	@@ -677,7 +677,7 @@
677	677	}
678	678
679	679	@Override
680		- public BaseResponse getXyPresentation(String bloodId,Integer userId) {
	680	+ public BaseResponse getXyPresentation(String bloodId, Integer userId) {
681	681	//1.通过血压ID 查询到pnationId
682	682	Map<String, Object> datas = new HashMap<>();
683	683	Map<String, Map<Integer, Double>> series = new HashMap<>();
...	...	@@ -689,8 +689,8 @@
689	689	//2.通过pnationId ID获取到相应的信息例如：末次月经
690	690	if (StringUtils.isNotEmpty(bloodPressure.getParentId()) && StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) && StringUtils.isNotEmpty(bregmatic)) {
691	691	Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodPressure.getParentId())), Patients.class);
692		- Integer weeks = DateUtil.getWeek(patients.getLastMenses(), bloodPressure.getModified()) ;
693		- System.out.println("孕周："+weeks);
	692	+ Integer weeks = DateUtil.getWeek(patients.getLastMenses(), bloodPressure.getModified());
	693	+ System.out.println("孕周：" + weeks);
694	694	Map paMap = new HashMap();
695	695	paMap.put("vcCardNo", patients.getVcCardNo());
696	696	paMap.put("username", patients.getUsername());
...	...	@@ -754,7 +754,7 @@
754	754	} else if (weeks >= 13 && weeks <= 28) {
755	755	mapxy.put("proposal", "建议（孕中期）");
756	756	mapxy.put("proposalInfo", xy.getMiddleSuggests());
757		- } else if (weeks>=29 && weeks <= 40) {
	757	+ } else if (weeks >= 29 && weeks <= 40) {
758	758	mapxy.put("proposal", "建议（孕晚期）");
759	759	mapxy.put("proposalInfo", xy.getLaterSuggests());
760	760	}
...	...	@@ -791,7 +791,7 @@
791	791	datas.put("motion", motionList);
792	792	}
793	793
794		- healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(),3,bloodPressure.getParentId(),1,1,userId);
	794	+ healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId);
795	795	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas);
796	796	} else {
797	797	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败").setData("请检查数据是否填写完整！");

...	...	@@ -11,8 +11,7 @@
11	11	import com.lyms.platform.operate.web.service.ITemporaryBloodService;
12	12	import com.lyms.platform.operate.web.service.PatientWeightService;
13	13	import com.lyms.platform.operate.web.utils.ReportConfig;
14		-import com.lyms.platform.pojo.TemporaryBloodModel;
15		-import com.lyms.platform.pojo.XyPresentationModel;
	14	+import com.lyms.platform.pojo.*;
16	15	import org.apache.commons.collections.CollectionUtils;
17	16	import org.springframework.beans.factory.annotation.Autowired;
18	17	import org.springframework.data.domain.Sort;
...	...	@@ -79,6 +78,7 @@
79	78	}
80	79
81	80	}
	81	+
82	82	@Override
83	83	public BaseResponse deleteTemporaryBlood(String id) {
84	84	mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(id)), Update.update("yn", 1), TemporaryBloodModel.class);
85	85
86	86
...	...	@@ -92,10 +92,75 @@
92	92	}
93	93
94	94	@Override
95		- public BaseResponse queryAll(Integer page, Integer limit) {
	95	+ public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) {
	96	+ boolean flag = false;
	97	+ Criteria pCriteria = Criteria.where("yn").ne(0);
96	98	Criteria criteria = Criteria.where("yn").ne(0);
	99	+ if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
	100	+ pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key));
	101	+ flag = true;
	102	+ }
	103	+ if (stateWeek != null && endWeek != null) {
	104	+ Date start = DateUtil.getWeekStart(stateWeek);
	105	+ Date end = DateUtil.getWeekEnd(endWeek);
	106	+ pCriteria.and("lastMenses").gt(start).lte(end);
	107	+ flag = true;
	108	+ }
	109	+ if (bregmatic != null) {
	110	+ pCriteria.and("bregmatic").is(bregmatic);
	111	+ flag = true;
	112	+ }
	113	+ if (flag) {
	114	+ List<TemporaryBloodModel> patients = mongoTemplate.find(Query.query(pCriteria), TemporaryBloodModel.class);
	115	+ List<String> ids = new ArrayList<>();
	116	+ if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patients)) {
	117	+ for (TemporaryBloodModel patient : patients) {
	118	+ ids.add(patient.getId());
	119	+ }
	120	+ }
	121	+ criteria.and("_id").in(ids);
	122	+ }
97	123	PageResult pageResult = findMongoPage(TemporaryBloodModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
98		- return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(pageResult);
	124	+ List<TemporaryBloodModel> bloodPressures = (List<TemporaryBloodModel>) pageResult.getGrid();
	125	+ List<Map<String, Object>> restList = new ArrayList<>();
	126	+ for (TemporaryBloodModel bloodPressure : bloodPressures) {
	127	+ Map<String, Object> temp = new HashMap<>();
	128	+ //Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class);
	129	+ temp.put("id", bloodPressure.getId());
	130	+ /* if (bloodPressure != null) {
	131	+ temp.put("username", bloodPressure.getUserName());
	132	+ temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified()));
	133	+ temp.put("age", bloodPressure.getAge());
	134	+ temp.put("week", DateUtil.getWeekDesc(bloodPressure.getLastMenses(), new Date()));
	135	+ temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
	136	+
	137	+ String rFactor = commonService.resloveFactor(p.getRiskFactorId());
	138	+ if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor())) {
	139	+ if (StringUtils.isNotEmpty(rFactor)) {
	140	+ rFactor += "," + p.getoRiskFactor();
	141	+ } else {
	142	+ rFactor = p.getoRiskFactor();
	143	+ }
	144	+ }
	145	+ temp.put("riskFactor", rFactor); // 高危因素
	146	+
	147	+ temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
	148	+ temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg");
	149	+ temp.put("pulse", bloodPressure.getPulse());
	150	+ temp.put("status", getPulseStatus(bloodPressure.getSsy(), bloodPressure.getSzy()));
	151	+ temp.put("vcCardNo", p.getVcCardNo());
	152	+ temp.put("pcerteTypeId", p.getPcerteTypeId());
	153	+ temp.put("cardNo", p.getCardNo());
	154	+ temp.put("beforWeight", bloodPressure.getBeforWeight() == null ? "" : bloodPressure.getBeforWeight());
	155	+ temp.put("weight", bloodPressure.getWeight() == null ? "" : bloodPressure.getWeight());
	156	+ temp.put("height", bloodPressure.getHeight() == null ? "" : bloodPressure.getHeight());
	157	+ temp.put("tireNumber", bloodPressure.getTireNumber() == null ? "" : bloodPressure.getTireNumber());
	158	+
	159	+ }*/
	160	+ restList.add(temp);
	161	+ }
	162	+ pageResult.setGrid(restList);
	163	+ return RespBuilder.buildSuccess(pageResult);
99	164	}
100	165
101	166	@Override

...	...	@@ -63,34 +63,51 @@
63	63
64	64	@Override
65	65	public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId) {
66		- if (StringUtils.isNotEmpty(weightModel.getPhone())) {
67		- TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(weightModel.getPhone())), TemporaryWeightModel.class);
68		- if (temporaryWeightModel != null) {
69		- if (StringUtils.isNotEmpty(temporaryWeightModel.getPhone())) {
	66	+ List<TemporaryWeightModel> weightModel1 = mongoTemplate.findAll(TemporaryWeightModel.class);
	67	+ if (CollectionUtils.isNotEmpty(weightModel1)) {
	68	+ if (StringUtils.isNotEmpty(weightModel.getPhone())) {
	69	+ TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(weightModel.getPhone())), TemporaryWeightModel.class);
	70	+ if (temporaryWeightModel != null) {
	71	+ if (StringUtils.isNotEmpty(temporaryWeightModel.getPhone())) {
	72	+ weightModel.setModified(new Date());
	73	+ temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(temporaryWeightModel.getId())), weightModel);
	74	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
	75	+ }
	76	+ } else {
	77	+ weightModel.setYn(1);
70	78	weightModel.setModified(new Date());
71		- temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(temporaryWeightModel.getId())), weightModel);
72		- return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
73		- }
74		- } else {
75		- weightModel.setYn(1);
76		- weightModel.setModified(new Date());
77		- weightModel.setCreated(new Date());
78		- Users users = usersService.getUsers(userId);
79		- weightModel.setDoctorName(users.getAccount());
80		- Map<String, String> dayWeights = new LinkedHashMap<>();
81		- List<Map<String, Object>> dayWeights2 = new ArrayList<>();
	79	+ weightModel.setCreated(new Date());
	80	+ Users users = usersService.getUsers(userId);
	81	+ weightModel.setDoctorName(users.getAccount());
	82	+ Map<String, String> dayWeights = new LinkedHashMap<>();
	83	+ List<Map<String, Object>> dayWeights2 = new ArrayList<>();
82	84	/* if (MapUtils.isNotEmpty(temporaryWeightModel.getDayWeights())) {
83	85	dayWeights = temporaryWeightModel.getDayWeights();
84	86	}*/
85		- dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight());
86		- weightModel.setDayWeights(dayWeights);
87		- weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight()));
88		- temporaryWeightDao.addTemporaryWeight(weightModel);
89		- return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功");
90		-
	87	+ dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight());
	88	+ weightModel.setDayWeights(dayWeights);
	89	+ weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight()));
	90	+ TemporaryWeightModel temporaryBloodModel = temporaryWeightDao.addTemporaryWeight(weightModel);
	91	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId());
	92	+ }
91	93	}
	94	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请填写电话号码");
92	95	}
93		- return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请填写电话号码");
	96	+ weightModel.setYn(1);
	97	+ weightModel.setModified(new Date());
	98	+ weightModel.setCreated(new Date());
	99	+ Users users = usersService.getUsers(userId);
	100	+ weightModel.setDoctorName(users.getAccount());
	101	+ Map<String, String> dayWeights = new LinkedHashMap<>();
	102	+ List<Map<String, Object>> dayWeights2 = new ArrayList<>();
	103	+ /* if (MapUtils.isNotEmpty(temporaryWeightModel.getDayWeights())) {
	104	+ dayWeights = temporaryWeightModel.getDayWeights();
	105	+ }*/
	106	+ dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight());
	107	+ weightModel.setDayWeights(dayWeights);
	108	+ weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight()));
	109	+ TemporaryWeightModel temporaryBloodModel = temporaryWeightDao.addTemporaryWeight(weightModel);
	110	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId());
94	111	}
95	112
96	113	@Override
...	...	@@ -112,6 +129,16 @@
112	129	if (StringUtils.isNotEmpty(id)) {
113	130	TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class);
114	131	temporaryWeightModel.setWeeks(DateUtil.getWeekDesc(temporaryWeightModel.getLastMenses(), new Date()));
	132	+ if (temporaryWeightModel != null) {
	133	+ List<String> rists = temporaryWeightModel.getRiskFactorId();
	134	+ if (CollectionUtils.isNotEmpty(rists)) {
	135	+ for (String rist : rists) {
	136	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist);
	137	+
	138	+ }
	139	+
	140	+ }
	141	+ }
115	142	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(temporaryWeightModel);
116	143	}
117	144	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录");