jiangjiazhi / regional-platform

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 8 additions and 5 deletions

...	...	@@ -380,11 +380,12 @@
380	380	/** 复查次数 */
381	381	temp.put("fcNum", list.size());
382	382	if (CollectionUtils.isNotEmpty(list)) {
383		-
	383	+ PostReviewModel firstPost = list.get(0);
	384	+ PostReviewModel endPost = list.get(list.size() - 1);
384	385	/** 初次复查日期 */
385		- temp.put("ccfcDate", list.get(0).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getCheckTime()));
	386	+ temp.put("ccfcDate", firstPost.getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(firstPost.getCheckTime()));
386	387	/** 预约复查日期 */
387		- temp.put("yyfcDate", list.get(list.size() - 1).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size() - 1).getNextCheckTime()));
	388	+ temp.put("yyfcDate", endPost.getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(endPost.getNextCheckTime()));
388	389	}
389	390	return temp;
390	391	}

...	...	@@ -125,6 +125,7 @@
125	125	temp.put("resident", 1); // 妇女建档
126	126	temp.put("check", 3); // 婚检
127	127	Long checkNum = mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("hospitalId").is(archiveModel.getHospitalId()).and("yn").is(1)), PremaritalCheckup.class);
	128	+
128	129	PatientsQuery patientsQuery = new PatientsQuery();
129	130	patientsQuery.setHospitalId(archiveModel.getHospitalId());
130	131	if (archiveModel.getCertificateNum() != null) {
...	...	@@ -137,7 +138,6 @@
137	138	patientsQuery.setTypeList(Arrays.asList(1, 3));
138	139	//怀孕建档
139	140	List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
140		-
141	141	if (CollectionUtils.isNotEmpty(patientsList)) {
142	142	temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉
143	143
144	144
...	...	@@ -235,8 +235,10 @@
235	235	}
236	236	}
237	237
	238	+ if(trackDownRecord.getTrackType()>TrackDownDateEnums.A.getId()){
	239	+ temp.put("check", checkNum > 0 ? 1 : 2); // 婚检 1=勾勾 2=叉叉
	240	+ }
238	241	isExitTrackDown(trackDownRecord, temp);
239		-
240	242	archiveModelList.add(temp);
241	243	}
242	244	return archiveModelList;