pref: hospital geo query

hnqz-common/hnqz-common-core/src/main/java/com/qunzhixinxi/hnqz/common/core/constant/CacheConstants.java

@@ -50,6 +50,11 @@ public interface CacheConstants {
      */
     String ROUTE_KEY = "gateway_route_key";
 
+    /**
+     * 医院地理位置
+     */
+    String HOSPITAL_GEO_KEY = "hospital_geo_key";
+
     /**
      * redis reload 事件
      */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/config/GeoInitRunner.java

@@ -0,0 +1,80 @@
+package com.qunzhixinxi.hnqz.admin.config;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmDaHospital;
+import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
+import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
+import com.qunzhixinxi.hnqz.common.gateway.support.DynamicRouteInitEvent;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.annotation.Order;
+import org.springframework.data.geo.Point;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 地理位置初始化
+ *
+ * @author jimmy
+ * @date 2024-12-18 15:54
+ */
+@Slf4j
+@Configuration
+@AllArgsConstructor
+public class GeoInitRunner {
+
+
+    private final RedisTemplate redisTemplate;
+
+    private final WmDaHospitalService hospitalService;
+
+    @Async
+    @Order
+    @EventListener({WebServerInitializedEvent.class, DynamicRouteInitEvent.class})
+    public void initRoute() {
+
+        log.info("======> 初始化医院地理位置开始 <======");
+        Boolean result = redisTemplate.delete(CacheConstants.HOSPITAL_GEO_KEY);
+        log.info("======> 删除历史医院地理位置：【{}】 ", result);
+
+        // 获取全部的医院信息
+        List<WmDaHospital> hospitals = hospitalService.list(Wrappers.<WmDaHospital>lambdaQuery()
+                .eq(WmDaHospital::getEnableFlag, CommonConstants.STATUS_NORMAL)
+                .eq(WmDaHospital::getDelFlag, CommonConstants.STATUS_NORMAL));
+
+        // 过滤全部的可用医院信息
+        List<WmDaHospital> avail = hospitals.stream().filter(h -> StrUtil.isAllNotBlank(h.getLatitude(), h.getLongitude())).collect(Collectors.toList());
+        log.info("======> 获取医院地理位置：全部【{}】，可用【{}】 ", hospitals.size(), avail.size());
+
+
+        if (CollUtil.isEmpty(avail)) {
+            log.info("======> 可用医院地理位置为0，结束初始化");
+
+        } else {
+
+            avail.forEach(h -> {
+
+                // 纬度
+                double latitude = Double.parseDouble(h.getLatitude());
+
+                // 经度
+                double longitude = Double.parseDouble(h.getLongitude());
+
+                log.info("医院地理位置家在：ID：【{}】名称【{}】经度【{}】 纬度【{}】", h.getId(), h.getYymc(), longitude, latitude);
+                redisTemplate.opsForGeo().add(CacheConstants.HOSPITAL_GEO_KEY, new Point(longitude, latitude), h.getId());
+
+            });
+
+        }
+        log.debug("======> 初始化医院地理位置结束 <======");
+    }
+}

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

@@ -25,6 +25,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.admin.util.MapUtil;
+import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
@@ -33,12 +34,20 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.geo.Circle;
+import org.springframework.data.geo.GeoResults;
+import org.springframework.data.geo.Metrics;
+import org.springframework.data.redis.connection.RedisGeoCommands;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -54,6 +63,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmDaHospital> implements WmDaHospitalService {
 
+    private final RedisTemplate redisTemplate;
     private final WmTaskContentMapper wmTaskContentMapper;
     private final WmDaHospitalMapper wmDaHospitalMapper;
     private final WmTaskService wmTaskService;
@@ -76,7 +86,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
             newWmDaHospital = list.get(0);
         }
 
-        //服务药企
+        // 服务药企
         newWmDaHospital.setYymc(wmTaskContent.getTemp3());
         newWmDaHospital.setProvince(wmTaskContent.getTemp4().split(",")[0]);
         newWmDaHospital.setCity(wmTaskContent.getTemp4().split(",")[1]);
@@ -107,17 +117,69 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 
         log.info("数据库类型:{}", driverClassName);
         return "dm.jdbc.driver.DmDriver".equals(driverClassName)
-				? wmDaHospitalMapper.listByPointForDM(wmDaHospital)
-				: wmDaHospitalMapper.listByPoint(wmDaHospital);
+                // ? wmDaHospitalMapper.listByPointForDM(wmDaHospital)
+                ? this.listByPointForDM1(wmDaHospital)
+                : wmDaHospitalMapper.listByPoint(wmDaHospital);
     }
 
