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

Revert "```"

Browse Source 
This reverts commit abc0674531.
This commit is contained in:
chenqi
2025-12-26 22:21:21 +08:00
parent ae6c486114
commit 3115e38cc4
920 changed files with 14452 additions and 107025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestAppService.java
View File

@@ -1,45 +0,0 @@
package com.openhis.web.outpatientmanage.appservice;
import java.util.List;
import com.core.common.core.domain.R;
import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto;
import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto;
/**
* 门诊皮试 应用实现类
*/
public interface IOutpatientSkinTestAppService {
/**
* 查询皮试初始化数据
*
* @return 皮试初始化数据
*/
R<?> init();
/**
* 查询皮试记录
*
* @param encounterId 就诊id
* @return 皮试记录
*/
List<SkinTestQueryDto> getRecordInfo(Long encounterId);
/**
* 保存皮试检查记录
*
* @param skinTestSaveDto 皮试检查 保存Dto
* @return 结果
*/
R<?> saveRecordInfo(SkinTestSaveDto skinTestSaveDto);
/**
* 删除皮试检查记录
*
* @param recordId 皮试记录ID
* @return 结果
*/
R<?> deleteRecordInfo(Long recordId);
}

54
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/IOutpatientSkinTestRecordService.java Normal file
View File

@@ -0,0 +1,54 @@
package com.openhis.web.outpatientmanage.appservice;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestInitDto;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestRecordDto;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestRecordSearchParam;
/**
* 门诊管理 应用实现类
*
* @author liuhr
* @date 2025/3/7
*/
public interface IOutpatientSkinTestRecordService {
/**
* 获取门诊皮试记录初期数据列表
*
* @return 获取门诊皮试记录初期数据列表
*/
OutpatientSkinTestInitDto getOutpatientSkinTestInit();
/**
* 分页查询门诊皮试记录,可选条件
*
* @param outpatientSkinTestRecordSearchParam 查询条件
* @param searchKey 查询条件-模糊查询
* @param pageNo 页码（默认为1）
* @param pageSize 每页大小（默认为10）
* @return 获取门诊皮试记录列表
*/
IPage<OutpatientSkinTestRecordDto> getSkinTestRecords(
OutpatientSkinTestRecordSearchParam outpatientSkinTestRecordSearchParam, String searchKey,Integer pageNo, Integer pageSize,
HttpServletRequest request);
/**
* 护士确认执行皮试后，更新皮试记录信息（服务申请管理与过敏与不耐受的相关字段更新）
*
* @param outpatientSkinTestRecordDto 皮试记录信息
* @return 更新结果
*/
boolean editSkinTestRecord(OutpatientSkinTestRecordDto outpatientSkinTestRecordDto);
/**
* 护士核对皮试结果后，确认签名（服务申请管理与过敏与不耐受的相关字段更新）
*
* @param outpatientSkinTestRecordDto 皮试记录信息
* @return 更新结果
*/
boolean nurseSignChkPs(OutpatientSkinTestRecordDto outpatientSkinTestRecordDto);
}

158
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestAppServiceImpl.java
View File

