优化：

1. 替换科室排名表，添加字段
2. 替换词云（诊断，检验检查），添加字段
3. 科室信息，科室排名信息 添加门诊字段字段，并查询万达接口填充

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/HyThemeApplication.java

@@ -6,12 +6,14 @@ import cn.sh.stc.sict.cloud.common.swagger.annotation.EnableSictSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * @author F_xh
  */
+@EnableAsync
 @EnableCaching
 @EnableScheduling
 @EnableSictSwagger2

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpDiagnosticExperienceController.java

@@ -32,13 +32,13 @@ public class HpgpDiagnosticExperienceController extends ApiController {
      * 分页查询
      *
      * @param page                     分页对象
-     * @param hpgpDiagnosticExperience 黄浦全科导诊——诊断经验云词
+     * @param experience 黄浦全科导诊——诊断经验云词
      * @return
      */
     @ApiOperation("分页查询")
     @GetMapping("/page")
-    public R<?> getHpgpDiagnosticExperiencePage(Page page, HpgpDiagnosticExperience hpgpDiagnosticExperience) {
-        page = hpgpDiagnosticExperienceService.page(page, Wrappers.query(hpgpDiagnosticExperience));
+    public R<?> getHpgpDiagnosticExperiencePage(Page page, HpgpDiagnosticExperience experience) {
+        page = hpgpDiagnosticExperienceService.page(page, Wrappers.query(experience));
         return new R<>(page);
     }
 

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDepartmentRank.java

@@ -16,6 +16,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class HpgpDepartmentRank extends Model<HpgpDepartmentRank> {
+    private Integer id;
     //标准科室
     @ApiModelProperty(hidden = false, value = "标准科室")
     private String standardDept;
@@ -25,6 +26,9 @@ public class HpgpDepartmentRank extends Model<HpgpDepartmentRank> {
     //医院名称
     @ApiModelProperty(hidden = false, value = "医院名称")
     private String hospitalName;
+
+    @ApiModelProperty(hidden = false, value = "一级科室代码")
+    private String oneDeptCode;
     //科室代码
     @ApiModelProperty(hidden = false, value = "科室代码")
     private String deptCode;
@@ -35,5 +39,19 @@ public class HpgpDepartmentRank extends Model<HpgpDepartmentRank> {
     @ApiModelProperty(hidden = false, value = "科室排名")
     private Integer rankScore;
 
-    private String tag;
+    private String resourceOutPatInfo;
+
+    private String resourceDoctInfo;
+
+
+
+    /**
+     * 获取主键值
+     *
+     * @return 主键值
+     */
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
 }

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDiagnosticExperience.java

@@ -22,6 +22,9 @@ public class HpgpDiagnosticExperience extends Model<HpgpDiagnosticExperience> {
     //医院名称
     @ApiModelProperty(hidden = false, value = "医院名称")
     private String hospitalName;
+
+    @ApiModelProperty(hidden = false, value = "一级科室代码")
+    private String oneDeptCode;
     //科室代码
     @ApiModelProperty(hidden = false, value = "科室代码")
     private String deptCode;

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpInspectionCheck.java

@@ -22,6 +22,9 @@ public class HpgpInspectionCheck extends Model<HpgpInspectionCheck> {
     //医院名称
     @ApiModelProperty(hidden = false, value = "医院名称")
     private String hospitalName;
+
+    @ApiModelProperty(hidden = false, value = "一级科室代码")
+    private String oneDeptCode;
     //科室代码
     @ApiModelProperty(hidden = false, value = "科室代码")
     private String deptCode;

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLabExperience.java

@@ -19,6 +19,7 @@ public class HpgpLabExperience extends Model<HpgpLabExperience> {
     private Integer id;
     private String hospCode;
     private String hospName;
+    private String oneDeptCode;
     private String deptCode;
     private String deptName;
     private String itemName;

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpDepartmentRankService.java

@@ -11,4 +11,5 @@ import cn.sh.stc.sict.theme.hpgp.model.HpgpDepartmentRank;
  */
 public interface HpgpDepartmentRankService extends IService<HpgpDepartmentRank> {
 
+    void updateResource();
 }

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java

 package cn.sh.stc.sict.theme.hpgp.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
+import cn.sh.stc.sict.theme.hphy.wd.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.sh.stc.sict.theme.hpgp.dao.HpgpDepartmentRankMapper;
 import cn.sh.stc.sict.theme.hpgp.model.HpgpDepartmentRank;
 import cn.sh.stc.sict.theme.hpgp.service.HpgpDepartmentRankService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 黄浦全科导诊——科室排名(HpgpDepartmentRank)表服务实现类
  *
  * @author zhangly
  * @since 2022-01-14 09:56:47
  */
+@Slf4j
 @Service("hpgpDepartmentRankService")
 public class HpgpDepartmentRankServiceImpl extends ServiceImpl<HpgpDepartmentRankMapper, HpgpDepartmentRank> implements HpgpDepartmentRankService {
 
+    @Override
+    public void updateResource() {
+        List<HpgpDepartmentRank> deptList = this.list();
+        deptList.forEach(dept -> {
+            if (dept.getOneDeptCode().equals(dept.getDeptCode())) {
+                return;
+            }
+            this.asyncUpdateRank(dept);
+        });
+    }
+
+    @Async
+    void asyncUpdateRank(HpgpDepartmentRank dept) {
+        DeptInfo deptInfo = new DeptInfo();
+        deptInfo.setHosOrgCode(dept.getHospitalCode());
+        deptInfo.setOneDeptCode(dept.getOneDeptCode());
+        deptInfo.setDeptCode(dept.getDeptCode());
+        List<OutPatInfo> resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(deptInfo);
+        List<DoctInfo> resourceDoctInfo = WanDaHttpUtil.getResourceDoctInfo(deptInfo);
+        if (CollUtil.isEmpty(resourceDoctInfo) && CollUtil.isEmpty(resourceOutPatInfo)) {
+            return;
+        }
+        HpgpDepartmentRank update = new HpgpDepartmentRank();
+        update.setId(dept.getId());
+        update.setResourceDoctInfo(JSONUtil.toJsonStr(resourceDoctInfo));
+        update.setResourceOutPatInfo(JSONUtil.toJsonStr(resourceOutPatInfo));
+        this.updateById(update);
+    }
+
 }

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HpDeptInfoController.java

 package cn.sh.stc.sict.theme.hphy.controller.mp;
 
 
+import cn.hutool.core.util.StrUtil;
 import cn.sh.stc.sict.cloud.common.core.util.R;
+import cn.sh.stc.sict.theme.hpgp.model.HpgpDepartmentRank;
+import cn.sh.stc.sict.theme.hpgp.service.HpgpDepartmentRankService;
+import cn.sh.stc.sict.theme.hphy.model.HpDeptInfo;
 import cn.sh.stc.sict.theme.hphy.service.HpDeptInfoService;
 import com.baomidou.mybatisplus.extension.api.ApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * (HpDeptInfo)维护接口
@@ -28,6 +31,7 @@ public class HpDeptInfoController extends ApiController {
      * 服务对象
      */
     private final HpDeptInfoService hpDeptInfoService;
+    private final HpgpDepartmentRankService hpgpDepartmentRankService;
 
     @ApiOperation("科室医生查询接口")
     @GetMapping
@@ -35,4 +39,25 @@ public class HpDeptInfoController extends ApiController {
                                @ApiParam("科室代码") @RequestParam("deptCode") String deptCode){
         return new R<>(hpDeptInfoService.getDeptDoctors(hospitalCode, deptCode));
     }
+
+
+    @ApiOperation("更新科室号源信息")
+    @PostMapping("/wd/resource")
+    public R updateDeptResource(){
+        List<HpDeptInfo> deptList = hpDeptInfoService.list();
+        deptList.forEach(dept -> {
+            if (StrUtil.isEmpty(dept.getOneDeptCode())||StrUtil.isEmpty(dept.getDeptCode())) {
+                return;
+            }
+            hpDeptInfoService.asyncUpdate(dept);
+        });
+        return new R();
+    }
+
+    @ApiOperation("更新科室排行表号源信息")
+    @PostMapping("/rank/wd/resource")
+    public R updateRankDeptResource(){
+        hpgpDepartmentRankService.updateResource();
+        return new R();
+    }
 }

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java

@@ -80,6 +80,9 @@ public class WDController {
             numSourceInfo.setOrderNumType(null);
         }
         List<NumSourceInfo> list = WanDaHttpUtil.getOrderNumInfo(numSourceInfo);
+        if(CollUtil.isEmpty(list)){
+            return new R();
+        }
         if(WanDaConstant.ORDER_TYPE_OUTP.equals(numSourceInfo.getOrderType())){
             List<NumSourceInfo> result = list.stream().filter(i -> orderNumType.equals(i.getOrderNumType())).collect(Collectors.toList());
             return new R(result);

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpDeptInfo.java

@@ -43,6 +43,10 @@ public class HpDeptInfo extends Model<HpDeptInfo> {
     @ApiModelProperty(hidden = false, value = "显示次序")
     private String indexNo;
 
+    private String resourceOutPatInfo;
+
+    private String resourceDoctInfo;
+
 
     /**
      * 获取主键值

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/HpDeptInfoService.java

@@ -19,4 +19,6 @@ public interface HpDeptInfoService extends IService<HpDeptInfo> {
      * @return
      */
     DeptDoctorsVO getDeptDoctors(String hospitalCode, String deptCode);
+
+    void asyncUpdate(HpDeptInfo dept);
 }

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/impl/HpDeptInfoServiceImpl.java

 package cn.sh.stc.sict.theme.hphy.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONUtil;
+import cn.sh.stc.sict.theme.hpgp.model.HpgpDepartmentRank;
 import cn.sh.stc.sict.theme.hphy.constant.DataConstant;
 import cn.sh.stc.sict.theme.hphy.dao.HpDeptInfoMapper;
 import cn.sh.stc.sict.theme.hphy.dao.HpDocInfoMapper;
@@ -20,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -81,6 +84,25 @@ public class HpDeptInfoServiceImpl extends ServiceImpl<HpDeptInfoMapper, HpDeptI
         return new DeptDoctorsVO(hosInfo, deptInfo, resourceOutPatInfo, remainDoctors);
     }
 
+    @Async
+    @Override
+    public void asyncUpdate(HpDeptInfo dept) {
+        DeptInfo deptInfo = new DeptInfo();
+        deptInfo.setHosOrgCode(dept.getHosOrgCode());
+        deptInfo.setOneDeptCode(dept.getOneDeptCode());
+        deptInfo.setDeptCode(dept.getDeptCode());
+        List<OutPatInfo> resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(deptInfo);
+        List<DoctInfo> resourceDoctInfo = WanDaHttpUtil.getResourceDoctInfo(deptInfo);
+        if (CollUtil.isEmpty(resourceDoctInfo) && CollUtil.isEmpty(resourceOutPatInfo)) {
+            return;
+        }
+        HpDeptInfo update = new HpDeptInfo();
+        update.setId(dept.getId());
+        update.setResourceDoctInfo(JSONUtil.toJsonStr(resourceDoctInfo));
+        update.setResourceOutPatInfo(JSONUtil.toJsonStr(resourceOutPatInfo));
+        this.updateById(update);
+    }
+
     private List<HpDocInfo> getRemainDoctList(List<HpDocInfo> doctors, List<DoctInfo> resourceDoctInfo) {
         Map<String, HpDocInfo> doctorMap = doctors.stream().collect(Collectors.groupingBy(HpDocInfo::getResourceCode, Collectors.collectingAndThen(Collectors.toList(), x -> x.get(0))));
         List<HpDocInfo> remainDoctors = new ArrayList<>();
@@ -97,12 +119,18 @@ public class HpDeptInfoServiceImpl extends ServiceImpl<HpDeptInfoMapper, HpDeptI
         return remainDoctors;
     }
 
+    /**
+     * 消化内科	42503527600	上海市瑞金医院卢湾分院	1013	3122	消化科	1	1013	3122
+     * 消化内科	Y0180100700	上海交通大学医学院附属第九人民医院黄浦分院	293	3	消化内科	2	293	3
+     * 消化内科	42502763900	黄浦区肿瘤防治院	10	0002	消化专科	3	10	0002
+     * @param args
+     */
 //    public static void main(String[] args) {
 //
 //        DeptInfo info = new DeptInfo();
-//        info.setHosOrgCode("42503527600");
-//        info.setOneDeptCode("1013");
-//        info.setDeptCode("3122");
+//        info.setHosOrgCode("Y0180100700");
+//        info.setOneDeptCode("293");
+//        info.setDeptCode("3");
 //        List<OutPatInfo> resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(info);
 //        List<DoctInfo> resourceDoctInfo = WanDaHttpUtil.getResourceDoctInfo(info);
 //        log.error("OutPatInfo = {}", JSONUtil.toJsonStr(resourceOutPatInfo));
@@ -117,9 +145,8 @@ public class HpDeptInfoServiceImpl extends ServiceImpl<HpDeptInfoMapper, HpDeptI
 //        numSourceInfo.setOrderType(WanDaConstant.ORDER_TYPE_OUTP);
 //        numSourceInfo.setResourceCode(doctInfo.getResourceCode());
 //        numSourceInfo.setPatient_type(WanDaConstant.PATIENT_TYPE_NORMAL);
-//        numSourceInfo.setStartTime("2022-07-15");
-//        numSourceInfo.setEndTime("2022-07-22");
-//        numSourceInfo.setOrderNumType("102");
+//        numSourceInfo.setStartTime("2022-07-25");
+//        numSourceInfo.setEndTime("2022-08-08");
 //
 //        List<NumSourceInfo> orderNumInfo = WanDaHttpUtil.getOrderNumInfo(numSourceInfo);
 //        log.error("=========================");
@@ -129,9 +156,9 @@ public class HpDeptInfoServiceImpl extends ServiceImpl<HpDeptInfoMapper, HpDeptI
 
 //    public static void main(String[] args) {
 //        NumSourceInfo numSourceInfo = new NumSourceInfo();
-//        numSourceInfo.setHosOrgCode("42503527600");
-//        numSourceInfo.setOneDeptCode("1013");
-//        numSourceInfo.setDeptCode("3122");
+//        numSourceInfo.setHosOrgCode("Y0180100700");
+//        numSourceInfo.setOneDeptCode("293");
+//        numSourceInfo.setDeptCode("3");
 //        numSourceInfo.setOrderType(WanDaConstant.ORDER_TYPE_OUTP);
 //        numSourceInfo.setResourceCode("10220");
 //        numSourceInfo.setPatient_type(WanDaConstant.PATIENT_TYPE_NORMAL);
@@ -151,4 +178,26 @@ public class HpDeptInfoServiceImpl extends ServiceImpl<HpDeptInfoMapper, HpDeptI
 //            log.error("list = {}", JSONUtil.toJsonStr(list));
 //        }
 //    }
+
+
+//    public static void main(String[] args) {
+//        String orgCode = "E7880343800";
+//        String oneDeptCode = "03";
+//        String deptCode = "4023";
+//
+//        HosInfo hosInfo = new HosInfo();
+//        hosInfo.setHosOrgCode(orgCode);
+//        List<DeptInfo> oneDeptInfo = WanDaHttpUtil.getDeptInfoTop(hosInfo);
+//        log.error("oneDeptInfo = {}", JSONUtil.toJsonStr(oneDeptInfo));
+//        DeptInfo deptInfo = new DeptInfo();
+//        deptInfo.setHosOrgCode(orgCode);
+//        deptInfo.setOneDeptCode(oneDeptCode);
+//        List<DeptInfo> deptInfoTwo = WanDaHttpUtil.getDeptInfoTwo(deptInfo);
+//        log.error("deptInfoTwo = {}", JSONUtil.toJsonStr(deptInfoTwo));
+//        deptInfo.setDeptCode(deptCode);
+//        List<OutPatInfo> resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(deptInfo);
+//        log.error("resourceOutPatInfo = {}", JSONUtil.toJsonStr(resourceOutPatInfo));
+//        List<DoctInfo> resourceDoctInfo = WanDaHttpUtil.getResourceDoctInfo(deptInfo);
+//        log.error("resourceDoctInfo = {}", JSONUtil.toJsonStr(resourceDoctInfo));
+//    }
 }

smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/wd/WanDaHttpUtil.java

@@ -116,7 +116,7 @@ public class WanDaHttpUtil {
             log.error("获取一级科室信息失败");
             return null;
         }
-        log.info("获取一级科室信息：body = {}", body);
+        // log.info("获取一级科室信息：body = {}", body);
         String returnXml = getReturn(body, "GetDeptInfoTopService");
         return serialDeptInfos(returnXml);
     }
@@ -139,7 +139,7 @@ public class WanDaHttpUtil {
             log.error("获取二级科室信息失败");
             return null;
         }
-        log.info("获取二级科室信息：body = {}", body);
+        // log.info("获取二级科室信息：body = {}", body);
         String returnXml = getReturn(body, "GetDeptInfoTwoService");
         return serialDeptInfos(returnXml);
     }
@@ -426,7 +426,7 @@ public class WanDaHttpUtil {
             log.error("获取可预约医生信息 失败");
             return null;
         }
-        log.info("获取可预约医生信息：body = {}", body);
+        // log.info("获取可预约医生信息：body = {}", body);
         String returnXml = getReturn(body, "GetResourceDoctInfoService");
         return serialDoctInfo(returnXml);
     }
@@ -439,7 +439,7 @@ public class WanDaHttpUtil {
      */
     public List<OutPatInfo> getResourceOutPatInfo(DeptInfo deptInfo) {
         String xml = WanDaUtil.GetResourceOutPatInfoServiceXML(deptInfo);
-
+        // log.error("xml = {}", xml);
         String body = HttpRequest.post(URL)
                 .body(xml)
                 .execute()

smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml

@@ -23,7 +23,7 @@
                d.one_dept_code oneDeptCode,
                d.dept_code subDeptCode
         from hpgp_department_rank dr
-            left join hp_dept_info d on (dr.hospital_code = d.hos_org_code and dr.dept_code = d.dept_code)
+            join hp_dept_info d on (dr.hospital_code = d.hos_org_code and dr.one_dept_code = d.one_dept_code and dr.dept_code = d.dept_code)
         where dr.standard_dept = #{deptName}
         order by dr.rank_score asc
         limit #{size}