From 5cc836547232d9dcb2aa391d00782cab1dc47583 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 12 Apr 2024 14:45:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=87=BA=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoDepartmentOrderController.java | 14 ++++++++- .../api/entity/basic/BasicSkSickerEntity.java | 8 +++++ .../api/req/inout/FilterOrderRequest.java | 2 ++ .../req/inout/FilterSkSiackerListRequest.java | 3 ++ .../inout/IoDepartmentOrderService.java | 3 ++ .../impl/IoDepartmentOrderServiceImpl.java | 30 +++++++++++++------ .../mapper/basic/BasicSkSickerMapper.xml | 9 ++++-- .../mybatis/mapper/inout/IoOrderDao.xml | 8 +++++ 8 files changed, 65 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoDepartmentOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoDepartmentOrderController.java index eb40494d8..5d81c1964 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoDepartmentOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoDepartmentOrderController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; @RestController public class IoDepartmentOrderController extends BaseController { @@ -32,6 +33,17 @@ public class IoDepartmentOrderController extends BaseController { @PostMapping("/udiwms/inout/ioDepartmentOrder/getSkSickerList") public BaseResponse getSkSickerList(@RequestBody FilterSkSiackerListRequest filterSkSiackerListRequest) { List list = ioDepartmentOrderService.getSkSickerList(filterSkSiackerListRequest); + List orderResponses = ioDepartmentOrderService.getOrderListbyCodes(list.stream() + .map(BasicSkSickerEntity::getAdNum) + .collect(Collectors.toList())); + for (BasicSkSickerEntity skSickerEntity : list) { + for (IoOrderResponse orderResponse : orderResponses) { + if (skSickerEntity.getAdNum().equals(orderResponse.getSickerAdNum())) { + skSickerEntity.setStatus(1); + break; + } + } + } PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } @@ -44,7 +56,7 @@ public class IoDepartmentOrderController extends BaseController { */ @GetMapping("/udiwms/inout/ioDepartmentOrder/getOrderListbyCode") public BaseResponse getOrderListbyCode(String adNum) { - Listlist = ioDepartmentOrderService.getOrderListbyCode(adNum); + List list = ioDepartmentOrderService.getOrderListbyCode(adNum); return ResultVOUtils.success(list); } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java index 2fb5918ce..2c52e47f6 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java @@ -181,4 +181,12 @@ public class BasicSkSickerEntity { @ApiModelProperty(value = "来源类型") private Integer sourceType; + /** + * 患者状态 1:未完成，2：已完成 + */ + @TableField(exist = false) + @ApiModelProperty(value = "状态") + private Integer status; + + } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 1f875ce64..3966a88e5 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -214,4 +214,6 @@ public class FilterOrderRequest extends ListPageRequest { private String fromPatientCode; private String sickerAdNum; + + private List sickerAdNums; } diff --git a/src/main/java/com/glxp/api/req/inout/FilterSkSiackerListRequest.java b/src/main/java/com/glxp/api/req/inout/FilterSkSiackerListRequest.java index 20ca3a114..7da26c9e2 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterSkSiackerListRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterSkSiackerListRequest.java @@ -10,4 +10,7 @@ public class FilterSkSiackerListRequest extends ListPageRequest { * 姓名/住院号 模糊查询 */ private String name; + + private String startTime; + private String endTime; } diff --git a/src/main/java/com/glxp/api/service/inout/IoDepartmentOrderService.java b/src/main/java/com/glxp/api/service/inout/IoDepartmentOrderService.java index f648be605..f6332728c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoDepartmentOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoDepartmentOrderService.java @@ -10,6 +10,7 @@ import java.util.List; public interface IoDepartmentOrderService { /** * 获取患者列表 + * * @param filterSkSiackerListRequest * @return */ @@ -17,6 +18,8 @@ public interface IoDepartmentOrderService { List getOrderListbyCode(String adNum); + List getOrderListbyCodes(List sickerAdNums); + void addInfoSkSicker(AddSkSiackerListRequest addSkSiackerListRequest); void clickToTriggerbyCode(String adNum); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java index 41b254f63..389bf9a7a 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.inout.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.IdUtil; @@ -45,10 +46,10 @@ public class IoDepartmentOrderServiceImpl implements IoDepartmentOrderService { if (filterSkSiackerListRequest == null) { return Collections.emptyList(); } - if (filterSkSiackerListRequest.getPage() != null) { - int offset = (filterSkSiackerListRequest.getPage() - 1) * filterSkSiackerListRequest.getLimit(); - PageHelper.offsetPage(offset, filterSkSiackerListRequest.getLimit()); - } +// if (filterSkSiackerListRequest.getPage() != null) { +// int offset = (filterSkSiackerListRequest.getPage() - 1) * filterSkSiackerListRequest.getLimit(); +// PageHelper.offsetPage(offset, filterSkSiackerListRequest.getLimit()); +// } List data = skSickerMapper.getSkSickerList(filterSkSiackerListRequest); return data; } @@ -64,19 +65,30 @@ public class IoDepartmentOrderServiceImpl implements IoDepartmentOrderService { return ioOrderDao.filterList(filterOrderRequest); } + @Override + public List getOrderListbyCodes(List sickerAdNums) { + if (CollUtil.isEmpty(sickerAdNums)) { + return Collections.emptyList(); + } + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setSickerAdNums(sickerAdNums); + filterOrderRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); + return ioOrderDao.filterList(filterOrderRequest); + } + @Override public void addInfoSkSicker(AddSkSiackerListRequest addSkSiackerListRequest) { //住院号 是否已存在 String adNum = addSkSiackerListRequest.getAdNum(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("adNum",adNum); + qw.eq("adNum", adNum); List basicSkSickerEntities = skSickerMapper.selectList(qw); if (CollectionUtil.isNotEmpty(basicSkSickerEntities)) { - throw new JsonException("住院号："+ adNum + "已存在! "); + throw new JsonException("住院号：" + adNum + "已存在! "); } BasicSkSickerEntity basicSkSickerEntity = new BasicSkSickerEntity(); - BeanUtils.copyProperties(addSkSiackerListRequest,basicSkSickerEntity); + BeanUtils.copyProperties(addSkSiackerListRequest, basicSkSickerEntity); basicSkSickerEntity.setCode(generateCode()); basicSkSickerEntity.setSourceType(2);//手动 Date date = new Date(); @@ -95,9 +107,9 @@ public class IoDepartmentOrderServiceImpl implements IoDepartmentOrderService { @Override public void clickToTriggerbyCode(String adNum) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("adNum",adNum); + qw.eq("adNum", adNum); List basicSkSickerEntities = skSickerMapper.selectList(qw); - if (CollectionUtil.isNotEmpty(basicSkSickerEntities)){ + if (CollectionUtil.isNotEmpty(basicSkSickerEntities)) { String userId = customerService.getUserId() + ""; Date date = new Date(); for (BasicSkSickerEntity basicSkSickerEntity : basicSkSickerEntities) { diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml index f9270a256..a92495a38 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml @@ -86,10 +86,15 @@ basic_sk_sicker.name LIKE concat('%', #{name}, '%') - OR basic_sk_sicker.adNum LIKE concat('%', #{name}, '%') + OR basic_sk_sicker.adNum LIKE concat('%', #{name}, '%') + OR basic_sk_sicker.code LIKE concat('%', #{name}, '%') + + + AND date_format(updateTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and + date_format(#{endTime}, '%Y-%m-%d') order by basic_sk_sicker.updateTime desc + limit 0,20 - diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 72556cc9a..5a3627059 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -110,6 +110,14 @@ #{item} + + + AND io.sickerAdNum in + + #{item} + + + AND io.dealStatus in