| 
					
				 | 
			
			
				@ -215,11 +215,13 @@ public class PatientRecordService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //获取基卫数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String response = jwSmjkService.getExamAndLabReport(patient.getSsc(), page, pageSize);     //【基卫接口】 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int pageInt = Integer.parseInt(page); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        int pageSizeInt = Integer.parseInt(pageSize); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //获取app数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String sql = "select a.*,b.img_type as catalog,GROUP_CONCAT(b.img_label) as label \n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "from wlyy_patient_event a,wlyy_patient_event_img b\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "where a.patient='"+patientCode+"' and b.event_id=a.id and b.img_type in ('检查报告','检验报告')  \n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "group by b.event_id,b.img_type order by a.event_date desc"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "where a.patient='" + patientCode + "' and b.event_id=a.id and b.img_type in ('检查报告','检验报告')  \n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "group by b.event_id,b.img_type order by a.event_date desc limit " + pageInt * pageSizeInt + "," + pageSize; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<Map<String, Object>> appList = jdbcTemplate.queryForList(sql); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -274,8 +276,7 @@ public class PatientRecordService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            //排序 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            re = sortMapList(re, "eventDate", "DESC"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            for (Map<String, Object> item : appList) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                Map<String, String> map = new HashMap<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                map.put("id", String.valueOf(item.get("id"))); 
			 |