jiangjiazhi / regional-platform

Commit ca47de31046e7d56053192c45503b7cb910a9774

Authored by liquanyu over 7 years ago

1 parent c6eb32081e

Exists in master and in 6 other branches

检查报告

Showing 1 changed file with 17 additions and 10 deletions

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

...	...	@@ -89,14 +89,17 @@
89	89	public BaseResponse getLisAndRisData(String vcCardNo,String phone,Integer sortType,Integer userId) {
90	90
91	91	List<CheckByDate> checkByDate=new ArrayList<CheckByDate>();
92		- List<CheckResponse> result = queryLisCheckList(vcCardNo,phone,userId);
	92	+ //根据用户id获取医院ID
	93	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
93	94
	95	+ List<CheckResponse> result = queryLisCheckList(vcCardNo,phone,hospitalId);
	96	+
94	97	//排序检查大项
95	98	sortLis(result);
96	99
97	100	if(1 == sortType){
98	101	List<String> keyList = new ArrayList<>();
99		- for (CheckResponse check:result) {
	102	+ for (CheckResponse check : result) {
100	103	//明细项排序
101	104	sortLisItems(check);
102	105	Date date = check.getApplyDate() == null ? check.getModified() : check.getApplyDate();
103	106
104	107
105	108
...	...	@@ -134,20 +137,25 @@
134	137	checkByItem.setTime("检验报告");
135	138	checkByDate.add(checkByItem);
136	139
137		- List<CheckType> checkType =new ArrayList<CheckType>();
	140	+ List<CheckType> checkType = new ArrayList<CheckType>();
138	141
139	142	for (CheckResponse check : result) {
140	143	sortLisItems(check);
141		-
142		-
143	144	List<CheckResponse> result2 = new ArrayList<>();
144		-
145	145	check.setTitle(check.getTitle() + " " + DateUtil.getyyyy_MM_dd(check.getApplyDate()));
146	146	CheckType CheckType1 = new CheckType();
147	147	result2.add(check);
148	148
149	149	if(result2.size() > 0){
150		- CheckType1.setType(check.getTitle());
	150	+ //秦皇岛显示检验报告类别名称
	151	+ if ("216".equals(hospitalId))
	152	+ {
	153	+ CheckType1.setType(check.getLisTypeName());
	154	+ }
	155	+ else
	156	+ {
	157	+ CheckType1.setType(check.getTitle());
	158	+ }
151	159	CheckType1.setTypeName(result2);
152	160	checkType.add(CheckType1);
153	161	}
...	...	@@ -226,7 +234,7 @@
226	234	* @param userId 用户ID
227	235	* @return
228	236	*/
229		- public List<CheckResponse> queryLisCheckList(String vcCardNo,String phone,Integer userId) {
	237	+ public List<CheckResponse> queryLisCheckList(String vcCardNo,String phone,String hospitalId) {
230	238
231	239	//保存这个人在所有医院的lis记录
232	240	List<CheckResponse> result = new ArrayList<>();
...	...	@@ -234,8 +242,7 @@
234	242	//缓存查询到的医院
235	243	Map<String,String> hIdNames = new HashMap<>();
236	244
237		- //根据用户id获取医院ID
238		- String hospitalId = autoMatchFacade.getHospitalId(userId);
	245	+
239	246
240	247	OrganizationQuery organizationQuery = new OrganizationQuery();
241	248	organizationQuery.setYn(YnEnums.YES.getId());