From 25b40f33de6455d026d750bafb7ed55e984eff39 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 18 Sep 2024 14:40:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8B=E8=BD=BD=E5=A4=84=E6=96=B9key?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E3=80=81=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicSkPrescribeController.java | 4 ++ .../collect/IoCollectOriginController.java | 47 ++++++++++++++----- .../req/basic/GetSickPrescribeRequest.java | 2 +- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java index 4b461b092..f993fff90 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java @@ -117,6 +117,10 @@ public class BasicSkPrescribeController extends BaseController { */ @PostMapping("/udiwms/basic/sk/prescribe/save") public BaseResponse sickerPrescribeSave(@RequestBody SickerPrescribeSaveRequest sickerPrescribeSaveRequest) { + String busType = sickerPrescribeSaveRequest.getBusType(); + if (StrUtil.isBlank(busType)) + return ResultVOUtils.error("请选择业务类型!"); + Integer stauts = sickerPrescribeSaveRequest.getStauts(); if (stauts == 1) { List list = sickerPrescribeSaveRequest.getList(); diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index 9ba849f6b..5b37aca65 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -5,12 +5,14 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.constant.BusTypeConstant; import com.glxp.api.controller.BaseController; import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderOrigin; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.basic.BasicCollectUserRequest; +import com.glxp.api.req.basic.GetSickPrescribeRequest; import com.glxp.api.req.basic.WorkBindBusTypeRequest; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; @@ -68,19 +70,38 @@ public class IoCollectOriginController extends BaseController { @PostMapping("/udiwms/basic/collect/origin/order/getThrOrderPage") public BaseResponse getThrOrders(@RequestBody CollectOrderRequest collectOrderRequest) { - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - filterThrOrderRequest.setLimit(collectOrderRequest.getLimit()); - filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo()); - filterThrOrderRequest.setThirdSys("thirdId"); - filterThrOrderRequest.setBusType(collectOrderRequest.getBusType()); - filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); - filterThrOrderRequest.setFromType(collectOrderRequest.getFromType()); - filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime()); - filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime()); - filterThrOrderRequest.setPage(collectOrderRequest.getPage()); - filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords()); - BaseResponse> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest); - return baseResponse; + String busType = collectOrderRequest.getBusType(); + if (StrUtil.isBlank(busType)) return ResultVOUtils.error("请选择业务类型!"); + + if (busType.equals(BusTypeConstant.YPCF002.getBusType())) { + GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); + getSickPrescribeRequest.setLimit(collectOrderRequest.getLimit()); + getSickPrescribeRequest.setCode(collectOrderRequest.getBillNo()); + getSickPrescribeRequest.setThirdSys("thirdId"); + getSickPrescribeRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); + getSickPrescribeRequest.setFromType(collectOrderRequest.getFromType()); + getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime()); + getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime()); + getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords()); + getSickPrescribeRequest.setPage(collectOrderRequest.getPage()); + BaseResponse> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest); + return baseResponse; + } else { + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + filterThrOrderRequest.setLimit(collectOrderRequest.getLimit()); + filterThrOrderRequest.setBillNo(collectOrderRequest.getBillNo()); + filterThrOrderRequest.setThirdSys("thirdId"); + filterThrOrderRequest.setBusType(collectOrderRequest.getBusType()); + filterThrOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode()); + filterThrOrderRequest.setFromType(collectOrderRequest.getFromType()); + filterThrOrderRequest.setStartTime(collectOrderRequest.getStartTime()); + filterThrOrderRequest.setEndTime(collectOrderRequest.getEndTime()); + filterThrOrderRequest.setPage(collectOrderRequest.getPage()); + filterThrOrderRequest.setKeyWords(collectOrderRequest.getKeyWords()); + BaseResponse> baseResponse = erpBasicClient.getThrOrders(filterThrOrderRequest); + return baseResponse; + } + } diff --git a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java index 99afe26ee..559aed630 100644 --- a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java @@ -14,7 +14,7 @@ public class GetSickPrescribeRequest extends ListPageRequest { private String startTime; private String endTime; private String thirdSys; - private String keyWords; + private String key; /** * 住院号（必传) */