jiangjiazhi / regional-platform

Authored by zhangchao over 1 year ago

Exists in dev

Showing 4 changed files with 12 additions and 8 deletions

...	...	@@ -6,6 +6,7 @@
6	6	import org.springframework.beans.factory.annotation.Autowired;
7	7	import org.springframework.stereotype.Service;
8	8
	9	+import java.util.ArrayList;
9	10	import java.util.List;
10	11	@Service("appointmentService")
11	12	public class AppointmentServiceImpl implements AppointmentService {

...	...	@@ -31,7 +31,7 @@
31	31	and (name like concat('%',#{name},'%') or pinyin like concat('%',#{name},'%'))
32	32	</if>
33	33	<if test="dept!=null">
34		- and dept like concat(#{dept},'%')
	34	+ and (dept like concat(#{dept},'%') or dept like concat("产后",'%'))
35	35	</if>
36	36	and <![CDATA[checkTime>=#{startTime}]]>
37	37	and <![CDATA[checkTime<=#{endTime}]]>

...	...	@@ -2072,7 +2072,9 @@
2072	2072	}
2073	2073	//组合请求
2074	2074	PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion,hospital);
2075		-
	2075	+ if ("2100002419".equals(hospital)){
	2076	+ patientsQuery.setDtFm(true);
	2077	+ }
2076	2078	//查询符合条件的孕妇
2077	2079	StopWatch stopWatch = new StopWatch("queryPatient2 -" + hospital);
2078	2080	stopWatch.start();

...	...	@@ -400,12 +400,12 @@
400	400	patientsQuery.setHospitalId(hospitalId);
401	401
402	402	if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getType())) {
	403	+ if ("2100002419".equals(hospitalId)){
	404	+ patientsQuery.setDtFm(true);
	405	+ }
403	406	if ("2".equals(riskPatientsQueryRequest.getType())) {
404	407	//1孕妇
405	408	patientsQuery.setType(1);
406		- if ("2100002419".equals(hospitalId)){
407		- patientsQuery.setDtFm(true);
408		- }
409	409	} else if ("3".equals(riskPatientsQueryRequest.getType())) {
410	410	//3产妇
411	411	patientsQuery.setType(3);
412	412
...	...	@@ -684,12 +684,13 @@
684	684	patientsQuery.setYn(YnEnums.YES.getId());
685	685	patientsQuery.setHospitalId(hospitalId);
686	686	if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getType())) {
	687	+ if ("2100002419".equals(hospitalId)){
	688	+ patientsQuery.setDtFm(true);
	689	+ }
687	690	if ("2".equals(riskPatientsQueryRequest.getType())) {
688	691	//1孕妇
689	692	patientsQuery.setType(1);
690		- if ("2100002419".equals(hospitalId)){
691		- patientsQuery.setDtFm(true);
692		- }
	693	+
693	694	} else if ("3".equals(riskPatientsQueryRequest.getType())) {
694	695	//3产妇
695	696	patientsQuery.setType(3);