jiangjiazhi / regional-platform

Commit 18bcd7aa2864b56fe02bf2409af814919bc02e1b

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

产检第次问题解决

Showing 4 changed files with 23 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java

...	...	@@ -1185,7 +1185,7 @@
1185	1185	"REGISTER_ADDRESS, REGISTER_PROVINCE,REGISTER_CITY,REGISTER_COUNTRY,REGISTER_TOWN,REGISTER_HOURCE_NO," +
1186	1186	"BIRTH_DATE,CONTACT_NAME,CONTACT_TEL_NO,HUSBAND_NAME,HUSBAND_ID_CARD,HUSBAND_TEL,HUSBAND_CERTIFICATE_TYPE," +
1187	1187	"HUSBAND_CERTIFICATE_NO,HUSBAND_RESIDENCE_ADDRESS,HUSBAND_COMPANY," +
1188		- "STATUS,DATA_FROM_HOSPITAL,CREATE_TIME,UPDATE_TIME,OPERATOR,OPERAT_TIME,HEALTH_RECORD,TELPHONE,BELONG_HOSPITAL) " +
	1188	+ "STATUS,DATA_FROM_HOSPITAL,CREATE_TIME,UPDATE_TIME,OPERATOR,OPERAT_TIME,HEALTH_RECORD,TELPHONE,BELONG_HOSPITAL,LAST_MENSES) " +
1189	1189	" values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
1190	1190	ps = conn.prepareStatement(baseInfoSql);
1191	1191	ps.setString(1,patients.getId());
...	...	@@ -1312,6 +1312,7 @@
1312	1312	ps.setString(36, patients.getFileCode());
1313	1313	ps.setString(37, patients.getPhone());
1314	1314	ps.setString(38, hospitalsMap.get(patients.getHospitalId()));
	1315	+ ps.setTimestamp(39, new Timestamp(patients.getLastMenses().getTime()));
1315	1316	int saveCount = ps.executeUpdate();
1316	1317	System.out.println("saveCount="+saveCount);
1317	1318	}

...	...	@@ -2410,7 +2410,10 @@
2410	2410	}
2411	2411	patientsQuery1.setHospitalList(hids);
2412	2412	}
2413		-
	2413	+ else
	2414	+ {
	2415	+ patientsQuery1.setHospitalList(rcGlxtService.getHids());
	2416	+ }
2414	2417	List<Patients> patientses = patientsService.queryPatient(patientsQuery1);
2415	2418	if (CollectionUtils.isNotEmpty(patientses))
2416	2419	{
...	...	@@ -2442,6 +2445,10 @@
2442	2445	}
2443	2446	matDeliverQuery.setFmHospitalList(hids);
2444	2447	}
	2448	+ else
	2449	+ {
	2450	+ matDeliverQuery.setFmHospitalList(rcGlxtService.getHids());
	2451	+ }
2445	2452	List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
2446	2453
2447	2454	if (CollectionUtils.isNotEmpty(list2))
...	...	@@ -2474,6 +2481,10 @@
2474	2481	hids.add(org.getId()+"");
2475	2482	}
2476	2483	matDeliverQuery.setFmHospitalList(hids);
	2484	+ }
	2485	+ else
	2486	+ {
	2487	+ matDeliverQuery.setFmHospitalList(rcGlxtService.getHids());
2477	2488	}
2478	2489	List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
2479	2490

...	...	@@ -272,7 +272,8 @@
272	272	if (end > antExRecordModelList.size()) {
273	273	end = antExRecordModelList.size();
274	274	}
275		- listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService)));
	275	+ listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion,
	276	+ organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService,patientsService)));
276	277	}
277	278	for (Future f : listFuture) {
278	279	try {

1	1	package com.lyms.platform.operate.web.worker;
2	2
3		-import com.lyms.platform.biz.service.AntExRecordService;
4		-import com.lyms.platform.biz.service.AntenatalExaminationService;
5		-import com.lyms.platform.biz.service.BasicConfigService;
6		-import com.lyms.platform.biz.service.CommonService;
	3	+import com.lyms.platform.biz.service.*;
7	4	import com.lyms.platform.common.utils.ExceptionUtils;
8	5	import com.lyms.platform.common.utils.StringUtils;
9	6	import com.lyms.platform.operate.web.result.AntExManagerResult;
...	...	@@ -15,6 +12,7 @@
15	12	import com.lyms.platform.pojo.AntExChuModel;
16	13	import com.lyms.platform.pojo.AntExRecordModel;
17	14	import com.lyms.platform.pojo.AntenatalExaminationModel;
	15	+import com.lyms.platform.pojo.Patients;
18	16	import com.lyms.platform.query.AntExRecordQuery;
19	17	import org.apache.commons.collections.CollectionUtils;
20	18	import org.apache.commons.lang.math.NumberUtils;
...	...	@@ -39,6 +37,7 @@
39	37	private AntExRecordService recordService;
40	38	private CommonService commonService;
41	39	private String hospital;
	40	+ private PatientsService patientsService;
42	41
43	42	private BasicConfigService basicConfigService;
44	43
...	...	@@ -54,7 +53,7 @@
54	53	CommonService commonService,
55	54	String hospital,
56	55	BasicConfigService basicConfigService,
57		- AntenatalExaminationService antenatalExaminationService) {
	56	+ AntenatalExaminationService antenatalExaminationService,PatientsService patientsService) {
58	57	this.record = record;
59	58	this.isRegion = isRegion;
60	59	this.organizationService = organizationService;
...	...	@@ -64,6 +63,7 @@
64	63	this.hospital = hospital;
65	64	this.basicConfigService = basicConfigService;
66	65	this.antenatalExaminationService = antenatalExaminationService;
	66	+ this.patientsService = patientsService;
67	67	}
68	68
69	69	@Override
...	...	@@ -115,6 +115,8 @@
115	115	}
116	116
117	117	AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
	118	+ Patients patients = patientsService.findOnePatientById(e.getParentId());
	119	+ antExRecordQuery1.setCheckTimeStart(patients.getLastMenses());
118	120	antExRecordQuery1.setCheckTimeEnd(e.getCheckTime());
119	121	antExRecordQuery1.setPid(e.getPid());
120	122	antExRecordQuery1.setHospitalId(hospital);