jiangjiazhi / regional-platform

Commit bbb18c9ea4f297f0297235644a72029d521ce10e

Authored by jiangjiazhi over 7 years ago

Exists in master and in 6 other branches

1

Showing 1 changed file with 8 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMedicalRecordFacade.java

...	...	@@ -171,15 +171,11 @@
171	171	* @param listData
172	172	*/
173	173	private void doHandAfterFmRecord(MedicalRecordGroupVo medicalRecordGroupVo, List<AntData> listData, Date nextLastMenses) {
174		- PostReviewQuery postReviewQuery = new PostReviewQuery();
	174	+
175	175	String pid = medicalRecordGroupVo.getPid();
176		- postReviewQuery.setStart(medicalRecordGroupVo.getFmDate());
177		- //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
178		- postReviewQuery.setEnd(nextLastMenses);
179		- postReviewQuery.setPid(pid);
	176	+
180	177	Organization organization = null;
181	178
182		-
183	179	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
184	180	matDeliverQuery.setPid(medicalRecordGroupVo.getPid());
185	181	matDeliverQuery.setYn(YnEnums.YES.getId());
...	...	@@ -225,6 +221,11 @@
225	221	}
226	222
227	223
	224	+ PostReviewQuery postReviewQuery = new PostReviewQuery();
	225	+ postReviewQuery.setStart(medicalRecordGroupVo.getFmDate());
	226	+ //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
	227	+ postReviewQuery.setEnd(nextLastMenses);
	228	+ postReviewQuery.setPid(pid);
228	229	//产后复查记录
229	230	List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
230	231	if (CollectionUtils.isNotEmpty(reviewModels)) {
...	...	@@ -259,6 +260,7 @@
259	260	organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
260	261	}
261	262	pid = patients.getPid();
	263	+ //隐藏建档不显示出来
262	264	if (!"2".equals(patients.getEnable())) {
263	265	listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
264	266	}