门诊输液 up

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientInfusionRecordService.java

@@ -3,7 +3,6 @@ package com.openhis.web.outpatientmanage.appservice;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionInitDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionSearchParam;
@@ -16,13 +15,6 @@ import com.openhis.web.outpatientmanage.dto.OutpatientInfusionSearchParam;
  */
 public interface IOutpatientInfusionRecordService {
 
-    /**
-     * 获取门诊输液记录初期数据列表
-     *
-     * @return 门诊输液记录初期数据列表
-     */
-    OutpatientInfusionInitDto getOutpatientInfusionInit();
-
     /**
      * 获取门诊输液记录的患者列表
      *
@@ -31,14 +23,14 @@ public interface IOutpatientInfusionRecordService {
      * @param pageSize 每页多少条
      * @return 分页查询
      */
-    IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatient(
+    IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(
         OutpatientInfusionSearchParam outpatientInfusionSearchParam, Integer pageNo, Integer pageSize);
 
     /**
-     * 查询门诊输液的患者列表
+     * 点击患者，执行该患者的输液记录
      *
      * @param outpatientInfusionPatientDto 患者输液信息
-     * @return 门诊输液的患者列表
+     * @return 当前患者门诊输液待执行列表
      */
     List<OutpatientInfusionRecordDto>
         getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto);

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientInfusionRecordServiceImpl.java

@@ -3,7 +3,6 @@ package com.openhis.web.outpatientmanage.appservice.impl;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.annotation.Resource;
 
@@ -32,7 +31,6 @@ import com.openhis.common.enums.Whether;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
 import com.openhis.web.outpatientmanage.appservice.IOutpatientInfusionRecordService;
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionInitDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionSearchParam;
@@ -66,24 +64,6 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
     @Autowired
     ServiceRequestMapper serviceRequestMapper;
 
-    /**
-     * 获取门诊输液记录初期数据列表
-     *
-     * @return 门诊输液记录初期数据列表
-     */
-    @Override
-    public OutpatientInfusionInitDto getOutpatientInfusionInit() {
-        OutpatientInfusionInitDto initDto = new OutpatientInfusionInitDto();
-
-        // 获取皮试结果
-        List<OutpatientInfusionInitDto.statusEnumOption> statusEnumOptions = Stream.of(ClinicalStatus.values())
-            .map(status -> new OutpatientInfusionInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-            .collect(Collectors.toList());
-        initDto.setClinicalStatus(statusEnumOptions);
-
-        return initDto;
-    }
-
     /**
      * 获取门诊输液记录的患者列表
      *
@@ -93,7 +73,7 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
      * @return 分页查询
      */
     @Override
-    public IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatient(
+    public IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(
         OutpatientInfusionSearchParam outpatientInfusionSearchParam, Integer pageNo, Integer pageSize) {
 
         LocalDateTime beginTime;
@@ -145,10 +125,10 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
     }
 
     /**
-     * 查询单个患者门诊输液待执行记录
+     * 点击患者，执行该患者的输液记录
      *
      * @param outpatientInfusionPatientDto 患者输液信息
-     * @return 患者待输液记录列表
+     * @return 当前患者门诊输液待执行列表
      */
     @Override
     public List<OutpatientInfusionRecordDto>
@@ -293,7 +273,8 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
      * @return 门诊输液执行记录查询
      */
     @Override
-    public List<OutpatientInfusionRecordDto> getPatientInfusionPerformRecord(String beginTime, String endTime,boolean historyFlag) {
+    public List<OutpatientInfusionRecordDto> getPatientInfusionPerformRecord(String beginTime, String endTime,
+        boolean historyFlag) {
 
         LocalDateTime beginDateTime;
         LocalDateTime endDateTime;
@@ -308,15 +289,15 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
 
         // 创建查询包装器
         LambdaQueryWrapper<OutpatientInfusionRecordDto> queryWrapper = new LambdaQueryWrapper<>();
-        //执行历史查询的条件
-        if(historyFlag){
+        // 执行历史查询的条件
+        if (historyFlag) {
             // based_on_id 不为空，此条件筛选出执行履历
             queryWrapper.isNotNull(OutpatientInfusionRecordDto::getBasedOnId);
             // 状态是已完成
             queryWrapper.eq(OutpatientInfusionRecordDto::getRequestStatus, EventStatus.COMPLETED.getValue());
 
-            //门诊输液待执行记录查询
-        }else{
+            // 门诊输液待执行记录查询
+        } else {
             // based_on_id 为空，此条件筛选控制不显示执行履历
             queryWrapper.isNull(OutpatientInfusionRecordDto::getBasedOnId);
             // 状态是进行中

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java

@@ -7,7 +7,6 @@ import java.util.stream.Stream;
 
 import javax.annotation.Resource;
 
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionInitDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestInitDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java

@@ -12,6 +12,7 @@ import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.web.outpatientmanage.appservice.IOutpatientInfusionRecordService;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
 import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientInfusionSearchParam;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,23 +33,27 @@ public class OutpatientInfusionRecordController {
     IOutpatientInfusionRecordService outpatientInfusionRecordService;
 
     /**
-     * 门诊输液记录初期数据
+     * 查询门诊输液的患者列表
      *
-     * @return
+     * @param outpatientInfusionSearchParam 查询参数
+     * @return 门诊输液的患者列表
      */
-    @GetMapping("/init")
-    public R<?> getOutpatientInfusionInit() {
+    @GetMapping(value = "/infusion-patient-list")
+    public R<?> getPatientInfusionRecord(OutpatientInfusionSearchParam outpatientInfusionSearchParam,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
 
-        return R.ok(outpatientInfusionRecordService.getOutpatientInfusionInit());
+        return R.ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(outpatientInfusionSearchParam,
+            pageNo, pageSize));
     }
 
     /**
-     * 查询门诊输液的患者列表
+     * 点击患者，执行该患者的输液记录
      *
      * @param outpatientInfusionPatientDto 患者输液信息
-     * @return 门诊输液的患者列表
+     * @return 当前患者门诊输液待执行列表
      */
-    @GetMapping(value = "/patient-infusion")
+    @GetMapping(value = "/patient-infusion-record")
     public R<?> getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto) {
 
         return R.ok(outpatientInfusionRecordService.getPatientInfusionRecord(outpatientInfusionPatientDto));

openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientInfusionInitDto.java

@@ -1,37 +0,0 @@
-package com.openhis.web.outpatientmanage.dto;
-
-import com.openhis.common.enums.ClinicalStatus;
-import com.openhis.web.datadictionary.dto.DiagnosisTreatmentInitDto;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 门诊输液初期查询
- *
- * @author liuhr
- * @date 2025/3/12
- */
-@Data
-@Accessors(chain = true)
-public class OutpatientInfusionInitDto {
-
-    //皮试结果
-    private List<statusEnumOption>  clinicalStatus;
-
-    /**
-     * 状态
-     */
-    @Data
-    public static class statusEnumOption {
-        private Integer value;
-        private String info;
-
-        public statusEnumOption(Integer value, String info) {
-            this.value = value;
-            this.info = info;
-        }
-    }
-
-}

openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInfoInitDto.java

@@ -1,6 +1,5 @@
 package com.openhis.web.patientmanage.dto;
 
-import com.openhis.web.outpatientmanage.dto.OutpatientInfusionInitDto;
 import lombok.Data;
 import lombok.experimental.Accessors;