fangcheng / regional-platform

Commit 53071f55c8cbf33500e16d6839ed9da07c648787

Authored by jiangjiazhi over 8 years ago

修改新电子病历

Showing 4 changed files with 136 additions and 130 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java

...	...	@@ -16,6 +16,8 @@
16	16	private String id;
17	17	//产妇id
18	18	private String parentId;
	19	+ //月龄
	20	+ private Integer yl;
19	21
20	22	private String pid;
21	23
22	24
...	...	@@ -84,13 +86,15 @@
84	86	//产检日期
85	87	private Date checkTime;
86	88	//下次产检时间
87		- private String nextCheckTime;
	89	+ private Date nextCheckTime;
88	90
89	91	private Integer yn;
90	92	private Date created;
91	93	private Date modified;
92	94	private String hospitalId;
93	95
	96	+
	97	+
94	98	public String getPid() {
95	99	return pid;
96	100	}
97	101
98	102
...	...	@@ -147,12 +151,20 @@
147	151	this.dirOpinion = dirOpinion;
148	152	}
149	153
150		- public String getNextCheckTime() {
	154	+ public Date getNextCheckTime() {
151	155	return nextCheckTime;
152	156	}
153	157
154		- public void setNextCheckTime(String nextCheckTime) {
	158	+ public void setNextCheckTime(Date nextCheckTime) {
155	159	this.nextCheckTime = nextCheckTime;
	160	+ }
	161	+
	162	+ public Integer getYl() {
	163	+ return yl;
	164	+ }
	165	+
	166	+ public void setYl(Integer yl) {
	167	+ this.yl = yl;
156	168	}
157	169
158	170	public String getProdDoctor() {

...	...	@@ -9,7 +9,6 @@
9	9	import com.lyms.platform.common.utils.Assert;
10	10	import com.lyms.platform.common.utils.DateUtil;
11	11	import com.lyms.platform.common.utils.ExcelUtil;
12		-import com.lyms.platform.common.utils.JsonUtil;
13	12	import com.lyms.platform.operate.web.request.*;
14	13	import com.lyms.platform.operate.web.result.*;
15	14	import com.lyms.platform.operate.web.utils.CommonsHelper;
...	...	@@ -198,7 +197,7 @@
198	197	* @param type 控制类型 1孕妇 3产妇
199	198	* @return
200	199	*/
201		- public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId,String needPage) {
	200	+ public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage) {
202	201	PatientsQuery patientsQuery = new PatientsQuery();
203	202	patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
204	203	patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
205	204
206	205
207	206
208	207
209	208
...	...	@@ -216,22 +215,22 @@
216	215	patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
217	216	patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
218	217
219		- if(null!= riskPatientsQueryRequest.getStartAge()){
	218	+ if (null != riskPatientsQueryRequest.getStartAge()) {
220	219	Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getStartAge());
221	220
222	221	patientsQuery.setBirthEnd(date);
223	222	}
224		- if(null!= riskPatientsQueryRequest.getEndAge()){
	223	+ if (null != riskPatientsQueryRequest.getEndAge()) {
225	224	Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getEndAge());
226		- date = DateUtil.addYear(date,-1);
	225	+ date = DateUtil.addYear(date, -1);
227	226
228		- patientsQuery.setBirthStart(DateUtil.addDay(date,1));
	227	+ patientsQuery.setBirthStart(DateUtil.addDay(date, 1));
229	228	}
230		- if(null!=riskPatientsQueryRequest.getStartChsj()){
	229	+ if (null != riskPatientsQueryRequest.getStartChsj()) {
231	230	patientsQuery.setFmDateEnd(DateUtil.addDay(currentDate, -riskPatientsQueryRequest.getStartChsj()));
232	231	patientsQuery.setDueStatus(0);
233	232	}
234		- if(null!=riskPatientsQueryRequest.getEndChsj()){
	233	+ if (null != riskPatientsQueryRequest.getEndChsj()) {
235	234	patientsQuery.setFmDateStart(DateUtil.addDay(currentDate, -riskPatientsQueryRequest.getEndChsj()));
236	235	patientsQuery.setDueStatus(0);
237	236	}
238	237
239	238
240	239
241	240
242	241
243	242
244	243
...	...	@@ -243,44 +242,44 @@
243	242	patientsQuery.setYn(YnEnums.YES.getId());
244	243	// patientsQuery.setBuildType(1);
245	244	//0 未分娩建档 2 自动分娩类型 http://jira.healthbaby.com.cn/browse/WEB-639
246		- List buildType=new ArrayList();
	245	+ List buildType = new ArrayList();
247	246	buildType.add(0);
248	247	buildType.add(2);
249	248	patientsQuery.setBuildTypeList(buildType);
250	249	patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId));
251	250	patientsQuery.setNeed(needPage);
252	251	//查询符合条件的孕妇
253		- List<Patients> patientses = patientsService.queryPatient1(patientsQuery,"modified");
	252	+ List<Patients> patientses = patientsService.queryPatient1(patientsQuery, "modified");
254	253	List data = new ArrayList<>();
255	254	if (CollectionUtils.isNotEmpty(patientses)) {
256	255	//如果是查高危孕妇
257	256	if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) {
258		- data = convertToHighRisk(patientses,userId);
	257	+ data = convertToHighRisk(patientses, userId);
259	258	} else if (type == 1) {
260	259	//处理全部孕妇的情况
261		- data = convertToQuanPatient(patientses,userId);
	260	+ data = convertToQuanPatient(patientses, userId);
262	261	//处理全部产妇
263	262	} else if (type == 3) {
264		- data = convertToQuanCPatient(patientses,userId);
	263	+ data = convertToQuanCPatient(patientses, userId);
265	264	}
266	265	}
267	266	return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
268	267	}
269	268
270		- public BaseResponse findPatient(PatientQueryRequest patientQueryRequest,Integer userId) {
	269	+ public BaseResponse findPatient(PatientQueryRequest patientQueryRequest, Integer userId) {
271	270	PatientsQuery patientsQuery = new PatientsQuery();
272	271	patientsQuery.setPid(patientQueryRequest.getPid());
273	272	patientsQuery.setId(patientQueryRequest.getId());
274	273	patientsQuery.setPhone(patientQueryRequest.getPhone());
275	274	patientsQuery.setCardNo(patientQueryRequest.getCardNo());
276	275	String hospital = autoMatchFacade.getHospitalId(userId);
277		- Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(),null,patientQueryRequest.getId(),hospital,-1,false,patientQueryRequest.getPid());
	276	+ Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), hospital, -1, false, patientQueryRequest.getPid());
