jiangjiazhi / regional-platform

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

Showing 1 changed file with 7 additions and 5 deletions

...	...	@@ -511,7 +511,6 @@
511	511	*/
512	512	public List<Map<String, Object>> prFuData(String id, int num, Integer userId) {
513	513	List<Map<String, Object>> mList = new ArrayList<Map<String, Object>>();
514		- List<AntenatalExaminationModel> list = null;
515	514	//Map<String, Object> map = new HashedMap();
516	515	AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4];
517	516	AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id);
518	517
...	...	@@ -533,9 +532,12 @@
533	532	antExQuery.setYn(YnEnums.YES.getId());
534	533	antExQuery.setParentId(patientsId);
535	534	//复诊
536		- list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate"));
	535	+ List<AntenatalExaminationModel> list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "checkDate"));
537	536	if(list != null && list.size() > 0){
538		-
	537	+ exData[0] = list.get(0);
	538	+ exData[1] = list.get(1);
	539	+ exData[2] = list.get(2);
	540	+ exData[3] = list.get(3);
539	541	}else{
540	542	return mList;
541	543	}
542	544
...	...	@@ -546,10 +548,10 @@
546	548	}
547	549
548	550	// Map<String, Object> map = new HashMap<>();
549		- for (int i = 0; i < list.size(); i++) {
	551	+ for (int i = 0; i < exData.length; i++) {
550	552	Map<String, Object> map = new HashedMap();
551	553	map.put("name",name);
552		- AntenatalExaminationModel data = list.get(i);
	554	+ AntenatalExaminationModel data = exData[i];
553	555	if (data == null) {
554	556	continue;
555	557	}