@@ -1,158 +0,0 @@
package com.openhis.web.outpatientmanage.appservice.impl;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.clinical.domain.AllergyIntolerance;
import com.openhis.clinical.service.IAllergyIntoleranceService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.*;
import com.openhis.common.utils.EnumUtils;
import com.openhis.web.outpatientmanage.appservice.IOutpatientSkinTestAppService;
import com.openhis.web.outpatientmanage.dto.AllergyIntoInitDto;
import com.openhis.web.outpatientmanage.dto.SkinTestMedLotNumberDto;
import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto;
import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto;
import com.openhis.web.outpatientmanage.mapper.OutpatientSkinTestAppMapper;
import com.openhis.workflow.service.IActivityDefinitionService;
/**
* 门诊皮试 应用实现类
*/
@Service
public class OutpatientSkinTestAppServiceImpl implements IOutpatientSkinTestAppService {
@Resource
OutpatientSkinTestAppMapper outpatientSkinTestAppMapper;
@Resource
IActivityDefinitionService iActivityDefinitionService;
@Resource
IAllergyIntoleranceService iAllergyIntoleranceService;
/**
* 查询皮试初始化数据
*
* @return 皮试初始化数据
*/
@Override
public R<?> init() {
AllergyIntoInitDto initDto = new AllergyIntoInitDto();
// 获取临床状况列表
List<AllergyIntoInitDto.statusEnumOption> statusEnumOption1 = Stream.of(ClinicalStatus.values())
.map(status -> new AllergyIntoInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
initDto.setClinicalStatusOptions(statusEnumOption1);
// 获取验证状态列表
List<AllergyIntoInitDto.statusEnumOption> statusEnumOption2 = Stream.of(ConditionVerificationStatus.values())
.map(status -> new AllergyIntoInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
initDto.setVerificationStatusOptions(statusEnumOption2);
// 获取危险程度列表
List<AllergyIntoInitDto.statusEnumOption> statusEnumOption3 = Stream.of(Criticality.values())
.map(status -> new AllergyIntoInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
initDto.setCriticalityOptions(statusEnumOption3);
// 获取严重程度列表
List<AllergyIntoInitDto.statusEnumOption> statusEnumOption4 = Stream.of(Severity.values())
.map(status -> new AllergyIntoInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
initDto.setSeverityOptions(statusEnumOption4);
return R.ok(initDto);
}
/**
* 查询皮试记录
*
* @param encounterId 就诊id
* @return 皮试记录
*/
@Override
public List<SkinTestQueryDto> getRecordInfo(Long encounterId) {
// 皮试检查定义id
Long skinTestDefinitionId = iActivityDefinitionService
.getAppointActivityDefinitionId(CommonConstants.BusinessName.SKIN_TEST_INSPECTION);
// 药品库存批次号信息
List<SkinTestMedLotNumberDto> medLotNumber =
outpatientSkinTestAppMapper.getMedLotNumber(CommonConstants.TableName.MED_MEDICATION_DEFINITION);
List<SkinTestQueryDto> recordInfo = outpatientSkinTestAppMapper.getRecordInfo(encounterId, skinTestDefinitionId,
RequestStatus.COMPLETED.getValue());
for (SkinTestQueryDto skinTestQueryDto : recordInfo) {
// 匹配批次号信息
List<SkinTestMedLotNumberDto> lotNumberList =
medLotNumber.stream().filter(e -> e.getMedicationId().equals(skinTestQueryDto.getMedicationId()))
.collect(Collectors.toList());
skinTestQueryDto.setLotNumberList(lotNumberList);
// 临床状况
skinTestQueryDto.setClinicalStatusEnum_enumText(
EnumUtils.getInfoByValue(ClinicalStatus.class, skinTestQueryDto.getClinicalStatusEnum()));
// 验证状态
skinTestQueryDto.setVerificationStatusEnum_enumText(EnumUtils
.getInfoByValue(ConditionVerificationStatus.class, skinTestQueryDto.getVerificationStatusEnum()));
}
return recordInfo;
}
/**
* 保存皮试检查记录
*
* @param skinTestSaveDto 皮试检查 保存Dto
* @return 结果
*/
@Override
public R<?> saveRecordInfo(SkinTestSaveDto skinTestSaveDto) {
AllergyIntolerance allergyIntolerance = new AllergyIntolerance();
allergyIntolerance.setId(skinTestSaveDto.getRecordId()); // 皮试记录ID
allergyIntolerance.setRequestId(skinTestSaveDto.getRequestId()); // 医嘱请求D
allergyIntolerance.setEncounterId(skinTestSaveDto.getEncounterId()); // 就诊ID
allergyIntolerance.setPatientId(skinTestSaveDto.getPatientId()); // 患者ID
allergyIntolerance.setMedicationId(skinTestSaveDto.getMedicationId()); // 药品ID
allergyIntolerance.setLotNumber(skinTestSaveDto.getLotNumber()); // 批次号
allergyIntolerance.setRecordedDate(skinTestSaveDto.getRecordedDate()); // 记录日期
allergyIntolerance.setClinicalStatusEnum(skinTestSaveDto.getClinicalStatusEnum()); // 临床状况
allergyIntolerance.setVerificationStatusEnum(skinTestSaveDto.getVerificationStatusEnum()); // 验证状态
allergyIntolerance.setPractitionerId(skinTestSaveDto.getPractitionerId()); // 记录者
allergyIntolerance.setCheckPractitionerId(skinTestSaveDto.getCheckPractitionerId()); // 断言者
iAllergyIntoleranceService.saveOrUpdate(allergyIntolerance);
return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"皮试检查记录"}));
}
/**
* 删除皮试检查记录
*
* @param recordId 皮试记录ID
* @return 结果
*/
@Override
public R<?> deleteRecordInfo(Long recordId) {
boolean res = iAllergyIntoleranceService.removeById(recordId);
if (res) {
return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"皮试记录"}));
} else {
return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
}
}

