jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 4 additions and 15 deletions

...	...	@@ -183,7 +183,6 @@
183	183	//复诊集合列表
184	184	List<AntenatalExaminationModel> antenatalExaminationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery());
185	185
186		- List<AntextDoctorPatient> antextDoctorPatient = new ArrayList<>();
187	186	//添加初诊结果
188	187	for (AntExChuModel ac : antExChuModels) {
189	188	AntextDoctorPatient doctorPatient = resultInfo.get(ac.getParentId());
190	189
...	...	@@ -191,9 +190,9 @@
191	190
192	191	if (ac.getCheckTime().after(doctorPatient.getCheckTime())) {
193	192	doctorPatient.setCheckTime(ac.getCheckTime());
194		- doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(ac.getCheckTime()));
195		- doctorPatient.setCheckDoctor(ac.getProdDoctor());
	193	+ doctorPatient.setDoctorId(ac.getProdDoctor());
196	194	}
	195	+ doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(doctorPatient.getCheckTime()));
197	196	}
198	197	//添加复诊结果
199	198	for (AntenatalExaminationModel aec : antenatalExaminationModels) {
200	199
...	...	@@ -201,9 +200,9 @@
201	200	doctorPatient.setAllCjNum(doctorPatient.getAllCjNum() + 1);
202	201	if (aec.getCheckDate().after(doctorPatient.getCheckTime())) {
203	202	doctorPatient.setCheckTime(aec.getCheckDate());
204		- doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(aec.getCheckDate()));
205		- doctorPatient.setCheckDoctor(aec.getCheckDoctor());
	203	+ doctorPatient.setDoctorId(aec.getCheckDoctor());
206	204	}
	205	+ doctorPatient.setCheckTimeStr(DateUtil.getyyyy_MM_dd(doctorPatient.getCheckTime()));
207	206	}
208	207	}
209	208

...	...	@@ -35,8 +35,6 @@
35	35	private Date checkTime;
36	36	//产检时间
37	37	private String checkTimeStr;
38		- //产检医生
39		- private String checkDoctor;
40	38
41	39	public String getDoctorName() {
42	40	return doctorName;
43	41
...	...	@@ -70,14 +68,7 @@
70	68	this.checkTime = checkTime;
71	69	}
72	70
73		- public String getCheckDoctor() {
74		- return checkDoctor;
75		- }
76	71
77		- public void setCheckDoctor(String checkDoctor) {
78		- this.checkDoctor = checkDoctor;
79		- }
80		-
81	72	public int getCjNum() {
82	73	return cjNum;
83	74	}
...	...	@@ -163,7 +154,6 @@
163	154	", cDueWeek='" + cDueWeek + '\'' +
164	155	", dueFmDate=" + dueFmDate +
165	156	", checkTime=" + checkTime +
166		- ", checkDoctor='" + checkDoctor + '\'' +
167	157	'}';
168	158	}
169	159	}