278	277	PatientBaseResult patientBaseResult = new PatientBaseResult();
279	278	if (null != patients) {
280	279	patientBaseResult.convert(patients);
281	280	}
282	281	try {
283		- HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(),false);
	282	+ HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
284	283	patientBaseResult.setRiskFactor(highScoreResult.getHighRisk());
285	284	patientBaseResult.setRiskScore(highScoreResult.getScoreStr());
286	285	} catch (Exception e) {
287	286
...	...	@@ -295,10 +294,10 @@
295	294	* @param patientses 符合条件的产妇
296	295	* @return
297	296	*/
298		- private List convertToQuanCPatient(List<Patients> patientses,Integer userId) {
	297	+ private List convertToQuanCPatient(List<Patients> patientses, Integer userId) {
299	298	List data = new ArrayList<>();
300	299	AntExQuery antExQuery = new AntExQuery();
301		- String hospital=autoMatchFacade.getHospitalId(userId);
	300	+ String hospital = autoMatchFacade.getHospitalId(userId);
302	301	for (Patients patients : patientses) {
303	302	QuanChanResult chanResult = new QuanChanResult();
304	303	chanResult.convertToResult(patients);
305	304
306	305
307	306
308	307
309	308
...	...	@@ -331,29 +330,25 @@
331	330	}
332	331	}*/
333	332	//复查次数
334		- PostReviewQuery postReviewQuery=new PostReviewQuery();
	333	+ PostReviewQuery postReviewQuery = new PostReviewQuery();
335	334	postReviewQuery.setPid(patients.getPid());
336	335	postReviewQuery.setYn(YnEnums.YES.getId());
337		- List<PostReviewModel> withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
	336	+ List<PostReviewModel> withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
338	337
339	338	String nextCheckTime = "";
340	339	if (CollectionUtils.isNotEmpty(withList)) {
341	340	chanResult.setcTimes(withList.size());
342		- if(null!=withList.get(0).getNextCheckTime()){
343		- java.util.Map map= JsonUtil.jkstr2Obj(withList.get(0).getNextCheckTime(),java.util.Map.class);
344		- Object obj = map.get("fcsj");
345		- if(null!=obj&&!"null".equals(obj.toString())){
346		- nextCheckTime =(String) map.get("fcsj");
347		- }
	341	+ if (null != withList.get(0).getNextCheckTime()) {
	342	+ nextCheckTime = DateUtil.getyyyy_MM_dd(withList.get(0).getNextCheckTime());
348	343	}
349	344	postReviewQuery.setHospitalId(hospital);
350	345
351	346	withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
352		- if(CollectionUtils.isNotEmpty(withList)){
	347	+ if (CollectionUtils.isNotEmpty(withList)) {
353	348	chanResult.setcHTimes(withList.size());
354		- if(StringUtils.isNotEmpty(withList.get(0).getProdDoctor())){
	349	+ if (StringUtils.isNotEmpty(withList.get(0).getProdDoctor())) {
355	350	Users users = usersService.getUsers(NumberUtils.toInt(withList.get(0).getProdDoctor()));
356		- if(null!=users){
	351	+ if (null != users) {
357	352	chanResult.setCheckDoctor(users.getName());
358	353	}
359	354	}
360	355
...	...	@@ -366,11 +361,11 @@
366	361	}
367	362
368	363
369		- private List convertToQuanPatient(List<Patients> patientses,Integer userId) {
	364	+ private List convertToQuanPatient(List<Patients> patientses, Integer userId) {
370	365	AntExChuQuery antExChuQuery = new AntExChuQuery();
371	366	AntExQuery antExQuery = new AntExQuery();
372	367	List data = new ArrayList<>();
373		- String hospital=autoMatchFacade.getHospitalId(userId);
	368	+ String hospital = autoMatchFacade.getHospitalId(userId);
374	369	for (Patients patients : patientses) {
375	370	QuanPatientsResult quanPatientsResult = new QuanPatientsResult();
376	371	quanPatientsResult.convertToResult(patients);
377	372
...	...	@@ -405,11 +400,11 @@
405	400
406	401	antExQuery.setHospitalId(hospital);
407	402	//本院初诊
408		- int chi= antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
	403	+ int chi = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
409	404
410	405	//本院复诊
411		- int chb= antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
412		- quanPatientsResult.setcHTimes(chi+chb);
	406	+ int chb = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
	407	+ quanPatientsResult.setcHTimes(chi + chb);
413	408
414	409	String nextCheckTime = "";
415	410	List<AntenatalExaminationModel> examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
416	411
...	...	@@ -461,11 +456,11 @@
461	456	* @param patientses
462	457	* @return
463	458	*/
464		- private List convertToHighRisk(List<Patients> patientses,Integer userId) {
	459	+ private List convertToHighRisk(List<Patients> patientses, Integer userId) {
465	460	AntExChuQuery antExChuQuery = new AntExChuQuery();
466	461	AntExQuery antExQuery = new AntExQuery();
467	462	List data = new ArrayList<>();
468		- String hospital=autoMatchFacade.getHospitalId(userId);
	463	+ String hospital = autoMatchFacade.getHospitalId(userId);
469	464	for (Patients patients : patientses) {
470	465	RiskPatientsResult riskPatientsResult = new RiskPatientsResult();
471	466	riskPatientsResult.convertToResult(patients);
...	...	@@ -486,7 +481,7 @@
486	481	antExQuery.setPid(patients.getPid());
487	482	antExQuery.setYn(YnEnums.YES.getId());
488	483	antExQuery.setHospitalId(null);
489		- HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(),true);
	484	+ HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
490	485	//复诊次数
491	486	int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
492	487	antExChuQuery.setPid(patients.getPid());
493	488
494	489
...	...	@@ -496,17 +491,17 @@
496	491	int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
497	492	antExQuery.setHospitalId(hospital);
498	493	//本院的复诊记录
499		- int chi=antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
	494	+ int chi = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
500	495	antExChuQuery.setHospitalId(hospital);
501	496	//本院的初诊记录
502	497	int chb = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
503	498	riskPatientsResult.setcTimes(i + b);
504		- riskPatientsResult.setcHTimes(chi+chb);
	499	+ riskPatientsResult.setcHTimes(chi + chb);
505	500	String nextCheckTime = "";
506	501
507	502	List<AntenatalExaminationModel> examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
508	503	if (CollectionUtils.isNotEmpty(examinationModels)) {
509		- if (NumberUtils.isNumber(examinationModels.get(0).getCheckDoctor())){
	504	+ if (NumberUtils.isNumber(examinationModels.get(0).getCheckDoctor())) {
510	505	Users users = usersService.getUsers(NumberUtils.toInt(examinationModels.get(0).getCheckDoctor()));
511	506	if (null != users) {
512	507	riskPatientsResult.setCheckDoctor(users.getName());
...	...	@@ -519,7 +514,7 @@
519	514	List<AntExChuModel> list = antExService.queryAntExChu(antExChuQuery);
520	515	if (CollectionUtils.isNotEmpty(list)) {
521	516	nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime());
522		- if (NumberUtils.isNumber(list.get(0).getProdDoctor())){
	517	+ if (NumberUtils.isNumber(list.get(0).getProdDoctor())) {
523	518	Users users = usersService.getUsers(NumberUtils.toInt(list.get(0).getProdDoctor()));
524	519	if (null != users) {
525	520	riskPatientsResult.setCheckDoctor(users.getName());
526	521
...	...	@@ -539,15 +534,14 @@
539	534	return data;
540	535	}
541	536
542		- public BaseResponse patientGuildSms(PatientGuideSmsRequest patientGuideSmsRequest,Integer userId) {
	537	+ public BaseResponse patientGuildSms(PatientGuideSmsRequest patientGuideSmsRequest, Integer userId) {
543	538
544	539	String hospital = autoMatchFacade.getHospitalId(userId);
545	540
546	541	//判断医院是否启动和对应的服务项是否启用
547		- SmsConfigModel configModel = new SmsConfigModel();
548		- BaseResponse response = smsConfigFacade.hospitalIsStart(hospital,configModel,SmsServiceEnums.YSGXHZD.getId());
549		- if (response != null)
550		- {
	542	+ SmsConfigModel configModel = new SmsConfigModel();
	543	+ BaseResponse response = smsConfigFacade.hospitalIsStart(hospital, configModel, SmsServiceEnums.YSGXHZD.getId());
	544	+ if (response != null) {
551	545	return response;
552	546	}
553	547
...	...	@@ -567,8 +561,8 @@
567	561	MessageRequest mr = new MessageRequest();
568	562
569	563	//短信前缀
570		- String messagePrefix =smsConfigFacade.getSmsPrefix(configModel, model.getBookbuildingDoctor());
571		- mr.setContent("【"+messagePrefix+"】"+patientGuideSmsRequest.getSmsContent());
	564	+ String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBookbuildingDoctor());
	565	+ mr.setContent("【" + messagePrefix + "】" + patientGuideSmsRequest.getSmsContent());
572	566	mr.setObjType(Integer.valueOf(patientGuideSmsRequest.getType()));
573	567	mr.setPhone(model.getPhone());
574	568	//短信商
575	569
576	570
577	571
578	572
579	573
580	574
581	575
582	576
583	577
584	578
585	579
586	580
587	581
588	582
589	583
590	584
591	585
592	586
593	587
594	588
...	...	@@ -596,123 +590,114 @@
596	590	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
597	591	}
598	592
599		- public void exportAllPuer(RiskPatientsQueryRequest patientsQueryRequest,Integer userId,
	593	+ public void exportAllPuer(RiskPatientsQueryRequest patientsQueryRequest, Integer userId,
600	594	HttpServletResponse response) {
601	595	response.setContentType("application/octet-stream");
602	596	response.setHeader("Content-Disposition", "attachment;fileName=" + "datas.xls");
603	597	try {
604	598	BaseListResponse listResponse = null;
605		- List<Map<String,Object>> datas = new ArrayList<>();
606		- Map<String,String> cnames = new HashMap<>();
607		- if (patientsQueryRequest.getQueryType() != null)
608		- {
	599	+ List<Map<String, Object>> datas = new ArrayList<>();
	600	+ Map<String, String> cnames = new HashMap<>();
	601	+ if (patientsQueryRequest.getQueryType() != null) {
609	602	// 0 高危孕妇 1 全部孕妇 2全部产妇
610		- if (patientsQueryRequest.getQueryType() == 0)
611		- {
612		- listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId,null);
	603	+ if (patientsQueryRequest.getQueryType() == 0) {
	604	+ listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null);
613	605	List list = listResponse.getData();
614		- for (Object obj : list)
615		- {
616		- Map<String,Object> data = new HashMap<>();
617		- RiskPatientsResult rp = (RiskPatientsResult)obj;
	606	+ for (Object obj : list) {
	607	+ Map<String, Object> data = new HashMap<>();
	608	+ RiskPatientsResult rp = (RiskPatientsResult) obj;
618	609	data.put("name", rp.getName());
619		- data.put("age",rp.getAge());
620		- data.put("dueWeek",rp.getDueWeek());
	610	+ data.put("age", rp.getAge());
	611	+ data.put("dueWeek", rp.getDueWeek());
621	612	data.put("rLevel", rp.getrLevel());
622	613	data.put("rFactor", rp.getrFactor());
623	614	data.put("hScore", rp.gethScore());
624	615	data.put("cTimes", rp.getcTime());
625		- data.put("cHTimes",rp.getcHTimes());
626		- data.put("cTime",rp.getcTime());
627		- data.put("dueDate",rp.getDueDate());
628		- data.put("checkDoctor",rp.getCheckDoctor());
629		- data.put("lName",rp.getlName());
630		- data.put("phone",rp.getPhone());
	616	+ data.put("cHTimes", rp.getcHTimes());
	617	+ data.put("cTime", rp.getcTime());
	618	+ data.put("dueDate", rp.getDueDate());
	619	+ data.put("checkDoctor", rp.getCheckDoctor());
	620	+ data.put("lName", rp.getlName());
	621	+ data.put("phone", rp.getPhone());
631	622	}
632	623	cnames.put("name", "姓名");
633		- cnames.put("age","当前年龄");
634		- cnames.put("dueWeek","当前孕周");
	624	+ cnames.put("age", "当前年龄");
	625	+ cnames.put("dueWeek", "当前孕周");
635	626	cnames.put("rLevel", "高危等级");
636	627	cnames.put("rFactor", "高危风险因素");
637	628	cnames.put("hScore", "高危评分");
638	629	cnames.put("cTimes", "总产检次数");
639		- cnames.put("cHTimes","本院产检次数");
640		- cnames.put("cTime","预约产检日期");
641		- cnames.put("dueDate","预产期");
642		- cnames.put("checkDoctor","产检医生");
643		- cnames.put("lName","登记人");
	630	+ cnames.put("cHTimes", "本院产检次数");
	631	+ cnames.put("cTime", "预约产检日期");
	632	+ cnames.put("dueDate", "预产期");
	633	+ cnames.put("checkDoctor", "产检医生");
	634	+ cnames.put("lName", "登记人");
644	635	cnames.put("phone", "联系方式");
645	636
646		- }
647		- else if (patientsQueryRequest.getQueryType() == 1)
648		- {
649		- listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest,null,1,userId,null);
	637	+ } else if (patientsQueryRequest.getQueryType() == 1) {
	638	+ listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null);
650	639	List list = listResponse.getData();
651		- for (Object obj : list)
652		- {
653		- Map<String,Object> data = new HashMap<>();
654		- QuanPatientsResult rp = (QuanPatientsResult)obj;
	640	+ for (Object obj : list) {
	641	+ Map<String, Object> data = new HashMap<>();
	642	+ QuanPatientsResult rp = (QuanPatientsResult) obj;
655	643	data.put("name", rp.getName());
656		- data.put("age",rp.getAge());
657		- data.put("dueWeek",rp.getDueWeek());
	644	+ data.put("age", rp.getAge());
	645	+ data.put("dueWeek", rp.getDueWeek());
658	646	data.put("rLevel", rp.getrLevel());
659	647	data.put("cTimes", rp.getcTime());
660		- data.put("cHTimes",rp.getcHTimes());
661		- data.put("cTime",rp.getcTime());
662		- data.put("dueDate",rp.getDueDate());
663		- data.put("checkDoctor",rp.getCheckDoctor());
664		- data.put("lName",rp.getlName());
665		- data.put("phone",rp.getPhone());
	648	+ data.put("cHTimes", rp.getcHTimes());
	649	+ data.put("cTime", rp.getcTime());
	650	+ data.put("dueDate", rp.getDueDate());
	651	+ data.put("checkDoctor", rp.getCheckDoctor());
	652	+ data.put("lName", rp.getlName());
	653	+ data.put("phone", rp.getPhone());
666	654	}
667	655	cnames.put("name", "姓名");
668		- cnames.put("age","当前年龄");
669		- cnames.put("dueWeek","当前孕周");
	656	+ cnames.put("age", "当前年龄");
	657	+ cnames.put("dueWeek", "当前孕周");
670	658	cnames.put("rLevel", "高危等级");
671	659	cnames.put("cTimes", "总产检次数");
672		- cnames.put("cHTimes","本院产检次数");
673		- cnames.put("cTime","预约产检日期");
674		- cnames.put("dueDate","预产期");
675		- cnames.put("checkDoctor","产检医生");
676		- cnames.put("lName","登记人");
	660	+ cnames.put("cHTimes", "本院产检次数");
	661	+ cnames.put("cTime", "预约产检日期");
	662	+ cnames.put("dueDate", "预产期");
	663	+ cnames.put("checkDoctor", "产检医生");
	664	+ cnames.put("lName", "登记人");
677	665	cnames.put("phone", "联系方式");
678	666	cnames.put("serviceType", "服务类型");
679		- }
680		- else if (patientsQueryRequest.getQueryType() == 2)
681		- {
682		- listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, null, 3,userId,null);
	667	+ } else if (patientsQueryRequest.getQueryType() == 2) {
	668	+ listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null);
683	669	List list = listResponse.getData();
684		- for (Object obj : list)
685		- {
686		- Map<String,Object> data = new HashMap<>();
687		- QuanChanResult rp = (QuanChanResult)obj;
	670	+ for (Object obj : list) {
	671	+ Map<String, Object> data = new HashMap<>();
	672	+ QuanChanResult rp = (QuanChanResult) obj;
688	673	data.put("name", rp.getName());
689		- data.put("age",rp.getAge());
690		- data.put("dueWeek",rp.getDueWeek());
691		- data.put("cTime",rp.getcTime());
	674	+ data.put("age", rp.getAge());
	675	+ data.put("dueWeek", rp.getDueWeek());
	676	+ data.put("cTime", rp.getcTime());
692	677	data.put("nextCheckTime", rp.getNextCheckTime());
693	678	data.put("cTimes", rp.getcTime());
694		- data.put("cHTimes",rp.getcHTimes());
695		- data.put("checkDoctor",rp.getCheckDoctor());
696		- data.put("lName",rp.getlName());
697		- data.put("phone",rp.getPhone());
	679	+ data.put("cHTimes", rp.getcHTimes());
	680	+ data.put("checkDoctor", rp.getCheckDoctor());
	681	+ data.put("lName", rp.getlName());
	682	+ data.put("phone", rp.getPhone());
698	683	}
699	684	cnames.put("name", "姓名");
700		- cnames.put("age","分娩年龄");
701		- cnames.put("dueWeek","分娩日期");
	685	+ cnames.put("age", "分娩年龄");
	686	+ cnames.put("dueWeek", "分娩日期");
702	687	cnames.put("cTime", "产后时间");
703	688	cnames.put("nextCheckTime", "预约下次复查");
704	689	cnames.put("cTimes", "总复查次数");
705	690	cnames.put("cHTimes", "本院复查次数");
706		- cnames.put("checkDoctor","检查医生");
707		- cnames.put("phone","联系方式");
708		- cnames.put("lName","登记人");
	691	+ cnames.put("checkDoctor", "检查医生");
	692	+ cnames.put("phone", "联系方式");
	693	+ cnames.put("lName", "登记人");
709	694	}
710	695	}
711	696
712	697
713	698	OutputStream out = response.getOutputStream();
714	699	ExcelUtil.toExcel(out, datas, cnames);
715		- }catch (IOException e) {
	700	+ } catch (IOException e) {
716	701	e.printStackTrace();
717	702	}
718	703	}

...	...	@@ -93,9 +93,17 @@
93	93	//产检日期
94	94	private String checkTime;
95	95	//下次产检时间
96		- private Map nextCheckTime;
	96	+ private String nextCheckTime;
	97	+ private Integer yl;
97	98
	99	+ public Integer getYl() {
	100	+ return yl;
	101	+ }
98	102
	103	+ public void setYl(Integer yl) {
	104	+ this.yl = yl;
	105	+ }
	106	+
99	107	public String getDueDate() {
100	108	return dueDate;
101	109	}
102	110
...	...	@@ -152,11 +160,11 @@
152	160	this.dirOpinion = dirOpinion;
153	161	}
154	162
155		- public Map getNextCheckTime() {
	163	+ public String getNextCheckTime() {
156	164	return nextCheckTime;
157	165	}
158	166
159		- public void setNextCheckTime(Map nextCheckTime) {
	167	+ public void setNextCheckTime(String nextCheckTime) {
160	168	this.nextCheckTime = nextCheckTime;
161	169	}
162	170
...	...	@@ -338,6 +346,7 @@
338	346	if(null!=diagnosis){
339	347	postReviewModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis));
340	348	}
	349	+ postReviewModel.setYl(yl);
341	350	postReviewModel.setTreatOpinion(treatOpinion);
342	351	postReviewModel.setDirOpinion(dirOpinion);
343	352	postReviewModel.setProdDoctor(prodDoctor);
...	...	@@ -345,7 +354,7 @@
345	354	postReviewModel.setCheckTime(DateUtil.parseYMD(checkTime));
346	355	}
347	356	if(null!=nextCheckTime){
348		- postReviewModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
	357	+ postReviewModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
349	358	}
350	359	return postReviewModel;
351	360	}

...	...	@@ -86,7 +86,7 @@
86	86	//产检日期
87	87	private String checkTime;
88	88	//下次产检时间
89		- private Map nextCheckTime;
	89	+ private String nextCheckTime;
90	90
91	91
92	92
...	...	@@ -116,7 +116,7 @@
116	116	setDirOpinion(postReviewModel.getDirOpinion());
117	117
118	118	setCheckTime(DateUtil.getyyyy_MM_dd(postReviewModel.getCheckTime()));
119		- setNextCheckTime(JsonUtil.str2Obj(postReviewModel.getNextCheckTime(),Map.class));
	119	+ setNextCheckTime(DateUtil.getyyyy_MM_dd(postReviewModel.getNextCheckTime()));
120	120	return this;
121	121	}
122	122
123	123
...	...	@@ -169,11 +169,11 @@
169	169	this.dirOpinion = dirOpinion;
170	170	}
171	171
172		- public Map getNextCheckTime() {
	172	+ public String getNextCheckTime() {
173	173	return nextCheckTime;
174	174	}
175	175
176		- public void setNextCheckTime(Map nextCheckTime) {
	176	+ public void setNextCheckTime(String nextCheckTime) {
177	177	this.nextCheckTime = nextCheckTime;
178	178	}
179	179