| 
															
																@ -1730,7 +1730,7 @@ public class MonitorPlatformService  { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "INNER JOIN wlyy.wlyy_sign_family sf on pd.`user` = sf.patient and sf.type=2 \n" + 
															 | 
															
															 | 
															
																                "INNER JOIN wlyy.wlyy_sign_family sf on pd.`user` = sf.patient and sf.type=2 \n" + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "INNER JOIN wlyy.wlyy_patient p on p.idcard = sf.idcard and p.`status`=1\n" + 
															 | 
															
															 | 
															
																                "INNER JOIN wlyy.wlyy_patient p on p.idcard = sf.idcard and p.`status`=1\n" + 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                "where  pd.del=0 and pd.category_code in (1,2)"; 
															 | 
															
															 | 
															
																                "where  pd.del=0 and pd.category_code in (1,2)"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        sql="select * from device.wlyy_patient_device_location_tmp"; 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																//        sql="select * from device.wlyy_patient_device_location_tmp"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql); 
															 | 
															
															 | 
															
																        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        list.forEach(map->{ 
															 | 
															
															 | 
															
																        list.forEach(map->{ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            try { 
															 | 
															
															 | 
															
																            try { 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -1741,7 +1741,7 @@ public class MonitorPlatformService  { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                Map<String, String> json = null; 
															 | 
															
															 | 
															
																                Map<String, String> json = null; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                if (map.get("address")!=null){ 
															 | 
															
															 | 
															
																                if (map.get("address")!=null){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                    if (org.apache.commons.lang3.StringUtils.isNoneBlank(map.get("address").toString())) { 
															 | 
															
															 | 
															
																                    if (org.apache.commons.lang3.StringUtils.isNoneBlank(map.get("address").toString())) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                        json = LatitudeUtils.getGeocoderLatitude(map.get("address").toString().replace("G.", "").replace("(糖友网)", "").replace("(高友网)", "")); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                        json = LatitudeUtils.getGeocoderLatitude(("福建省厦门市"+map.get("address").toString()).replace("G.", "").replace("(糖友网)", "").replace("(高友网)", "")); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                    } 
															 | 
															
															 | 
															
																                    } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                } 
															 | 
															
															 | 
															
																                } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                if (json==null||map.get("address")==null){ 
															 | 
															
															 | 
															
																                if (json==null||map.get("address")==null){ 
															 |