jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 86 additions and 4 deletions

...	...	@@ -366,6 +366,27 @@
366	366	//是否开通疾病发生推送 1或者空没有开通 2开通
367	367	private String openDisease;
368	368
	369	+ //分娩孕周
	370	+ private Integer dueWeekStart;
	371	+ //分娩孕周
	372	+ private Integer dueWeekEnd;
	373	+
	374	+ public Integer getDueWeekEnd() {
	375	+ return dueWeekEnd;
	376	+ }
	377	+
	378	+ public void setDueWeekEnd(Integer dueWeekEnd) {
	379	+ this.dueWeekEnd = dueWeekEnd;
	380	+ }
	381	+
	382	+ public Integer getDueWeekStart() {
	383	+ return dueWeekStart;
	384	+ }
	385	+
	386	+ public void setDueWeekStart(Integer dueWeekStart) {
	387	+ this.dueWeekStart = dueWeekStart;
	388	+ }
	389	+
369	390	public String getOpenDiseaseType() {
370	391	return openDiseaseType;
371	392	}
...	...	@@ -1683,6 +1704,23 @@
1683	1704	c = c.lte(babyWeightEnd);
1684	1705	} else {
1685	1706	c = Criteria.where("babyWeight").lte(babyWeightEnd);
	1707	+ }
	1708	+ }
	1709	+
	1710	+
	1711	+ if (null != dueWeekStart) {
	1712	+ if (null != c) {
	1713	+ c = c.and("dueWeek").gte(dueWeekStart);
	1714	+ } else {
	1715	+ c = Criteria.where("dueWeek").gte(dueWeekStart);
	1716	+ }
	1717	+ }
	1718	+
	1719	+ if (null != dueWeekEnd) {
	1720	+ if (null != c) {
	1721	+ c = c.lte(dueWeekEnd);
	1722	+ } else {
	1723	+ c = Criteria.where("dueWeek").lte(dueWeekEnd);
1686	1724	}
1687	1725	}
1688	1726

...	...	@@ -262,7 +262,9 @@
262	262	@RequestParam(value = "isArea", required = false) String isArea,
263	263	@RequestParam(value = "fmHospitalId", required = false) String fmHospitalId,
264	264	@RequestParam(value = "openDisease", required = false) String openDisease,
265		- @RequestParam(value = "endCase", required = false) Integer endCase
	265	+ @RequestParam(value = "endCase", required = false) Integer endCase,
	266	+ @RequestParam(value = "dueWeekStart", required = false) Integer dueWeekStart,
	267	+ @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd
266	268	) {
267	269
268	270	if (CollectionUtils.isNotEmpty(highRiskInfos)) {
...	...	@@ -319,6 +321,8 @@
319	321	request.setLiveType(liveType);
320	322	request.setEndCase(endCase);
321	323	request.setOpenDisease(openDisease);
	324	+ request.setDueWeekStart(dueWeekStart);
	325	+ request.setDueWeekEnd(dueWeekEnd);
322	326
323	327	return babyBookbuildingFacade.queryBabyList(request, loginState.getId());
324	328	}

...	...	@@ -186,8 +186,9 @@
186	186	@RequestParam(value = "nextDate", required = false) String nextDate,
187	187	@RequestParam(value = "highRisk", required = false) Integer highRisk,
188	188	@RequestParam(value = "waskSon", required = false) Integer waskSon,
	189	+ @RequestParam(value = "checkDoctorId", required = false) String checkDoctorId,
189	190	Integer page, Integer limit, HttpServletRequest request) {
190		- return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, getUserId(request));
	191	+ return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon,checkDoctorId, page, limit, getUserId(request));
191	192	}
192	193
193	194	/**

...	...	@@ -1038,7 +1038,8 @@
1038	1038	return br;
1039	1039	}
1040	1040
1041		- public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, Integer highRisk, Integer waskSon, Integer page, Integer limit, Integer userId) {
	1041	+ public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate,
	1042	+ Integer highRisk, Integer waskSon, String checkDoctorId,Integer page, Integer limit, Integer userId) {
1042	1043	boolean flag = false;
1043	1044	// List<String> hospital = groupsFacade.findGroupHospital(userId, false);
1044	1045	String hospitalId = autoMatchFacade.getHospitalId(userId);
...	...	@@ -1082,6 +1083,9 @@
1082	1083	if (null != waskSon) {
1083	1084	criteria.and("waskSon").is(waskSon);
1084	1085	}
	1086	+ if (null != checkDoctorId) {
	1087	+ criteria.and("checkDoctor").is(checkDoctorId);
	1088	+ }
1085	1089	if (null != checkMonthAge && null != endCheckMonthAge) {
1086	1090	criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge);
1087	1091	}
...	...	@@ -1118,6 +1122,11 @@
1118	1122	} else {
1119	1123	map.put("waskSon", "-");
1120	1124	}
	1125	+
	1126	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(babyCheckModel.getCheckDoctor())) {
	1127	+ map.put("checkDoctor", usersService.getUsers(Integer.valueOf(babyCheckModel.getCheckDoctor())).getName());
	1128	+ }
	1129	+
1121	1130	map.put("height", babyCheckModel.getHeight());
1122	1131	map.put("weight", babyCheckModel.getWeight());
1123	1132	list.add(map);

...	...	@@ -100,6 +100,27 @@
100	100	//是否开通疾病发生推送 1或者空没有开通 2开通
101	101	private String openDisease;
102	102
	103	+ //分娩孕周
	104	+ private Integer dueWeekStart;
	105	+ //分娩孕周
	106	+ private Integer dueWeekEnd;
	107	+
	108	+ public Integer getDueWeekEnd() {
	109	+ return dueWeekEnd;
	110	+ }
	111	+
	112	+ public void setDueWeekEnd(Integer dueWeekEnd) {
	113	+ this.dueWeekEnd = dueWeekEnd;
	114	+ }
	115	+
	116	+ public Integer getDueWeekStart() {
	117	+ return dueWeekStart;
	118	+ }
	119	+
	120	+ public void setDueWeekStart(Integer dueWeekStart) {
	121	+ this.dueWeekStart = dueWeekStart;
	122	+ }
	123	+
103	124	public String getOpenDisease() {
104	125	return openDisease;
105	126	}

...	...	@@ -80,6 +80,15 @@
80	80	private String mcertTypeId;
81	81	//是否开通疾病发生推送 1或者空没有开通 2开通
82	82	private String openDisease;
	83	+ private Integer dueWeek;
	84	+
	85	+ public Integer getDueWeek() {
	86	+ return dueWeek;
	87	+ }
	88	+
	89	+ public void setDueWeek(Integer dueWeek) {
	90	+ this.dueWeek = dueWeek;
	91	+ }
83	92
84	93	public String getOpenDisease() {
85	94	return openDisease;

...	...	@@ -94,7 +94,7 @@
94	94	String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(model.getHighRiskInfo());
95	95	result.setHighRiskInfo(highRiskInfos);
96	96	result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否");
97		-
	97	+ result.setDueWeek(model.getDueWeek());
98	98
99	99	result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
100	100	result.setBabyName(StringUtils.emptyDeal(model.getName()));