科室出库修改

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<BasicSkSickerEntity> list = ioDepartmentOrderService.getSkSickerList(filterSkSiackerListRequest);
+        List<IoOrderResponse> 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<BasicSkSickerEntity> 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) {
-        List<IoOrderResponse>list = ioDepartmentOrderService.getOrderListbyCode(adNum);
+        List<IoOrderResponse> list = ioDepartmentOrderService.getOrderListbyCode(adNum);
         return ResultVOUtils.success(list);
     }
 

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;
+
+
 }

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<String> sickerAdNums;
 }

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;
 }

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<IoOrderResponse> getOrderListbyCode(String adNum);
 
+    List<IoOrderResponse> getOrderListbyCodes(List<String> sickerAdNums);
+
     void addInfoSkSicker(AddSkSiackerListRequest addSkSiackerListRequest);
 
     void clickToTriggerbyCode(String adNum);

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) {
+//        if (filterSkSiackerListRequest.getPage() != null) {
-            int offset = (filterSkSiackerListRequest.getPage() - 1) * filterSkSiackerListRequest.getLimit();
+//            int offset = (filterSkSiackerListRequest.getPage() - 1) * filterSkSiackerListRequest.getLimit();
-            PageHelper.offsetPage(offset, filterSkSiackerListRequest.getLimit());
+//            PageHelper.offsetPage(offset, filterSkSiackerListRequest.getLimit());
-        }
+//        }
         List<BasicSkSickerEntity> data = skSickerMapper.getSkSickerList(filterSkSiackerListRequest);
         return data;
     }
@@ -64,19 +65,30 @@ public class IoDepartmentOrderServiceImpl implements IoDepartmentOrderService {
         return ioOrderDao.filterList(filterOrderRequest);
     }
 
+    @Override
+    public List<IoOrderResponse> getOrderListbyCodes(List<String> 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<BasicSkSickerEntity> qw = new QueryWrapper<>();
-        qw.eq("adNum",adNum);
+        qw.eq("adNum", adNum);
         List<BasicSkSickerEntity> 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<BasicSkSickerEntity> qw = new QueryWrapper<>();
-        qw.eq("adNum",adNum);
+        qw.eq("adNum", adNum);
         List<BasicSkSickerEntity> basicSkSickerEntities = skSickerMapper.selectList(qw);
-        if (CollectionUtil.isNotEmpty(basicSkSickerEntities)){
+        if (CollectionUtil.isNotEmpty(basicSkSickerEntities)) {
             String userId = customerService.getUserId() + "";
             Date date = new Date();
             for (BasicSkSickerEntity basicSkSickerEntity : basicSkSickerEntities) {

src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml

@@ -86,10 +86,15 @@
         <where>
             <if test="name != '' and name != null">
                 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}, '%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(updateTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
+                            date_format(#{endTime}, '%Y-%m-%d')
             </if>
         </where>
         order by basic_sk_sicker.updateTime desc
+        limit 0,20
     </select>
-
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -110,6 +110,14 @@
                     #{item}
                 </foreach>
             </if>
+
+            <if test="sickerAdNums != null and sickerAdNums.size() != 0">
+                AND io.sickerAdNum in
+                <foreach collection="sickerAdNums" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+
             <if test="dealStatuses != null and dealStatuses.size() != 0">
                 AND io.dealStatus in
                 <foreach collection="dealStatuses" index="index" item="item" open="(" close=")" separator=",">