jiangjiazhi / regional-platform | GitLab

Commit d3271bd8567ce849f3a65479832fc553c525cfad

Authored by yangfei about 7 years ago

1 parent a2aa44d9be

Exists in master and in 6 other branches

追访

Showing 2 changed files with 5 additions and 0 deletions

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

...	...	@@ -120,6 +120,8 @@
120	120	basicConfigQuery.setParentId(SystemConfig.BABY_WEAK_SON_ID);
121	121	} else return null;
122	122
	123	+ // System.out.println(query.convertToQuery().convertToMongoQuery());
	124	+
123	125	int riskPatientCount = babyService.queryBabyCount(query);
124	126
125	127	// int allPatientCount = babyService.queryBabyCount(babyModelQuery);

...	...	@@ -1022,6 +1022,8 @@
1022	1022	if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
1023	1023	Map<String, Object> result = new HashMap<>();
1024	1024	SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
	1025	+ String hostName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService);
	1026	+ result.put("reportHostName",hostName);
1025	1027	result.put("patientInfo", patientBaseResult);
1026	1028	result.put("weight", sieveApply.getWeight());
1027	1029	result.put("lastMenstr", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
...	...	@@ -1036,6 +1038,7 @@
1036	1038	result.put("pastHistory",sieveApply.getPastHistory());
1037	1039	String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService);
1038	1040	result.put("cxys", collectionDoctorName);
	1041	+ result.put("experimentNum","");
1039	1042
1040	1043	String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService);
1041	1044	result.put("sjys", sendDoctorName);