301
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/appservice/impl/OutpatientSkinTestRecordServiceImpl.java Normal file
View File

@@ -0,0 +1,301 @@
package com.openhis.web.outpatientmanage.appservice.impl;
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.openhis.common.enums.DispenseStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.utils.DateUtils;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.mapper.PractitionerMapper;
import com.openhis.administration.mapper.PractitionerRoleMapper;
import com.openhis.administration.service.IPractitionerRoleService;
import com.openhis.administration.service.IPractitionerService;
import com.openhis.clinical.domain.AllergyIntolerance;
import com.openhis.clinical.mapper.AllergyIntoleranceMapper;
import com.openhis.clinical.service.IAllergyIntoleranceService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.enums.ClinicalStatus;
import com.openhis.common.enums.RequestStatus;
import com.openhis.common.enums.VerificationStatus;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.outpatientmanage.appservice.IOutpatientSkinTestRecordService;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestInitDto;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestRecordDto;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestRecordSearchParam;
import com.openhis.web.outpatientmanage.mapper.OutpatientInfusionAppMapper;
import com.openhis.workflow.domain.ServiceRequest;
import com.openhis.workflow.mapper.ServiceRequestMapper;
import com.openhis.workflow.service.IServiceRequestService;
/**
* 门诊管理 应用实现类
*
* @author liuhr
* @date 2025/3/7
*/
@Service
public class OutpatientSkinTestRecordServiceImpl implements IOutpatientSkinTestRecordService {
@Resource
OutpatientInfusionAppMapper outpatientInfusionAppMapper;
@Autowired
ServiceRequestMapper serviceRequestMapper;
@Autowired
PractitionerMapper practitionerMapper;
@Autowired
PractitionerRoleMapper practitionerRoleMapper;
@Autowired
IAllergyIntoleranceService allergyIntoleranceService;
@Autowired
IPractitionerRoleService practitionerRoleService;
@Autowired
IPractitionerService practitionerService;
@Autowired
AllergyIntoleranceMapper allergyIntoleranceMapper;
@Autowired
IServiceRequestService serviceRequestService;
/**
* 获取门诊皮试记录初期数据列表
*
* @return 获取门诊皮试记录初期数据列表
*/
@Override
public OutpatientSkinTestInitDto getOutpatientSkinTestInit() {
OutpatientSkinTestInitDto initDto = new OutpatientSkinTestInitDto();
// 获取皮试状态
List<OutpatientSkinTestInitDto.statusEnumOption> statusEnumOptions1 = Stream.of(VerificationStatus.values())
.map(status -> new OutpatientSkinTestInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
initDto.setVerificationStatus(statusEnumOptions1);
// 获取皮试结果
List<OutpatientSkinTestInitDto.statusEnumOption> statusEnumOptions2 = Stream.of(ClinicalStatus.values())
.map(status -> new OutpatientSkinTestInitDto.statusEnumOption(status.getValue(), status.getInfo()))
.collect(Collectors.toList());
initDto.setClinicalStatus(statusEnumOptions2);
return initDto;
}
/**
* 分页查询门诊皮试记录,可选条件
*
* @param outpatientSkinTestRecordSearchParam 查询条件
* @param searchKey 查询条件-模糊查询
* @param pageNo 页码（默认为1）
* @param pageSize 每页大小（默认为10）
*/
@Override
public IPage<OutpatientSkinTestRecordDto> getSkinTestRecords(
OutpatientSkinTestRecordSearchParam outpatientSkinTestRecordSearchParam, String searchKey, Integer pageNo,
Integer pageSize, HttpServletRequest request) {
// 构建查询条件
QueryWrapper<OutpatientSkinTestRecordDto> queryWrapper =
HisQueryUtils.buildQueryWrapper(outpatientSkinTestRecordSearchParam, searchKey, new HashSet<>(
Arrays.asList(CommonConstants.FieldName.PrescriptionNo,
CommonConstants.FieldName.PatientBusNo, CommonConstants.FieldName.EncounterBusNo)), request);
IPage<OutpatientSkinTestRecordDto> outpatientSkinTestRecordPage =
outpatientInfusionAppMapper.getSkinTestRecords(new Page<>(pageNo, pageSize), queryWrapper);
outpatientSkinTestRecordPage.getRecords().forEach(e -> {
// 皮试结果状态枚举类回显赋值
e.setClinicalStatusEnum_enumText(EnumUtils.getInfoByValue(ClinicalStatus.class, e.getClinicalStatusEnum()));
// 皮试检查项目状态枚举类回显赋值
e.setVerificationStatusEnum_enumText(
EnumUtils.getInfoByValue(VerificationStatus.class, e.getVerificationStatusEnum()));
// 药品状态状态枚举类回显赋值
e.setMedicationStatusEnum_enumText(
EnumUtils.getInfoByValue(DispenseStatus.class, e.getMedicationStatusEnum()));
});
return outpatientSkinTestRecordPage;
}
/**
* 护士确认执行皮试后，更新皮试记录信息（服务申请管理与过敏与不耐受的相关字段更新）
*
* @param outpatientSkinTestRecordDto 皮试记录信息
*/
@Override
public boolean editSkinTestRecord(OutpatientSkinTestRecordDto outpatientSkinTestRecordDto) {
// 判断核对人是否不为空,药品状态不是已发药
if (outpatientSkinTestRecordDto.getPerformerCheckId() != null
|| outpatientSkinTestRecordDto.getMedicationStatusEnum() != DispenseStatus.COMPLETED.getValue()) {
// 签名后不能修改，未发药不能修改
return false;
}
// 更新服务申请管理表
ServiceRequest serviceRequest = new ServiceRequest();
// 更新的条件
serviceRequest.setId(outpatientSkinTestRecordDto.getId());
// 判断开始时间为空，不允许更新表
if (StringUtils.isEmpty(outpatientSkinTestRecordDto.getOccurrenceStartTime())) {
return false;
}
Date endTime;
// 判断结束时间，为空以开始时间基础加10分钟
if (StringUtils.isEmpty(outpatientSkinTestRecordDto.getOccurrenceEndTime())) {
// 结束时间为空，开始时间加10min设置
endTime =
DateUtils.addDateMinute(DateUtils.parseDate(outpatientSkinTestRecordDto.getOccurrenceStartTime()), 10);
} else {
endTime = DateUtils.parseDate(outpatientSkinTestRecordDto.getOccurrenceEndTime());
}
// 设置开始时间
serviceRequest
.setOccurrenceStartTime(DateUtils.parseDate(outpatientSkinTestRecordDto.getOccurrenceStartTime()));
// 设置结束时间
serviceRequest.setOccurrenceEndTime(endTime);
// // 获取系统登录的userId，找到practitionerId
// Practitioner practitioner =
// practitionerService.getPractitionerByUserId(SecurityUtils.getLoginUser().getUserId());
// if (practitioner == null) {
// return false;
// }
// 获取当前登录账号的参与者id
Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
// 设置执行人ID
serviceRequest.setPerformerId(practitionerId);
// 以执行人ID，获取执行人的身份类别
// PractitionerRole practitionerRole = practitionerRoleService.getPractitionerRoleById(practitionerId);
// if (practitionerRole != null) {
// // 设置执行人身份类别
// serviceRequest.setPerformerTypeCode(practitionerRole.getRoleCode());
// }
// 以id为主条件更新服务申请管理表
UpdateWrapper<ServiceRequest> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", serviceRequest.getId()).set("performer_type_code", serviceRequest.getPerformerTypeCode())
.set("performer_id", serviceRequest.getPerformerId())
.set("occurrence_start_time", serviceRequest.getOccurrenceStartTime())
.set("occurrence_end_time", serviceRequest.getOccurrenceEndTime());
int countUpdate = serviceRequestMapper.update(null, updateWrapper);
// 过敏与不耐受表更新
AllergyIntolerance allergyIntolerance = new AllergyIntolerance();
if (outpatientSkinTestRecordDto.getClinicalStatusEnum() != null) {
// 设置临床状态（皮试结果）
allergyIntolerance.setClinicalStatusEnum(outpatientSkinTestRecordDto.getClinicalStatusEnum());
}
allergyIntolerance
// 设置服务申请ID
.setRequestId(outpatientSkinTestRecordDto.getId())
// 设置验证状态（皮试检查的状态）
.setVerificationStatusEnum(outpatientSkinTestRecordDto.getVerificationStatusEnum())
// 设置患者id
.setPatientId(outpatientSkinTestRecordDto.getPatientId())
// 设置记录者id
.setPractitionerId(practitionerId)
// 设置记录日期(当下日期)
.setRecordedDate(DateUtils.getNowDate())
// 设置备注
.setNote(outpatientSkinTestRecordDto.getNote());
// 以服务申请ID为主条件更新过敏与不耐受表
UpdateWrapper<AllergyIntolerance> updateWrapperAI = new UpdateWrapper<>();
updateWrapperAI.eq("request_id", allergyIntolerance.getRequestId());
boolean result = allergyIntoleranceService.saveOrUpdate(allergyIntolerance, updateWrapperAI);
// 更新或插入失败
if (!result || countUpdate <= 0) {
return false;
}
return true;
}
@Override
public boolean nurseSignChkPs(OutpatientSkinTestRecordDto outpatientSkinTestRecordDto) {
// 过敏与不耐受表更新
QueryWrapper<AllergyIntolerance> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("request_id", outpatientSkinTestRecordDto.getId());
AllergyIntolerance allergyIntolerance = allergyIntoleranceMapper.selectOne(queryWrapper);
// 检查的状态是确定和反驳的时候，不更新
if (allergyIntolerance == null
|| (allergyIntolerance.getVerificationStatusEnum() != VerificationStatus.CONFIRMED.getValue()
&& allergyIntolerance.getVerificationStatusEnum() != VerificationStatus.REFUTED.getValue())) {
return false;
}
// 更新服务申请管理表的
ServiceRequest serviceRequest = new ServiceRequest();
// 获取系统登录的userId，找到practitionerId
Practitioner practitioner =
practitionerService.getPractitionerByUserId(SecurityUtils.getLoginUser().getUserId());
// 找不到找到practitionerId时，不更新
if (practitioner == null) {
return false;
}
// 设置核对人ID
serviceRequest.setPerformerCheckId(practitioner.getId());
// 把服务请求的状态设置为已完成
serviceRequest.setStatusEnum(RequestStatus.COMPLETED.getValue());
// 以id为主条件更新服务申请管理表
UpdateWrapper<ServiceRequest> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", outpatientSkinTestRecordDto.getId())
.set("performer_check_id", serviceRequest.getPerformerCheckId())
.set("status_enum", serviceRequest.getStatusEnum());
boolean resultUpdateRequestService = serviceRequestService.update(null, updateWrapper);
// 设置断言人
allergyIntolerance.setCheckPractitionerId(practitioner.getId());
// 当皮试结果是为阳性的时候，设置过敏时间
if (allergyIntolerance.getClinicalStatusEnum() == ClinicalStatus.ACTIVE.getValue()) {
// 设置过敏时间(皮实结束时间)
allergyIntolerance
.setOnsetDateTime(DateUtils.parseDate(outpatientSkinTestRecordDto.getOccurrenceEndTime()));
}
// 以服务申请ID为主条件更新服务申请管理表
UpdateWrapper<AllergyIntolerance> updateWrapperAI = new UpdateWrapper<>();
updateWrapperAI.eq("request_id", outpatientSkinTestRecordDto.getId())
.set("check_practitioner_id", allergyIntolerance.getCheckPractitionerId())
.set("onset_date_time", allergyIntolerance.getOnsetDateTime());
boolean resultUpdateAllergyIntolerance = allergyIntoleranceService.update(null, updateWrapperAI);
if (resultUpdateRequestService && resultUpdateAllergyIntolerance) {
return true;
}
return false;
}
}

68
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestAppController.java
View File

@@ -1,68 +0,0 @@
package com.openhis.web.outpatientmanage.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.web.outpatientmanage.appservice.IOutpatientSkinTestAppService;
import com.openhis.web.outpatientmanage.dto.SkinTestSaveDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 门诊皮试
*/
@RestController
@RequestMapping("/outpatient-manage/skin-test")
@Slf4j
@AllArgsConstructor
public class OutpatientSkinTestAppController {
@Autowired
private IOutpatientSkinTestAppService outpatientSkinTestAppService;
/**
* 查询皮试初始化数据
*
* @return 皮试初始化数据
*/
@GetMapping(value = "/init")
public R<?> init() {
return outpatientSkinTestAppService.init();
}
/**
* 查询皮试记录
*
* @param encounterId 就诊id
* @return 皮试记录
*/
@GetMapping(value = "/record-info")
public R<?> getRecordInfo(@RequestParam(value = "encounterId") Long encounterId) {
return R.ok(outpatientSkinTestAppService.getRecordInfo(encounterId));
}
/**
* 保存皮试检查记录
*
* @param skinTestSaveDto 皮试检查 保存Dto
* @return 结果
*/
@PostMapping(value = "/save-record-info")
public R<?> saveRecordInfo(@RequestBody SkinTestSaveDto skinTestSaveDto) {
return outpatientSkinTestAppService.saveRecordInfo(skinTestSaveDto);
}
/**
* 删除皮试检查记录
*
* @param recordId 皮试记录ID
* @return 结果
*/
@DeleteMapping("/delete-record-info")
public R<?> deleteRecordInfo(@RequestParam Long recordId) {
return R.ok(outpatientSkinTestAppService.deleteRecordInfo(recordId));
}
}

90
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientSkinTestRecordController.java Normal file
View File

@@ -0,0 +1,90 @@
package com.openhis.web.outpatientmanage.controller;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.core.common.utils.MessageUtils;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.web.outpatientmanage.appservice.IOutpatientSkinTestRecordService;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestRecordDto;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestRecordSearchParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
* 门诊皮试记录
*
* @author liuhr
* @date 2025/3/5
*/
@RestController
@RequestMapping("/outpatient-manage/skin-test")
@Slf4j
@AllArgsConstructor
public class OutpatientSkinTestRecordController {
@Autowired
private IOutpatientSkinTestRecordService OutpatientSkinTestRecordService;
/**
* 门诊皮试记录初期数据
*
* @return
*/
@GetMapping("/init")
public R<?> getOutpatientSkinTestInit() {
return R.ok(OutpatientSkinTestRecordService.getOutpatientSkinTestInit());
}
/**
* 护士确认执行皮试后，更新皮试记录信息
*
* @param outpatientSkinTestRecordDto 皮试记录信息
*/
@PutMapping("/outpatient-record-skin-test")
public R<?> editSkinTestRecord(@Validated @RequestBody OutpatientSkinTestRecordDto outpatientSkinTestRecordDto) {
if (!OutpatientSkinTestRecordService.editSkinTestRecord(outpatientSkinTestRecordDto)) {
return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
}
return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"皮试项目检查"}));
}
/**
* 皮试记录护士核对签名
*
* @param outpatientSkinTestRecordDto 皮试记录信息
*/
@PutMapping("/outpatient-record-sign-check")
public R<?> nurseSignChkPs(@Validated @RequestBody OutpatientSkinTestRecordDto outpatientSkinTestRecordDto) {
if (!OutpatientSkinTestRecordService.nurseSignChkPs(outpatientSkinTestRecordDto)) {
return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00003, null));
}
return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"皮试记录护士核对签名"}));
}
/**
* 分页查询门诊皮实记录,可选条件
*
* @param outpatientSkinTestRecordSearchParam 查询条件
* @param pageNo 页码（默认为1）
* @param pageSize 每页大小（默认为10）
*/
@GetMapping("/outpatient-record-page")
public R<?> getSkinTestRecords(OutpatientSkinTestRecordSearchParam outpatientSkinTestRecordSearchParam,
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
return R.ok(OutpatientSkinTestRecordService.getSkinTestRecords(outpatientSkinTestRecordSearchParam, searchKey,
pageNo, pageSize, request));
}
}

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientTreatmentController.java
View File

