From 1895ebc6d29ba2d226e4a4f0483347b2b7d4bba2 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 18 Mar 2026 17:07:18 +0800 Subject: [PATCH] =?UTF-8?q?=20=E5=AF=B9=E5=A4=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=8D=AF=E6=B6=B2=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/open/controller/OpenController.java | 10 +++++++ .../com/op/open/domain/MedicationOrder.java | 30 +++++++++++++++++++ .../op/open/domain/MedicationOrderDetail.java | 23 ++++++++++++++ .../java/com/op/open/mapper/OpenMapper.java | 7 +++++ .../java/com/op/open/service/OpenService.java | 3 ++ .../op/open/service/impl/OpenServiceImpl.java | 23 ++++++++++++++ .../op-open/src/main/resources/bootstrap.yml | 4 +-- .../main/resources/mapper/open/OpenMapper.xml | 24 +++++++++++++++ 8 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrder.java create mode 100644 op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrderDetail.java diff --git a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java index cdac6a16c..cbaf3f6f1 100644 --- a/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java +++ b/op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java @@ -8,6 +8,7 @@ import com.op.common.core.utils.StringUtils; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.datasource.creator.DynamicDatasourceCreator; +import com.op.open.domain.MedicationOrder; import com.op.open.hr.domain.HrQuery; import com.op.open.nhApi.domain.NhQuery; import com.op.open.service.OpenService; @@ -320,4 +321,13 @@ public class OpenController extends BaseController { public AjaxResult getClassInfoListByCheckType(String checkType) { return openService.getClassInfoListByCheckType(checkType); } + + /** + * 对外查询药液订单接口 + * **/ + @GetMapping("/getMedicationOrder") + public AjaxResult getMedicationOrder(MedicationOrder order) { + return AjaxResult.success(openService.getMedicationOrder(order)); + } + } diff --git a/op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrder.java b/op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrder.java new file mode 100644 index 000000000..54ac8294e --- /dev/null +++ b/op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrder.java @@ -0,0 +1,30 @@ +package com.op.open.domain; + +import lombok.Data; + +import java.util.List; + +/** + * remark + * + * @author 019117 + * @date + */ +@Data +public class MedicationOrder { + + private String orderCode; + + private String materialCode; + + private String materialName; + + private String amount; + + private String unit; + + private String productDate; + + private List list; + +} diff --git a/op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrderDetail.java b/op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrderDetail.java new file mode 100644 index 000000000..7c4e21430 --- /dev/null +++ b/op-modules/op-open/src/main/java/com/op/open/domain/MedicationOrderDetail.java @@ -0,0 +1,23 @@ +package com.op.open.domain; + +import lombok.Data; + +/** + * remark + * + * @author 019117 + * @date + */ +@Data +public class MedicationOrderDetail { + + private String materialCode; + + private String materialName; + + private String amount; + + private String unit; + + +} diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java index ac3fe37e7..08b3d84a6 100644 --- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java +++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java @@ -4,6 +4,8 @@ package com.op.open.mapper; import com.op.open.domain.EquEquipmentBo; import com.op.open.domain.EquRepairWorkOrderBo; +import com.op.open.domain.MedicationOrder; +import com.op.open.domain.MedicationOrderDetail; import com.op.system.api.domain.SysNoticeGroup; import com.op.system.api.domain.SysSapLog; import com.op.system.api.domain.device.DeviceRepairOrder; @@ -119,5 +121,10 @@ public interface OpenMapper { // int updateEquBatchs(@Param("list") List updates); // // int addEquBatchs(@Param("list") List everyList); + + MedicationOrder getMedicationOrder(MedicationOrder order); + + List getMedicationOrderDetail(MedicationOrder order); + } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java index 8a5de1aee..4612148f2 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/OpenService.java @@ -1,6 +1,7 @@ package com.op.open.service; import com.op.common.core.web.domain.AjaxResult; +import com.op.open.domain.MedicationOrder; import com.op.open.hr.domain.HrQuery; import com.op.open.nhApi.domain.NhQuery; import com.op.system.api.domain.device.EquEquipmentDTO; @@ -61,4 +62,6 @@ public interface OpenService { AjaxResult getAttRecord(HrQuery paramMap); AjaxResult getClassInfoListByCheckType(String checkType); + + MedicationOrder getMedicationOrder(MedicationOrder order); } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index cb931b235..e44cd1283 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -3,6 +3,7 @@ package com.op.open.service.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.constant.Constants; import com.op.common.core.utils.DateUtils; @@ -16,6 +17,8 @@ import com.op.common.security.utils.SecurityUtils; import com.op.open.domain.EquEquipmentBo; import com.op.open.domain.EquRepairWorkOrderBo; +import com.op.open.domain.MedicationOrder; +import com.op.open.domain.MedicationOrderDetail; import com.op.open.hr.HrApi; import com.op.open.hr.domain.HrQuery; import com.op.open.mapper.OpenMapper; @@ -1079,4 +1082,24 @@ public class OpenServiceImpl implements OpenService { } } + + @Override + @DS("#header.poolName") + public MedicationOrder getMedicationOrder(MedicationOrder order) { + + if (StringUtils.isBlank(order.getOrderCode())){ + throw new RuntimeException("订单号不能为空"); + } + + MedicationOrder medicationOrder = openMapper.getMedicationOrder(order); + + if (medicationOrder == null){ + throw new RuntimeException("订单不存在"); + } + + List details = openMapper.getMedicationOrderDetail(order); + medicationOrder.setList(details); + + return medicationOrder; + } } diff --git a/op-modules/op-open/src/main/resources/bootstrap.yml b/op-modules/op-open/src/main/resources/bootstrap.yml index 2f72dde4c..034c12d0c 100644 --- a/op-modules/op-open/src/main/resources/bootstrap.yml +++ b/op-modules/op-open/src/main/resources/bootstrap.yml @@ -15,13 +15,13 @@ spring: discovery: #命名空间 namespace: lanju-op-test - group: test + group: fcd # 服务注册地址 server-addr: 192.168.202.20:8848 config: #命名空间 namespace: lanju-op-test - group: test + group: fcd # 服务注册地址 server-addr: 192.168.202.20:8848 # 配置文件格式 diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index b9dce7d87..99c7ee25b 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -635,4 +635,28 @@ order by sort + + + + +