jiangjiazhi / regional-platform

Authored by zhangchao 11 months ago

Exists in dev

Showing 6 changed files with 7 additions and 18 deletions

...	...	@@ -34,6 +34,7 @@
34	34	postpartumReportQuery.mysqlBuild(pregnancyReportDao.queryPatientCount(postpartumReportQuery.convertToQuery()));
35	35	query.start(postpartumReportQuery.getOffset()).end(postpartumReportQuery.getLimit());
36	36	}
	37	+ //System.out.println(query.convertToMongoQuery().toString());
37	38	List<PregnancyReport> results= pregnancyReportDao.queryPatient(query);
38	39	return results;
39	40	}

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
8	8	import com.lyms.platform.common.utils.StringUtils;
9	9
	10	+import java.util.Arrays;
10	11	import java.util.List;
11	12
12	13	public class PregnancyReportQuery extends BaseQuery implements IConvertToNativeQuery {

...	...	@@ -134,12 +134,12 @@
134	134	patient.setYn(1);
135	135	patient.setType(3);
136	136	patient.setBuildType(2);
137		- //patient.setBookbuildingDate(new Date());
	137	+ patient.setBookbuildingDate(new Date());
138	138	//patient.setBookbuildingDoctor();
139	139	patient.setUsername(allFm.getName());
140	140	patient.setPhone(allFm.getPhone());
141	141	patient.setPid(resperson.getId());
142		- patient.setDueStatus(1);
	142	+ patient.setDueStatus(0);
143	143	patient.setOperator(users.get(0).getId());
144	144	patient.setLastMenses(DateUtil.getWeekDay(allFm.getDue_WEEK().length()>2?-Integer.valueOf(allFm.getDue_WEEK().substring(0,2)):-Integer.valueOf(allFm.getDue_WEEK())));
145	145	patient.setBirth(DateUtil.parseYMD(DateUtil.getBirthFromIdCard(allFm.getIdcard())));

...	...	@@ -84,7 +84,7 @@
84	84	PregnancyReportQuery pregnancyReportQuery=new PregnancyReportQuery();
85	85	pregnancyReportQuery.setWeek(week);
86	86	pregnancyReportQuery.setWeightType(weightType);
87		- pregnancyReportQuery.setrFactor(rFactor);
	87	+ pregnancyReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
88	88	return pregnancyReportFacade.getPatientReport(pregnancyReportQuery,getUserId(request));
89	89	}
90	90

...	...	@@ -69,21 +69,7 @@
69	69	List<PregnancyReport> list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery);
70	70	BaseResponse baseResponse=new BaseResponse();
71	71	if (CollectionUtils.isNotEmpty(list)){
72		- PregnancyReport pregnancyReport= list.get(0);
73		- PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
74		- postpartumReportQuery.setYn(1);
75		- postpartumReportQuery.setHospitalId(hospitalId);
76		- postpartumReportQuery.setWeek(week);
77		- Integer riskType=1;
78		- if (pregnancyReport.getRiskFactorName().contains("健康")){
79		- riskType=0;
80		- }
81		- postpartumReportQuery.setRiskType(riskType);
82		- List<PregnancyReportMatters> mattersList= pregnancyReportMattersService.queryPregnancyReport(postpartumReportQuery);
83		- if (CollectionUtils.isNotEmpty(mattersList)){
84		- pregnancyReport.setMatters(mattersList.get(0).getMatters());
85		- }
86		- baseResponse.setObject(pregnancyReport);
	72	+ baseResponse.setObject(list);
87	73	}
88	74	baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
89	75	baseResponse.setErrormsg("成功");

...	...	@@ -16,6 +16,7 @@
16	16	private String firstHospitalId;
17	17
18	18
	19	+
19	20	/承德定制/
20	21	//初诊孕周
21	22	private String czWeek;