wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

皮试记录初期格式修改

Browse Source
This commit is contained in:
liuhongrui
2025-03-15 14:48:21 +08:00
parent f636b9663f
commit 48dfed2808
4 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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
public List<PatientListDto> getSkinTestResult() {
// 获取皮试状态列表
List<ClinicalStatus> statusList = Arrays.asList(ClinicalStatus.values());
List<PatientListDto> dtos = new ArrayList<>();
// 取得更新值
for (ClinicalStatus status : statusList) {
PatientListDto dto = new PatientListDto();
dto.setValue(status.getValue());
dto.setInfo(status.getInfo());
dtos.add(dto);
}
return dtos;
@Override public OutpatientSkinTestInitDto getOutpatientSkinTestInit() {
OutpatientSkinTestInitDto initDto = new OutpatientSkinTestInitDto();
//获取皮试状态
List<OutpatientInfusionInitDto.statusEnumOption> statusEnumOptions1 = Stream.of(VerificationStatus.values())
.map(status -> new OutpatientInfusionInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
initDto.setVerificationStatus(statusEnumOptions1);
// 获取皮试结果
List<OutpatientInfusionInitDto.statusEnumOption> statusEnumOptions2 = Stream.of(ClinicalStatus.values())
.map(status -> new OutpatientInfusionInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
initDto.setClinicalStatus(statusEnumOptions2);
return initDto;
}
/**

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

@@ -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")
public R<?> getSkinTestResult() {
@GetMapping("/init")
public R<?> getOutpatientSkinTestInit() {
return R.ok(OutpatientSkinTestRecordService.getSkinTestResult());
return R.ok(OutpatientSkinTestRecordService.getOutpatientSkinTestInit());
}
/**

36
openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestInitDto.java Normal file
View File

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