jiangjiazhi / regional-platform

Commit 107ffd309caaf13b79a2d91e198eb855a4a7eafc

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

code update

Showing 1 changed file with 22 additions and 5 deletions

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

...	...	@@ -609,7 +609,7 @@
609	609	data.put("name", rp.getName());
610	610	data.put("age", rp.getAge());
611	611	data.put("dueWeek", rp.getDueWeek());
612		- data.put("rLevel", rp.getrLevel());
	612	+ data.put("rLevel", getLevel(rp.getrLevel()));
613	613	data.put("rFactor", rp.getrFactor());
614	614	data.put("hScore", rp.gethScore());
615	615	data.put("cTimes", rp.getcTime());
...	...	@@ -618,7 +618,7 @@
618	618	data.put("dueDate", rp.getDueDate());
619	619	data.put("checkDoctor", rp.getCheckDoctor());
620	620	data.put("lName", rp.getlName());
621		- data.put("phone", rp.getPhone());
	621	+ data.put("phone", rp.getRealPhone());
622	622	datas.add(data);
623	623	}
624	624	cnames.put("name", "姓名");
625	625
...	...	@@ -644,14 +644,15 @@
644	644	data.put("name", rp.getName());
645	645	data.put("age", rp.getAge());
646	646	data.put("dueWeek", rp.getDueWeek());
647		- data.put("rLevel", rp.getrLevel());
	647	+
	648	+ data.put("rLevel", getLevel(rp.getrLevel()));
648	649	data.put("cTimes", rp.getcTime());
649	650	data.put("cHTimes", rp.getcHTimes());
650	651	data.put("cTime", rp.getcTime());
651	652	data.put("dueDate", rp.getDueDate());
652	653	data.put("checkDoctor", rp.getCheckDoctor());
653	654	data.put("lName", rp.getlName());
654		- data.put("phone", rp.getPhone());
	655	+ data.put("phone", rp.getRealPhone());
655	656	data.put("serviceType", rp.getServiceType());
656	657	datas.add(data);
657	658	}
...	...	@@ -682,7 +683,7 @@
682	683	data.put("cHTimes", rp.getcHTimes());
683	684	data.put("checkDoctor", rp.getCheckDoctor());
684	685	data.put("lName", rp.getlName());
685		- data.put("phone", rp.getPhone());
	686	+ data.put("phone", rp.getRealPhone());
686	687	datas.add(data);
687	688	}
688	689	cnames.put("name", "姓名");
...	...	@@ -704,6 +705,22 @@
704	705	} catch (IOException e) {
705	706	e.printStackTrace();
706	707	}
	708	+ }
	709	+
	710	+
	711	+ private String getLevel(List<Map> levels)
	712	+ {
	713	+
	714	+ String str = "";
	715	+ if (CollectionUtils.isNotEmpty(levels))
	716	+ {
	717	+ for (Map map : levels)
	718	+ {
	719	+ str+=map.get("name")+";";
	720	+ }
	721	+ }
	722	+
	723	+ return str;
707	724	}
708	725	}