jiangjiazhi / regional-platform

Commit 07f6835eefa4f09afc8a517c93881fbd4b825952

Authored by [wangbo] almost 6 years ago

Exists in master and in 6 other branches

怀孕建档是否婚检显示

Showing 1 changed file with 8 additions and 5 deletions

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

...	...	@@ -843,6 +843,8 @@
843	843	temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
844	844	// 预约时间
845	845	temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate()));
	846	+
	847	+
846	848	//孕妇建档日期
847	849	temp.put("womanCreatedTime", downRecord.getWomanBuildTime());
848	850	return temp;
849	851
...	...	@@ -874,13 +876,14 @@
874	876	temp.put("trackDownTime", CollectionUtils.isEmpty(trackDown) ? "--" : DateUtil.getyyyy_MM_dd(trackDown.get(0).getTrackDownDate()));
875	877	// 预约时间
876	878	temp.put("yyTime", downRecord.getAppointmentDate() == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate()));
877		-
878		-
879		- //Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("hospitalId").is(archiveModel.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class);
880		-
881		-
882	879	//孕妇建档时间
883	880	temp.put("womanCreatedTime", downRecord.getWomanBuildTime() == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getWomanBuildTime()));
	881	+
	882	+ //是否婚检
	883	+ if (null != downRecord.getTrackType() && downRecord.getTrackType() == 2) {
	884	+ Long checkNum = mongoTemplate.count(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("hospitalId").is(downRecord.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class);
	885	+ temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉
	886	+ }
884	887	return temp;
885	888	}
886	889	}