From 4a9a15b9b0dbdafdf71ae8e074ce22e35f5b68eb Mon Sep 17 00:00:00 2001 From: fshenye <12345678> Date: Tue, 5 Jul 2022 16:18:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E9=A2=84=E7=BA=A6=E6=97=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B0=B1=E8=AF=8A=E5=8D=A1=E9=99=90=E5=88=B6=202.=20?= =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=8C=BB=E7=94=9F=E4=BF=A1=E6=81=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=AF=E9=A2=84=E7=BA=A6=E9=97=A8=E8=AF=8A=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mp/AppointmentController.java | 22 ++++++++++--------- .../service/impl/HpDeptInfoServiceImpl.java | 11 +++++++--- .../stc/sict/theme/hphy/vo/DeptDoctorsVO.java | 2 ++ .../stc/sict/theme/hphy/wd/WanDaConstant.java | 5 +++++ 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java index 820650e..81157a9 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/controller/mp/AppointmentController.java @@ -3,7 +3,6 @@ package cn.sh.stc.sict.theme.hphy.controller.mp; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.net.Ipv4Util; import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -18,13 +17,10 @@ import cn.sh.stc.sict.theme.hphy.service.*; import cn.sh.stc.sict.theme.hphy.wd.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.netty.util.internal.MacAddressUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import ma.glasnost.orika.MapperFactory; -import ma.glasnost.orika.impl.DefaultMapperFactory; import org.springframework.web.bind.annotation.*; /** @@ -71,15 +67,21 @@ public class AppointmentController { if (StrUtil.isBlank(order.getScheduleId()) || StrUtil.isBlank(order.getNumSourceId())) { return new R().error("预约排班号源信息不可为空！"); } -// HpHosInfo hos = hosInfoService.getById(order.getHosOrgCode()); -// if (null == hos) { -// return new R().error("未找到医院信息！"); -// } + HpHosInfo hos = hosInfoService.getById(order.getHosOrgCode()); + if (null == hos) { + return new R().error("未找到医院信息！"); + } HphyPatientBase patient = hphyPatientBaseService.getByOpenId(current.getOpenId()); if (null == patient) { return new R().error("未找到患者信息！"); } - if(WanDaConstant.ORDER_TYPE_OUTP.equals(order.getOrderType())){ + boolean isNullCard = (StrUtil.isBlank(order.getMediCardId()) || StrUtil.isBlank(order.getMediCardType())) + && StrUtil.isBlank(patient.getMediCardId()) || StrUtil.isBlank(patient.getMediCardType()); + // 有卡预约时检查就诊卡信息 + if (WanDaConstant.ORDER_MODEL_1.equals(hos.getOrderMode()) && isNullCard) { + return new R().error("请补充患者就诊卡信息！"); + } + if (WanDaConstant.ORDER_TYPE_OUTP.equals(order.getOrderType())) { HpDocInfo docInfo = hpDocInfoService.getById(order.getDoctorId()); if (null == docInfo) { return new R().error("未找到医生信息！"); @@ -92,7 +94,7 @@ public class AppointmentController { app.setHosOrgName(docInfo.getHosName()); app.setDeptName(docInfo.getDeptName()); app.setResourceName(docInfo.getResourceName()); - }else{ + } else { HpDeptInfo deptInfo = hpDeptInfoService.getById(order.getDeptId()); if (null == deptInfo) { return new R().error("未找到门诊信息！"); 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 11d27e9..00695a0 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 @@ -10,7 +10,7 @@ import cn.sh.stc.sict.theme.hphy.model.HpHosInfo; import cn.sh.stc.sict.theme.hphy.service.HpDeptInfoService; import cn.sh.stc.sict.theme.hphy.vo.DeptDoctorsVO; import cn.sh.stc.sict.theme.hphy.wd.DeptInfo; -import cn.sh.stc.sict.theme.hphy.wd.DoctInfo; +import cn.sh.stc.sict.theme.hphy.wd.OutPatInfo; import cn.sh.stc.sict.theme.hphy.wd.WanDaHttpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -62,9 +62,14 @@ public class HpDeptInfoServiceImpl extends ServiceImpl doctors = hpDocInfoMapper.selectList(docWrapper); // 查询可预约医生信息 + // DeptInfo info = new DeptInfo(); + // List resourceDoctInfo = WanDaHttpUtil.getResourceDoctInfo(info); DeptInfo info = new DeptInfo(); - List resourceDoctInfo = WanDaHttpUtil.getResourceDoctInfo(info); + info.setHosOrgCode(deptInfo.getHosOrgCode()); + info.setOneDeptCode(deptInfo.getOneDeptCode()); + info.setDeptCode(deptInfo.getDeptCode()); + List resourceOutPatInfo = WanDaHttpUtil.getResourceOutPatInfo(info); - return new DeptDoctorsVO(hosInfo, deptInfo, doctors); + return new DeptDoctorsVO(hosInfo, deptInfo, resourceOutPatInfo, doctors); } } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/vo/DeptDoctorsVO.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/vo/DeptDoctorsVO.java index 8276fe5..05a2955 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/vo/DeptDoctorsVO.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/vo/DeptDoctorsVO.java @@ -3,6 +3,7 @@ package cn.sh.stc.sict.theme.hphy.vo; import cn.sh.stc.sict.theme.hphy.model.HpDeptInfo; import cn.sh.stc.sict.theme.hphy.model.HpDocInfo; import cn.sh.stc.sict.theme.hphy.model.HpHosInfo; +import cn.sh.stc.sict.theme.hphy.wd.OutPatInfo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,5 +21,6 @@ import java.util.List; public class DeptDoctorsVO { private HpHosInfo hosInfo; private HpDeptInfo deptInfo; + private List resourceOutPatInfoList; private List doctors; } diff --git a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/wd/WanDaConstant.java b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/wd/WanDaConstant.java index af667bc..bb12b1e 100644 --- a/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/wd/WanDaConstant.java +++ b/smart-health-modules/theme-schema/src/main/java/cn/sh/stc/sict/theme/hphy/wd/WanDaConstant.java @@ -40,4 +40,9 @@ public class WanDaConstant { public static final String PATIENT_TYPE_NORMAL = "1"; public static final String CANCELOBJ_PATIENT = "1"; + + /** + * 医院预约方式：有卡预约 + */ + public static final String ORDER_MODEL_1 = "1"; } -- 2.22.0