+
+    private List<WmDaHospital> listByPointForDM1(WmDaHospital wmDaHospital) {
+
+        if (StrUtil.isBlank(wmDaHospital.getLatitude()) || StrUtil.isBlank(wmDaHospital.getLongitude())) {
+            return Collections.emptyList();
+        }
+
+        double lng = Double.parseDouble(wmDaHospital.getLongitude());
+        double lat = Double.parseDouble(wmDaHospital.getLatitude());
+
+
+        Map<String, Double> maps = geoRadius(lng, lat);
+
+        if (CollUtil.isEmpty(maps)) {
+            return Collections.emptyList();
+        }
+
+        List<WmDaHospital> hospitals = this.listByIds(maps.keySet().stream().distinct().sorted().collect(Collectors.toList()));
+
+        if (CollUtil.isNotEmpty(hospitals)) {
+
+            hospitals.forEach(hospital -> {
+                hospital.setDistance(maps.get(hospital.getId()));
+            });
+
+        }
+        return hospitals;
+
+    }
+
+
+    private Map<String, Double> geoRadius(double lng, double lat) {
+        Circle circle = new Circle(lng, lat, Metrics.KILOMETERS.getMultiplier());
+        RedisGeoCommands.GeoRadiusCommandArgs args = RedisGeoCommands.GeoRadiusCommandArgs.newGeoRadiusArgs()
+                .includeDistance()
+                .includeCoordinates()
+                .sortAscending()
+                .limit(100);
+
+        GeoResults<RedisGeoCommands.GeoLocation<Object>> results = redisTemplate.opsForGeo().radius(CacheConstants.HOSPITAL_GEO_KEY, circle, args);
+
+        Map<String, Double> hIds = new LinkedHashMap<>();
+        results.forEach(g -> {
+            hIds.put(g.getContent().getName().toString(), g.getDistance().getValue());
+
+        });
+
+        return hIds;
+    }
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R approvalHospital(String taskId) {
         List<Map<String, String>> compareList = new ArrayList<>();
-        WmDaHospital wmDaHospital = new WmDaHospital();//系统数据
-        WmDaHospital newinfo = new WmDaHospital();//对比后数据
-        //获取任务信息
+        WmDaHospital wmDaHospital = new WmDaHospital();// 系统数据
+        WmDaHospital newinfo = new WmDaHospital();// 对比后数据
+        // 获取任务信息
         WmTask wmTask = wmTaskService.getById(taskId);
         if (null == wmTask) {
             return R.failed("未查询到调研信息");
@@ -129,10 +191,10 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         if (null == wmTaskContent) {
             return R.failed("调研信息为空");
         }
-        //Temp29对应医院ID
+        // Temp29对应医院ID
         Boolean exist = false;
         if (StringUtils.isNotEmpty(wmTaskContent.getTemp29())) {
-            //有医院id,获取医院信息
+            // 有医院id,获取医院信息
             wmDaHospital = this.getById(wmTaskContent.getTemp29());
             if (wmDaHospital != null) {
                 exist = true;
@@ -140,7 +202,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         }
 
         if (!exist && StringUtils.isNotEmpty(wmTaskContent.getTemp3())) {
-            //getTemp3 医院名称  防止新增任务后未审核前 医院存在
+            // getTemp3 医院名称  防止新增任务后未审核前 医院存在
             WmDaHospital query = new WmDaHospital();
             query.setDelFlag("0");
             query.setEnableFlag("0");
@@ -160,22 +222,22 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         }
 
         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");//信息不一致
+                wmTask.setCompareResult("2");// 信息不一致
             } else {
-                wmTask.setCompareResult("3");//信息一致
+                wmTask.setCompareResult("3");// 信息一致
             }
         } else {
-            wmTask.setCompareResult("1");//新增
-            //如果是新增，需要匹配原来的字段值
-            wmDaHospital.setYymc(wmTaskContent.getTemp3());//名称
-            wmDaHospital.setAddress(wmTaskContent.getTemp16());//详细地址
-            if (!StringUtil.isEmpty(wmTaskContent.getTemp4())) {//省市区
+            wmTask.setCompareResult("1");// 新增
+            // 如果是新增，需要匹配原来的字段值
+            wmDaHospital.setYymc(wmTaskContent.getTemp3());// 名称
+            wmDaHospital.setAddress(wmTaskContent.getTemp16());// 详细地址
+            if (!StringUtil.isEmpty(wmTaskContent.getTemp4())) {// 省市区
                 String[] citys = wmTaskContent.getTemp4().split("-");
                 if (citys.length == 3) {
                     wmDaHospital.setProvince(citys[0]);
@@ -192,39 +254,39 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
             }
 
             if (null != wmTaskContent.getTemp5()) {
-                //小程序端存的value,web存的label，需要匹配
+                // 小程序端存的value,web存的label，需要匹配
                 SysDictItem sysDictItemConn = new SysDictItem();
                 sysDictItemConn.setType("hospital_level");
                 List<SysDictItem> dictItems = sysDictItemService.list(new QueryWrapper<>(sysDictItemConn));
 
                 Map<String, String> partsMap = dictItems.stream().collect(Collectors.toMap(k -> k.getLabel(), k -> k.getValue()));
                 String value = partsMap.get(wmTaskContent.getTemp5());
-                wmDaHospital.setYygm(value == null ? wmTaskContent.getTemp5() : value);//医院规模
+                wmDaHospital.setYygm(value == null ? wmTaskContent.getTemp5() : value);// 医院规模
             }
 
             if (null != wmTaskContent.getTemp6()) {
-                //小程序端存的value,web存的label，需要匹配
+                // 小程序端存的value,web存的label，需要匹配
                 SysDictItem sysDictItemConn = new SysDictItem();
                 sysDictItemConn.setType("hospital_xz");
                 List<SysDictItem> dictItems = sysDictItemService.list(new QueryWrapper<>(sysDictItemConn));
 
                 Map<String, String> partsMap = dictItems.stream().collect(Collectors.toMap(k -> k.getLabel(), k -> k.getValue()));
                 String value = partsMap.get(wmTaskContent.getTemp6());
-                wmDaHospital.setYyxz(value == null ? wmTaskContent.getTemp6() : value);//医院性质
+                wmDaHospital.setYyxz(value == null ? wmTaskContent.getTemp6() : value);// 医院性质
             }
             if (null != wmTaskContent.getTemp22()) {
-                //小程序端存的value,web存的label，需要匹配
+                // 小程序端存的value,web存的label，需要匹配
                 SysDictItem sysDictItemConn = new SysDictItem();
                 sysDictItemConn.setType("hospital_cw");
                 List<SysDictItem> dictItems = sysDictItemService.list(new QueryWrapper<>(sysDictItemConn));
 
                 Map<String, String> partsMap = dictItems.stream().collect(Collectors.toMap(k -> k.getLabel(), k -> k.getValue()));
                 String value = partsMap.get(wmTaskContent.getTemp22());
-                wmDaHospital.setYbczs(value == null ? wmTaskContent.getTemp22() : value);//医院性质
+                wmDaHospital.setYbczs(value == null ? wmTaskContent.getTemp22() : value);// 医院性质
             }
-            wmDaHospital.setWebsite(wmTaskContent.getTemp8());//联系总机
-            //wmDaHospital.setYygm(wmTaskContent.getTemp5());//医院规模
-            //wmDaHospital.setYyxz(wmTaskContent.getTemp6());//医院性质
+            wmDaHospital.setWebsite(wmTaskContent.getTemp8());// 联系总机
+            // wmDaHospital.setYygm(wmTaskContent.getTemp5());//医院规模
+            // wmDaHospital.setYyxz(wmTaskContent.getTemp6());//医院性质
 //			wmDaHospital.setLxzj(wmTaskContent.getTemp7());//联系总机
 //			wmDaHospital.setGgyx(wmTaskContent.getTemp8());//公共邮箱
 //			wmDaHospital.setYzxm(wmTaskContent.getTemp10());//院长姓名
@@ -241,9 +303,9 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
             newinfo = wmDaHospital;
         }
         Map<String, Object> result = new HashMap();
-        result.put("compareList", compareList);//对比数据
-        result.put("info", wmDaHospital);//数据
-        result.put("newinfo", newinfo);//数据
+        result.put("compareList", compareList);// 对比数据
+        result.put("info", wmDaHospital);// 数据
+        result.put("newinfo", newinfo);// 数据
         result.put("wmTask", wmTask);
         result.put("wmTaskContent", wmTaskContent);
 
@@ -285,7 +347,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         }
 
         if (StringUtils.isNotBlank(wmTaskContent.getTemp5())) {
-            //小程序端存的不一定value或label,web存的label，需要匹配
+            // 小程序端存的不一定value或label,web存的label，需要匹配
             Map<String, String> map = compareDictItem("医院规模", wmDaHospital.getYygm(), wmTaskContent.getTemp5(), "hospital_level");
             if (null != map && !map.isEmpty()) {
                 resList.add(map);
@@ -293,7 +355,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
             }
         }
         if (StringUtils.isNotBlank(wmTaskContent.getTemp6())) {
-            //小程序端存的value,web存的label，需要匹配
+            // 小程序端存的value,web存的label，需要匹配
             Map<String, String> map = compareDictItem("医院性质", wmDaHospital.getYyxz(), wmTaskContent.getTemp6(), "hospital_xz");
             if (null != map && !map.isEmpty()) {
                 resList.add(map);
@@ -302,7 +364,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         }
 
         if (StringUtils.isNotBlank(wmTaskContent.getTemp22())) {
-            //小程序端存的value,web存的label，需要匹配
+            // 小程序端存的value,web存的label，需要匹配
             Map<String, String> map = compareDictItem("院病床总数（张）", wmDaHospital.getYbczs(), wmTaskContent.getTemp22(), "hospital_cw");
             if (null != map && !map.isEmpty()) {
                 resList.add(map);
@@ -405,8 +467,8 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         List<SysDictItem> dictItems = sysDictItemService.list(new QueryWrapper<>(sysDictItemConn));
         Map<String, String> partsMap = dictItems.stream().collect(Collectors.toMap(k -> k.getValue(), k -> k.getLabel()));
 
-        String value1 = partsMap.values().contains(str1) ? str1 : partsMap.get(str1);//系统数据
-        String value2 = partsMap.values().contains(str2) ? str2 : partsMap.get(str2);//调研数据
+        String value1 = partsMap.values().contains(str1) ? str1 : partsMap.get(str1);// 系统数据
+        String value2 = partsMap.values().contains(str2) ? str2 : partsMap.get(str2);// 调研数据
         value1 = (value1 == null ? str1 : value1);
         value2 = (value2 == null ? str2 : value2);
         if (StringUtil.isEmpty(value1)) {
@@ -484,7 +546,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R updateByApproval(Map<String, String> map) {
-        //先更新任务表
+        // 先更新任务表
         String taskId = map.get("taskId");
         WmTask wmTask = wmTaskService.getById(taskId);
         if (wmTask == null) {
@@ -493,7 +555,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         String approvalInfo = map.get("approvalInfo");
         String approvalOpinion = map.get("approvalOpinion");
         String compareResult = map.get("compareResult");
-        //更新时，同一个task_content_id和createtime下的数据，都要更新状态为已审核
+        // 更新时，同一个task_content_id和createtime下的数据，都要更新状态为已审核
 //		LambdaUpdateWrapper<WmTask> updateWrapper=new LambdaUpdateWrapper<WmTask>();
 //		updateWrapper.set(WmTask::getPlatAuditStatus,"1");
 //		updateWrapper.set(WmTask::getApprovalOpinion,approvalOpinion);
@@ -510,29 +572,29 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 
         WmDaHospital wmDaHospital = generateHospital(map);
 
-        if ("1".equals(approvalOpinion)) {//采纳
-            //updateWrapper.set(WmTask::getTaskStatus,"3");//审核通过
+        if ("1".equals(approvalOpinion)) {// 采纳
+            // updateWrapper.set(WmTask::getTaskStatus,"3");//审核通过
             // TODO 根据任务积分修改积分包状态
 
 //			updateWrapper.set(WmTask::getRealFlag,"0");//0通过
 //			updateTask.setRealFlag("0");
 
-            //更新审核信息
+            // 更新审核信息
             LocalDateTime now = LocalDateTime.now();
             Integer userId = SecurityUtils.getUser().getId();
-            if ("1".equals(compareResult)) {//新增
-                //新增
+            if ("1".equals(compareResult)) {// 新增
+                // 新增
                 wmDaHospital.setCreateTime(now);
                 wmDaHospital.setCreateUser(userId);
                 wmDaHospital.setLongitude(map.get("longitude"));
                 wmDaHospital.setLatitude(map.get("latitude"));
                 this.save(wmDaHospital);
-            } else if ("2".equals(compareResult)) {//信息不一致
+            } else if ("2".equals(compareResult)) {// 信息不一致
                 wmDaHospital.setUpdateTime(now);
                 wmDaHospital.setUpdateUser(userId);
                 this.updateById(wmDaHospital);
-            } else if ("3".equals(compareResult)) {//信息一致
-                //信息一致的情况下，只改地址
+            } else if ("3".equals(compareResult)) {// 信息一致
+                // 信息一致的情况下，只改地址
                 if (!StringUtil.isEmpty(map.get("address"))) {
                     WmDaHospital wmDaHospital1 = new WmDaHospital();
                     wmDaHospital1.setId(wmDaHospital.getId());
@@ -546,17 +608,17 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
             }
 
 
-            //更新任务内容表
+            // 更新任务内容表
             WmTaskContent wmTaskContent = wmTaskContentMapper.selectById(wmTask.getTaskContentId());
             String infoId = map.get("infoId");
             wmTaskContent.setTemp29(infoId);
             wmTaskContentMapper.updateById(wmTaskContent);
         } else {
-            //updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
+            // updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
 //			updateWrapper.set(WmTask::getRealFlag,"1");//1bu通过
 //			updateTask.setRealFlag("1");
         }
-        //提交
+        // 提交
 //		updateTask.setTaskStatus("2");
 //		LocalDateTime localDateTime = LocalDateTime.now();
 //		updateTask.setUpdateTime(localDateTime);
@@ -575,10 +637,10 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //		wmTaskService.updateById(updateTask);
 //		wmTaskService.update(updateWrapper);
 
-        //审核之后的操作 //采纳
+        // 审核之后的操作 //采纳
 //		if("1".equals(approvalOpinion)){
 //		}else {
-        //更新积分包状态
+        // 更新积分包状态
 
 //		WmScorePackageStatus query = new WmScorePackageStatus();
 //		query.setUserId(wmTask.getTaskUserId());
@@ -601,7 +663,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R updateByApprovalForManualOperation(Map<String, String> map) {
-        //先更新任务表
+        // 先更新任务表
         String taskId = map.get("taskId");
         WmTask wmTask = wmTaskService.getById(taskId);
         if (wmTask == null) {
@@ -610,7 +672,7 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         String approvalInfo = map.get("approvalInfo");
         String approvalOpinion = map.get("approvalOpinion");
         String compareResult = map.get("compareResult");
-        //更新时，同一个task_content_id和createtime下的数据，都要更新状态为已审核
+        // 更新时，同一个task_content_id和createtime下的数据，都要更新状态为已审核
 //		LambdaUpdateWrapper<WmTask> updateWrapper=new LambdaUpdateWrapper<WmTask>();
 //		updateWrapper.set(WmTask::getPlatAuditStatus,"1");
 //		updateWrapper.set(WmTask::getApprovalOpinion,approvalOpinion);
@@ -627,29 +689,29 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 
         WmDaHospital wmDaHospital = generateHospital(map);
 
-        if ("1".equals(approvalOpinion)) {//采纳
-            //updateWrapper.set(WmTask::getTaskStatus,"3");//审核通过
+        if ("1".equals(approvalOpinion)) {// 采纳
+            // updateWrapper.set(WmTask::getTaskStatus,"3");//审核通过
             // TODO 根据任务积分修改积分包状态
 
 //			updateWrapper.set(WmTask::getRealFlag,"0");//0通过
 //			updateTask.setRealFlag("0");
 
-            //更新审核信息
+            // 更新审核信息
             LocalDateTime now = LocalDateTime.now();
             Integer userId = SecurityUtils.getUser().getId();
-            if ("1".equals(compareResult)) {//新增
-                //新增
+            if ("1".equals(compareResult)) {// 新增
+                // 新增
                 wmDaHospital.setCreateTime(now);
                 wmDaHospital.setCreateUser(userId);
                 wmDaHospital.setLongitude(map.get("longitude"));
                 wmDaHospital.setLatitude(map.get("latitude"));
                 this.save(wmDaHospital);
-            } else if ("2".equals(compareResult)) {//信息不一致
+            } else if ("2".equals(compareResult)) {// 信息不一致
                 wmDaHospital.setUpdateTime(now);
                 wmDaHospital.setUpdateUser(userId);
                 this.updateById(wmDaHospital);
-            } else if ("3".equals(compareResult)) {//信息一致
-                //信息一致的情况下，只改地址
+            } else if ("3".equals(compareResult)) {// 信息一致
+                // 信息一致的情况下，只改地址
                 if (!StringUtil.isEmpty(map.get("address"))) {
                     WmDaHospital wmDaHospital1 = new WmDaHospital();
                     wmDaHospital1.setId(wmDaHospital.getId());
@@ -663,17 +725,17 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
             }
 
 
-            //更新任务内容表
+            // 更新任务内容表
             WmTaskContent wmTaskContent = wmTaskContentMapper.selectById(wmTask.getTaskContentId());
             String infoId = map.get("infoId");
             wmTaskContent.setTemp29(infoId);
             wmTaskContentMapper.updateById(wmTaskContent);
         } else {
-            //updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
+            // updateWrapper.set(WmTask::getTaskStatus,"2");//审核不通过
 //			updateWrapper.set(WmTask::getRealFlag,"1");//1bu通过
 //			updateTask.setRealFlag("1");
         }
-        //提交
+        // 提交
 //		updateTask.setTaskStatus("2");
         LocalDateTime localDateTime = LocalDateTime.now();
 //		updateTask.setUpdateTime(localDateTime);
@@ -692,10 +754,10 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //		wmTaskService.updateById(updateTask);
 //		wmTaskService.update(updateWrapper);
 
-        //审核之后的操作 //采纳
+        // 审核之后的操作 //采纳
 //		if("1".equals(approvalOpinion)){
 //		}else {
-        //更新积分包状态
+        // 更新积分包状态
 
         WmScorePackageStatus query = new WmScorePackageStatus();
         query.setUserId(wmTask.getTaskUserId());
@@ -727,11 +789,11 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
         wmDaHospital.setAddress(StringUtil.isBlank(map.get("address")) ? null : map.get("address"));
 
 
-        wmDaHospital.setYygm(StringUtil.isBlank(map.get("yygm")) ? null : map.get("yygm"));//医院规模
-        wmDaHospital.setYyxz(StringUtil.isBlank(map.get("yyxz")) ? null : map.get("yyxz"));//医院性质
+        wmDaHospital.setYygm(StringUtil.isBlank(map.get("yygm")) ? null : map.get("yygm"));// 医院规模
+        wmDaHospital.setYyxz(StringUtil.isBlank(map.get("yyxz")) ? null : map.get("yyxz"));// 医院性质
 
-        wmDaHospital.setWebsite(StringUtil.isBlank(map.get("website")) ? null : map.get("website"));//医院官网
-        wmDaHospital.setYbczs(StringUtil.isBlank(map.get("ybczs")) ? null : map.get("ybczs"));//院病床总数（张）
+        wmDaHospital.setWebsite(StringUtil.isBlank(map.get("website")) ? null : map.get("website"));// 医院官网
+        wmDaHospital.setYbczs(StringUtil.isBlank(map.get("ybczs")) ? null : map.get("ybczs"));// 院病床总数（张）
 
 
 //		wmDaHospital.setLxzj(StringUtil.isEmpty(map.get("lxzj"))?null:map.get("lxzj"));//联系总机
@@ -747,8 +809,8 @@ public class WmDaHospitalServiceImpl extends ServiceImpl<WmDaHospitalMapper, WmD
 //		wmDaHospital.setYbczs(StringUtil.isEmpty(map.get("ybczs"))?null:Integer.parseInt(map.get("ybczs")));//院病床总数（张）
 //		wmDaHospital.setZlghsy(StringUtil.isEmpty(map.get("zlghsy"))?null:map.get("zlghsy"));//主流供货商业
 
-        wmDaHospital.setLongitude(StringUtil.isBlank(map.get("longitude")) ? null : map.get("longitude"));//经度
-        wmDaHospital.setLatitude(StringUtil.isBlank(map.get("latitude")) ? null : map.get("latitude"));//经度
+        wmDaHospital.setLongitude(StringUtil.isBlank(map.get("longitude")) ? null : map.get("longitude"));// 经度
+        wmDaHospital.setLatitude(StringUtil.isBlank(map.get("latitude")) ? null : map.get("latitude"));// 经度
 
         return wmDaHospital;
     }