jiangjiazhi / regional-platform | GitLab

Commit e68178973766c4ebb293bc707958dc558ab683c5

Authored by [wangbo] over 6 years ago

1 parent a0859055de

Exists in master and in 6 other branches

update

Showing 3 changed files with 5 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java

...	...	@@ -2249,7 +2249,7 @@
2249	2249	if (CollectionUtils.isNotEmpty(list)) {
2250	2250	for (SieveListResult sive : list) {
2251	2251	Map<String, Object> data = new HashMap<>();
2252		- data.put("aoolyHospital", sive.getApplyHospital());
	2252	+ data.put("aoolyHospital", sive.getApplyDoctor());
2253	2253	data.put("versionNo", sive.getNumber());
2254	2254	data.put("exportTime", sive.getExportTime());
2255	2255	data.put("highRisk", sive.getZtfxText());

...	...	@@ -108,7 +108,7 @@
108	108	*/
109	109	private String reportTypeStr;
110	110
111		- //申请医生
	111	+ //申请医院名字错了，没改
112	112	private String applyDoctor;
113	113
114	114	//报告时间

...	...	@@ -108,7 +108,8 @@
108	108	if (CollectionUtils.isNotEmpty(applyOrderModels)) {
109	109	SieveApplyOrderModel sieveApplyOrderModel = applyOrderModels.get(0);
110	110	//送检医生
111		- sieveListResult.setApplyDoctor(StringUtils.isNotEmpty(sieveApplyOrderModel.getApplyDoctor()) ? usersService.getUsers(Integer.valueOf(sieveApplyOrderModel.getApplyDoctor())).getName() : "--");
	111	+ sieveListResult.setApplyDoctor(StringUtils.isNotEmpty(sieveApplyOrderModel.getSieveHospitalId()) ?
	112	+ organizationService.getOrganization(Integer.valueOf(sieveApplyOrderModel.getSieveHospitalId())).getName() : "--");
112	113	//版本号
113	114	sieveListResult.setNumber(sieveApplyOrderModel.getNumber());
114	115	//采血日期
...	...	@@ -120,7 +121,7 @@
120	121	String bpd = null;
121	122	String crl = null;
122	123	bpd = StringUtils.isNotEmpty(sieveApplyOrderModel.getBpd()) ? "BPD:" + sieveApplyOrderModel.getBpd() : "";
123		- crl = StringUtils.isNotEmpty(sieveApplyOrderModel.getCrl()) ? "CRL:"+sieveApplyOrderModel.getCrl() : "";
	124	+ crl = StringUtils.isNotEmpty(sieveApplyOrderModel.getCrl()) ? "CRL:" + sieveApplyOrderModel.getCrl() : "";
124	125	sieveListResult.setbScanInfo(bpd + "," + crl);
125	126	} else if ("2".equals(sieveApplyOrderModel.getSieveType())) {
126	127	sieveListResult.setbScanInfo(StringUtils.isNotEmpty(sieveApplyOrderModel.getFetusNum()) ? data.get(sieveApplyOrderModel.getFetusNum()) : "--");