皮试记录初期格式修改

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

@@ -2,6 +2,8 @@ package com.openhis.web.outpatientmanage.appservice;
 
 import java.util.List;
 
+import com.openhis.web.outpatientmanage.dto.OutpatientInfusionInitDto;
+import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestInitDto;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,15 +19,13 @@ import com.openhis.web.patientmanage.dto.PatientListDto;
  */
 public interface IOutpatientSkinTestRecordService {
 
-    /**
-     * 获取皮试项目检查状态列表
-     */
-    List<PatientListDto> getSkinTestStatus();
 
     /**
-     * 获取皮试结果列表
+     * 获取门诊皮试记录初期数据列表
+     *
+     * @return 获取门诊皮试记录初期数据列表
      */
-    List<PatientListDto> getSkinTestResult();
+    OutpatientSkinTestInitDto getOutpatientSkinTestInit();
 
     /**
      * 分页查询门诊皮试记录,可选条件
@@ -72,4 +72,5 @@ public interface IOutpatientSkinTestRecordService {
      */
     boolean nurseSignChkPs(OutpatientSkinTestRecordDto outpatientSkinTestRecordDto);
 
+
 }

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

@@ -4,9 +4,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
+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;
 
@@ -74,40 +78,27 @@ public class OutpatientSkinTestRecordServiceImpl implements IOutpatientSkinTestR
     @Autowired
     IServiceRequestService serviceRequestService;
 
-    /**
-     * 获取皮试项目检查状态列表
-     */
-    @Override
-    public List<PatientListDto> getSkinTestStatus() {
-        // 获取皮试状态列表
-        List<VerificationStatus> statusList = Arrays.asList(VerificationStatus.values());
-        List<PatientListDto> dtos = new ArrayList<>();
-        // 取得更新值
-        for (VerificationStatus status : statusList) {
-            PatientListDto dto = new PatientListDto();
-            dto.setValue(status.getValue());
-            dto.setInfo(status.getInfo());
-            dtos.add(dto);
-        }
-        return dtos;
-    }
 
     /**
-     * 获取皮试项目检查状态列表
+     * 获取门诊皮试记录初期数据列表
+     *
+     * @return 获取门诊皮试记录初期数据列表
      */
-    @Override
+    @Override public OutpatientSkinTestInitDto getOutpatientSkinTestInit() {
-    public List<PatientListDto> getSkinTestResult() {
+        OutpatientSkinTestInitDto initDto = new OutpatientSkinTestInitDto();
-        // 获取皮试状态列表
+        //获取皮试状态
-        List<ClinicalStatus> statusList = Arrays.asList(ClinicalStatus.values());
+        List<OutpatientInfusionInitDto.statusEnumOption> statusEnumOptions1 = Stream.of(VerificationStatus.values())
-        List<PatientListDto> dtos = new ArrayList<>();
+            .map(status -> new OutpatientInfusionInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-        // 取得更新值
+            .collect(Collectors.toList());
-        for (ClinicalStatus status : statusList) {
+        initDto.setVerificationStatus(statusEnumOptions1);
-            PatientListDto dto = new PatientListDto();
+
-            dto.setValue(status.getValue());
+        // 获取皮试结果
-            dto.setInfo(status.getInfo());
+        List<OutpatientInfusionInitDto.statusEnumOption> statusEnumOptions2 = Stream.of(ClinicalStatus.values())
-            dtos.add(dto);
+            .map(status -> new OutpatientInfusionInitDto.statusEnumOption(status.getValue(), status.getInfo()))
-        }
+            .collect(Collectors.toList());
-        return dtos;
+        initDto.setClinicalStatus(statusEnumOptions2);
+
+        return initDto;
     }
 
     /**

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

@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
  * @date 2025/3/5
  */
 @RestController
-@RequestMapping("/outpatientmanage")
+@RequestMapping("/outpatientmanage/skintest")
 @Slf4j
 @AllArgsConstructor
 public class OutpatientSkinTestRecordController {
@@ -29,22 +29,16 @@ public class OutpatientSkinTestRecordController {
     @Autowired
     private IOutpatientSkinTestRecordService OutpatientSkinTestRecordService;
 
-    /**
-     * 获取皮试项目检查状态列表
-     */
-    @GetMapping("/list-skinteststatus")
-    public R<?> getSkinTestStatus() {
-
-        return R.ok(OutpatientSkinTestRecordService.getSkinTestStatus());
-    }
 
     /**
-     * 获取皮试结果列表
+     * 门诊皮试记录初期数据
+     *
+     * @return
      */
-    @GetMapping("/list-skintestresult")
+    @GetMapping("/init")
-    public R<?> getSkinTestResult() {
+    public R<?> getOutpatientSkinTestInit() {
 
-        return R.ok(OutpatientSkinTestRecordService.getSkinTestResult());
+        return R.ok(OutpatientSkinTestRecordService.getOutpatientSkinTestInit());
     }
 
     /**

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

@@ -0,0 +1,36 @@
+package com.openhis.web.outpatientmanage.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 皮试初始化记录
+ *
+ * @author liuhr
+ * @date 2025/3/15
+ */
+@Data
+@Accessors(chain = true)
+public class OutpatientSkinTestInitDto {
+    //皮试检查项目状态
+    private List<OutpatientInfusionInitDto.statusEnumOption> VerificationStatus;
+    //皮试结果
+    private List<OutpatientInfusionInitDto.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;
+        }
+    }
+
+}