From b75530da7737c3c45151b9fc083432db73564688 Mon Sep 17 00:00:00 2001 From: fshenye <12345678> Date: Thu, 28 Jul 2022 11:16:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=201.=20=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E7=A7=91=E5=AE=A4=E6=8E=92=E5=90=8D=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=202.=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E8=AF=8D=E4=BA=91=EF=BC=88=E8=AF=8A=E6=96=AD=EF=BC=8C=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=A3=80=E6=9F=A5=EF=BC=89=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=203.=20=E7=A7=91=E5=AE=A4=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E7=A7=91=E5=AE=A4=E6=8E=92=E5=90=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E9=97=A8=E8=AF=8A=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E6=9F=A5=E8=AF=A2=E4=B8=87?= =?UTF-8?q?=E8=BE=BE=E6=8E=A5=E5=8F=A3=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sh/stc/sict/theme/HyThemeApplication.java | 2 + .../HpgpDiagnosticExperienceController.java | 6 +- .../theme/hpgp/model/HpgpDepartmentRank.java | 20 +++++- .../hpgp/model/HpgpDiagnosticExperience.java | 3 + .../theme/hpgp/model/HpgpInspectionCheck.java | 3 + .../theme/hpgp/model/HpgpLabExperience.java | 1 + .../service/HpgpDepartmentRankService.java | 1 + .../impl/HpgpDepartmentRankServiceImpl.java | 37 ++++++++++ .../controller/mp/HpDeptInfoController.java | 33 +++++++-- .../hphy/controller/mp/WDController.java | 3 + .../stc/sict/theme/hphy/model/HpDeptInfo.java | 4 ++ .../theme/hphy/service/HpDeptInfoService.java | 2 + .../service/impl/HpDeptInfoServiceImpl.java | 67 ++++++++++++++++--- .../stc/sict/theme/hphy/wd/WanDaHttpUtil.java | 8 +-- .../mapper/hpgp/HpgpDepartmentRankMapper.xml | 2 +- 15 files changed, 170 insertions(+), 22 deletions(-) diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/HyThemeApplication.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/HyThemeApplication.java index ec88bab..da17bf0 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/HyThemeApplication.java +++ b/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 diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpDiagnosticExperienceController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpDiagnosticExperienceController.java index e7ce66d..30f9048 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/controller/mobile/HpgpDiagnosticExperienceController.java +++ b/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); } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDepartmentRank.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDepartmentRank.java index 73f0755..61a7f29 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDepartmentRank.java +++ b/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 { + private Integer id; //标准科室 @ApiModelProperty(hidden = false, value = "标准科室") private String standardDept; @@ -25,6 +26,9 @@ public class HpgpDepartmentRank extends Model { //医院名称 @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 { @ApiModelProperty(hidden = false, value = "科室排名") private Integer rankScore; - private String tag; + private String resourceOutPatInfo; + + private String resourceDoctInfo; + + + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDiagnosticExperience.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDiagnosticExperience.java index a55b2a8..1003515 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpDiagnosticExperience.java +++ b/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 { //医院名称 @ApiModelProperty(hidden = false, value = "医院名称") private String hospitalName; + + @ApiModelProperty(hidden = false, value = "一级科室代码") + private String oneDeptCode; //科室代码 @ApiModelProperty(hidden = false, value = "科室代码") private String deptCode; diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpInspectionCheck.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpInspectionCheck.java index 7211486..f4c47c2 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpInspectionCheck.java +++ b/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 { //医院名称 @ApiModelProperty(hidden = false, value = "医院名称") private String hospitalName; + + @ApiModelProperty(hidden = false, value = "一级科室代码") + private String oneDeptCode; //科室代码 @ApiModelProperty(hidden = false, value = "科室代码") private String deptCode; diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLabExperience.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLabExperience.java index 4376e86..2f38181 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/model/HpgpLabExperience.java +++ b/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 { private Integer id; private String hospCode; private String hospName; + private String oneDeptCode; private String deptCode; private String deptName; private String itemName; diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpDepartmentRankService.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpDepartmentRankService.java index 05b51a8..a886294 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/HpgpDepartmentRankService.java +++ b/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 { + void updateResource(); } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java index 1b20e69..22217a0 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hpgp/service/impl/HpgpDepartmentRankServiceImpl.java @@ -1,18 +1,55 @@ 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 implements HpgpDepartmentRankService { + @Override + public void updateResource() { + List 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 resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(deptInfo); + List 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); + } + } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HpDeptInfoController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HpDeptInfoController.java index ee3f9e9..4f6d31c 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HpDeptInfoController.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/HpDeptInfoController.java @@ -1,17 +1,20 @@ 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 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(); + } } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java index 593ff3a..32137ff 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/WDController.java +++ b/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 list = WanDaHttpUtil.getOrderNumInfo(numSourceInfo); + if(CollUtil.isEmpty(list)){ + return new R(); + } if(WanDaConstant.ORDER_TYPE_OUTP.equals(numSourceInfo.getOrderType())){ List result = list.stream().filter(i -> orderNumType.equals(i.getOrderNumType())).collect(Collectors.toList()); return new R(result); diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpDeptInfo.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpDeptInfo.java index 8990e66..a488e6a 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/model/HpDeptInfo.java +++ b/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 { @ApiModelProperty(hidden = false, value = "显示次序") private String indexNo; + private String resourceOutPatInfo; + + private String resourceDoctInfo; + /** * 获取主键值 diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/HpDeptInfoService.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/HpDeptInfoService.java index 4cd0a84..2371ab3 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/HpDeptInfoService.java +++ b/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 { * @return */ DeptDoctorsVO getDeptDoctors(String hospitalCode, String deptCode); + + void asyncUpdate(HpDeptInfo dept); } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/impl/HpDeptInfoServiceImpl.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/impl/HpDeptInfoServiceImpl.java index 0dfe947..f974b01 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/impl/HpDeptInfoServiceImpl.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/service/impl/HpDeptInfoServiceImpl.java @@ -1,9 +1,11 @@ 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 resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(deptInfo); + List 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 getRemainDoctList(List doctors, List resourceDoctInfo) { Map doctorMap = doctors.stream().collect(Collectors.groupingBy(HpDocInfo::getResourceCode, Collectors.collectingAndThen(Collectors.toList(), x -> x.get(0)))); List remainDoctors = new ArrayList<>(); @@ -97,12 +119,18 @@ public class HpDeptInfoServiceImpl extends ServiceImpl resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(info); // List resourceDoctInfo = WanDaHttpUtil.getResourceDoctInfo(info); // log.error("OutPatInfo = {}", JSONUtil.toJsonStr(resourceOutPatInfo)); @@ -117,9 +145,8 @@ public class HpDeptInfoServiceImpl extends ServiceImpl orderNumInfo = WanDaHttpUtil.getOrderNumInfo(numSourceInfo); // log.error("========================="); @@ -129,9 +156,9 @@ public class HpDeptInfoServiceImpl extends ServiceImpl oneDeptInfo = WanDaHttpUtil.getDeptInfoTop(hosInfo); +// log.error("oneDeptInfo = {}", JSONUtil.toJsonStr(oneDeptInfo)); +// DeptInfo deptInfo = new DeptInfo(); +// deptInfo.setHosOrgCode(orgCode); +// deptInfo.setOneDeptCode(oneDeptCode); +// List deptInfoTwo = WanDaHttpUtil.getDeptInfoTwo(deptInfo); +// log.error("deptInfoTwo = {}", JSONUtil.toJsonStr(deptInfoTwo)); +// deptInfo.setDeptCode(deptCode); +// List resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(deptInfo); +// log.error("resourceOutPatInfo = {}", JSONUtil.toJsonStr(resourceOutPatInfo)); +// List resourceDoctInfo = WanDaHttpUtil.getResourceDoctInfo(deptInfo); +// log.error("resourceDoctInfo = {}", JSONUtil.toJsonStr(resourceDoctInfo)); +// } } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/wd/WanDaHttpUtil.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/wd/WanDaHttpUtil.java index f9e701f..d48911d 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/wd/WanDaHttpUtil.java +++ b/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 getResourceOutPatInfo(DeptInfo deptInfo) { String xml = WanDaUtil.GetResourceOutPatInfoServiceXML(deptInfo); - + // log.error("xml = {}", xml); String body = HttpRequest.post(URL) .body(xml) .execute() diff --git a/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml b/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml index d1fe064..4f1a48f 100644 --- a/smart-health-modules/theme-schema/src/main/resources/mapper/hpgp/HpgpDepartmentRankMapper.xml +++ b/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} -- 2.22.0