feat：打卡经纬度 2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDistributionServiceImpl.java

@@ -155,9 +155,18 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 			}
 		}
 
+		// 获取商业公司经纬度
+		WmDaDistribution latAndLng = this.getLatAndLng(wmTaskContent.getTemp4().replace("-","") + wmTaskContent.getTemp7());
+		if (latAndLng != null){
+			wmDaDistribution.setLatitude(latAndLng.getLatitude());
+			wmDaDistribution.setLongitude(latAndLng.getLongitude());
+		}
+
 		//Temp29对应医院ID
 		if(exist){
 			newinfo.setId(wmDaDistribution.getId());
+			newinfo.setLatitude(wmDaDistribution.getLatitude());
+			newinfo.setLongitude(wmDaDistribution.getLongitude());
 			compareList=compareData(wmDaDistribution,wmTaskContent,newinfo);
 			if(null!=compareList&&compareList.size()>0){
 				wmTask.setCompareResult("2");//信息不一致
@@ -215,12 +224,6 @@ public class WmDaDistributionServiceImpl extends ServiceImpl<WmDaDistributionMap
 			wmDaDistribution.setMedicineTraceability(wmTaskContent.getTemp22()); // 药品信息化追溯体系
 			wmDaDistribution.setMedicineTraceabilityOther(wmTaskContent.getTemp25()); // 追溯体系介绍
 			wmDaDistribution.setCreateTime(LocalDateTime.now());
-			// 获取商业公司经纬度
-			WmDaDistribution latAndLng = this.getLatAndLng(wmDaDistribution.getProvince() + wmDaDistribution.getCity() + wmDaDistribution.getArea() + wmDaDistribution.getAddress());
-			if (latAndLng != null){
-				wmDaDistribution.setLatitude(latAndLng.getLatitude());
-				wmDaDistribution.setLongitude(latAndLng.getLongitude());
-			}
 			newinfo=wmDaDistribution;
 
 		}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaHospitalServiceImpl.java

@@ -157,9 +157,18 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 			}
 		}
 
+		// 获取医院经纬度
+		WmDaHospital latAndLng = this.getLatAndLng(wmTaskContent.getTemp4().replace("-","") + wmTaskContent.getTemp16());
+		if (latAndLng != null){
+			wmDaHospital.setLatitude(latAndLng.getLatitude());
+			wmDaHospital.setLongitude(latAndLng.getLongitude());
+		}
+
 		if (exist) {
 			//对比系统信息和调研数据
 			newinfo.setId(wmDaHospital.getId());
+			newinfo.setLongitude(wmDaHospital.getLongitude());
+			newinfo.setLatitude(wmDaHospital.getLatitude());
 			compareList = compareData(wmDaHospital, wmTaskContent, newinfo);
 			if (null != compareList && compareList.size() > 0) {
 				wmTask.setCompareResult("2");//信息不一致
@@ -233,13 +242,6 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //			wmDaHospital.setYjkzrlsfs(wmTaskContent.getTemp21());//联系方式
 //			wmDaHospital.setYbczs(wmTaskContent.getTemp22());//院病床总数（张）
 //			wmDaHospital.setZlghsy(wmTaskContent.getTemp23());//主流供货商业
-
-			// 获取医院经纬度
-			WmDaHospital latAndLng = this.getLatAndLng(wmDaHospital.getProvince() + wmDaHospital.getCity() + wmDaHospital.getArea() + wmDaHospital.getAddress());
-			if (latAndLng != null){
-				wmDaHospital.setLatitude(latAndLng.getLatitude());
-				wmDaHospital.setLongitude(latAndLng.getLongitude());
-			}
 			wmDaHospital.setCreateTime(LocalDateTime.now());
 			newinfo = wmDaHospital;
 		}