@@ -5,10 +5,10 @@ import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.openhis.web.common.dto.PerformInfoDto;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.openhis.web.common.dto.PerformInfoDto;
import com.openhis.web.outpatientmanage.appservice.IOutpatientTreatmentAppService;
import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentEncounterDto;
import com.openhis.web.outpatientmanage.dto.OutpatientTreatmentInfoDto;

23
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/AllergyIntoInitDto.java → openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestInitDto.java
View File

@@ -1,25 +1,24 @@
package com.openhis.web.outpatientmanage.dto;
import java.util.List;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
/**
* 皮试检查 初始数据Dto
* 皮试初始化记录
*
* @author liuhr
* @date 2025/3/15
*/
@Data
@Accessors(chain = true)
public class AllergyIntoInitDto {
public class OutpatientSkinTestInitDto {
//临床状况列表
private List<statusEnumOption> clinicalStatusOptions;
//验证状态列表
private List<statusEnumOption> verificationStatusOptions;
//危险程度列表
private List<statusEnumOption> criticalityOptions;
//严重程度列表
private List<statusEnumOption> severityOptions;
//皮试检查项目状态
private List<OutpatientSkinTestInitDto.statusEnumOption> verificationStatus;
//皮试结果
private List<OutpatientSkinTestInitDto.statusEnumOption> clinicalStatus;
/**
* 状态

98
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordDto.java Normal file
View File

@@ -0,0 +1,98 @@
package com.openhis.web.outpatientmanage.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 门诊皮试记录Dto
*
* @author liuhr
* @date 2025/3/5
*/
@Data
@Accessors(chain = true)
public class OutpatientSkinTestRecordDto {
/** 服务申请管理表ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 处方号 */
private String prescriptionNo;
/** 就诊号 */
private String encounterBusNo;
/** 病人ID（前台显示用） */
private String patientBusNo;
/** 病人ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long patientId;
/** 病人姓名 */
private String patientName;
/** 执行护士 */
@Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name")
@JsonSerialize(using = ToStringSerializer.class)
private Long performerId;
private String performerId_dictText;
/** 开单医生 */
@Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name")
@JsonSerialize(using = ToStringSerializer.class)
private Long doctorId;
private String doctorId_dictText;
/** 核对人 */
@Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name")
@JsonSerialize(using = ToStringSerializer.class)
private Long performerCheckId;
private String performerCheckId_dictText;
/** 预计执行时间 */
private String occurrenceStartTime;
/** 预计结束时间 */
private String occurrenceEndTime;
/** 药品信息 */
private String medicationInformation;
/** 药品 */
private String medicationDetail;
/** 药品批次号 */
private String medicationLotNumber;
/** 药品状态 */
private Integer medicationStatusEnum;
private String medicationStatusEnum_enumText;
/** 皮试结果 */
private Integer clinicalStatusEnum;
private String clinicalStatusEnum_enumText;
/** 皮试检查项目状态 */
private Integer verificationStatusEnum;;
private String verificationStatusEnum_enumText;
/** 备注 */
private String note;
/** 记录日期 */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date recordedDate;
/** 手机号 */
private String phone;
}

20
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientSkinTestRecordSearchParam.java Normal file
View File

@@ -0,0 +1,20 @@
package com.openhis.web.outpatientmanage.dto;
import lombok.Data;
/**
* 门诊皮试记录查询体体条件类
*
* @author liuhr
* @date 2025/3/5
*/
@Data
public class OutpatientSkinTestRecordSearchParam {
/** 手机号 */
private String phone;
/** 皮试项目检查状态 */
private Integer clinicalStatusEnum;
}

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/OutpatientTreatmentInfoDto.java
View File

@@ -46,7 +46,7 @@ public class OutpatientTreatmentInfoDto {
private Integer executeNum;
/** 数量 */
private BigDecimal quantity;
private Integer quantity;
/** 单位 */
@Dict(dictCode = "unit_code")
@@ -100,7 +100,7 @@ public class OutpatientTreatmentInfoDto {
private Long groupId;
/** 药品数量 */
private BigDecimal medQuantity;
private Integer medQuantity;
/** 排序号 */
private Integer sortNumber;

34
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestMedLotNumberDto.java
View File

@@ -1,34 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.outpatientmanage.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 皮试检查药品批号 Dto
*/
@Data
@Accessors(chain = true)
public class SkinTestMedLotNumberDto {
/** 药品ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long medicationId;
/**
* 供应商
*/
private String supplierName;
/**
* 批次号
*/
private String lotNumber;
}

88
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestQueryDto.java
View File

@@ -1,88 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.outpatientmanage.dto;
import java.util.Date;
import java.util.List;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 皮试检查 查询Dto
*/
@Data
@Accessors(chain = true)
public class SkinTestQueryDto {
/** 医嘱请求D */
@JsonSerialize(using = ToStringSerializer.class)
private Long requestId;
/** 就诊ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/** 患者ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long patientId;
/** 药品ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long medicationId;
/**
* 药品名称
*/
private String medicationName;
/**
* 批次号集合
*/
private List<SkinTestMedLotNumberDto> lotNumberList;
/** 皮试记录ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long recordId;
/**
* 批次号
*/
private String lotNumber;
/**
* 记录日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recordedDate;
/** 临床状况 */
private Integer clinicalStatusEnum;
private String clinicalStatusEnum_enumText;
/** 验证状态 */
private Integer verificationStatusEnum;
private String verificationStatusEnum_enumText;
/** 记录者 */
@JsonSerialize(using = ToStringSerializer.class)
@Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name")
private Long practitionerId;
private String practitionerId_dictText;
/** 断言者 */
@JsonSerialize(using = ToStringSerializer.class)
@Dict(dictCode = "id", dictTable = "adm_practitioner", dictText = "name")
private Long checkPractitionerId;
private String checkPractitionerId_dictText;
}

68
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/dto/SkinTestSaveDto.java
View File

@@ -1,68 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.web.outpatientmanage.dto;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 皮试检查 保存Dto
*/
@Data
@Accessors(chain = true)
public class SkinTestSaveDto {
/** 皮试记录ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long recordId;
/** 医嘱请求D */
@JsonSerialize(using = ToStringSerializer.class)
private Long requestId;
/** 就诊ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/** 患者ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long patientId;
/** 药品ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long medicationId;
/**
* 批次号
*/
private String lotNumber;
/**
* 记录日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recordedDate;
/** 临床状况 */
private Integer clinicalStatusEnum;
/** 验证状态 */
private Integer verificationStatusEnum;
/** 记录者 */
private Long practitionerId;
/** 断言者 */
private Long checkPractitionerId;
}

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientInfusionAppMapper.java
View File

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.openhis.web.outpatientmanage.dto.OutpatientInfusionPatientDto;
import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
import com.openhis.web.outpatientmanage.dto.OutpatientSkinTestRecordDto;
/**
* 门诊管理
@@ -19,6 +20,16 @@ import com.openhis.web.outpatientmanage.dto.OutpatientInfusionRecordDto;
*/
public interface OutpatientInfusionAppMapper {
/**
* 门诊皮试记录分页查询
*
* @param page 分页参数
* @param queryWrapper 查询条件
* @return 门诊输液记录列表
*/
IPage<OutpatientSkinTestRecordDto> getSkinTestRecords(@Param("page") Page<OutpatientSkinTestRecordDto> page,
@Param(Constants.WRAPPER) QueryWrapper<OutpatientSkinTestRecordDto> queryWrapper);
/**
* 门诊输液患者记录分页查询
*

36
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatientmanage/mapper/OutpatientSkinTestAppMapper.java
View File

@@ -1,36 +0,0 @@
package com.openhis.web.outpatientmanage.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.openhis.web.outpatientmanage.dto.SkinTestMedLotNumberDto;
import com.openhis.web.outpatientmanage.dto.SkinTestQueryDto;
/**
* 门诊皮试
*/
@Repository
public interface OutpatientSkinTestAppMapper {
/**
* 查询皮试记录
*
* @param encounterId 就诊id
* @param activityId 皮试检查的定义id
* @param requestStatus 请求状态
* @return 皮试记录
*/
List<SkinTestQueryDto> getRecordInfo(@Param("encounterId") Long encounterId, @Param("activityId") Long activityId,
@Param("requestStatus") Integer requestStatus);
/**
* 查询药品库存批次号信息
*
* @param itemTable 药品定义表名
* @return 药品库存批次号信息
*/
List<SkinTestMedLotNumberDto> getMedLotNumber(@Param("itemTable") String itemTable);
}