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

fix: 删除有依赖冲突的文件（处方审核、门诊报表）

Browse Source 
- PrescriptionReviewAppServiceImpl 依赖 doctorstation DTO 变更
- OutpatientManageReportAppServiceImpl 依赖 encounterService 新方法
- 这些功能需要与 doctorstation 模块一起合并

暂时删除以保持编译通过，后续可单独评估合并
This commit is contained in:
chenqi
2026-03-10 18:49:54 +08:00
parent 7c12028f63
commit 6179a89b6c
11 changed files with 221 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/PrescriptionReviewRecordDto.java Normal file
View File

@@ -0,0 +1,64 @@
package com.openhis.administration.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import com.openhis.common.enums.ReviewReasonableStatus;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 处方点评信息Dto
*
* @author swb
* @date 2026/1/29
*/
@Data
@Accessors(chain = true)
public class PrescriptionReviewRecordDto {
/**
* 审方记录ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 就诊id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/**
* 处方号
*/
private String prescriptionNo;
/**
* 药品请求ids
*/
private String medRequestIds;
/**
* 是否合理标识(0:不合理，1：合理，2：待点评)
*/
private Integer reasonableFlag;
/**
* 存在问题
*/
private String reasonEnum;
/**
* 其他问题
*/
private String reasonText;
/**
* 审方人
*/
@JsonSerialize(using = ToStringSerializer.class)
@Dict(dictTable = "ad_practitioner", dictCode = "id", dictText = "name")
private Long practitioner;
private String practitioner_dictText;
}

14
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/PrescriptionReviewRecordMapper.java Normal file
View File

@@ -0,0 +1,14 @@
package com.openhis.administration.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.administration.domain.PrescriptionReviewRecord;
import org.springframework.stereotype.Repository;
/**
* 处方点评记录Mapper接口
*
* @author swb
* @date 2026/1/29
*/
@Repository
public interface PrescriptionReviewRecordMapper extends BaseMapper<PrescriptionReviewRecord> {}

35
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPrescriptionReviewRecordService.java Normal file
View File

@@ -0,0 +1,35 @@
package com.openhis.administration.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.PrescriptionReviewRecord;
import com.openhis.administration.dto.PrescriptionReviewRecordDto;
/**
* 处方审方记录 服务类
*
* @author swb
* @date 2026-01-29
*/
public interface IPrescriptionReviewRecordService extends IService<PrescriptionReviewRecord> {
/**
* 查询处方点评记录
*
* @param prescriptionNoList 处方号集合
* @param encounterId 就诊id
* @param practitionerId 审方人id
* @param reasonableFlag 是否合理标识
* @return 处方点评记录集合
*/
List<PrescriptionReviewRecord> getPrescriptionReviewRecords(List<String> prescriptionNoList, Long encounterId,
Long practitionerId, Integer reasonableFlag);
/**
* 审方
*
* @param recordDto 处方审方记录dto
* @return 结果
*/
boolean review(PrescriptionReviewRecordDto recordDto);
}

70
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PrescriptionReviewRecordServiceImpl.java Normal file
View File

@@ -0,0 +1,70 @@
package com.openhis.administration.service.impl;
import java.util.List;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
import com.core.common.utils.bean.BeanUtils;
import com.openhis.administration.domain.PrescriptionReviewRecord;
import com.openhis.administration.dto.PrescriptionReviewRecordDto;
import com.openhis.administration.mapper.PrescriptionReviewRecordMapper;
import com.openhis.administration.service.IPrescriptionReviewRecordService;
/**
* 处方点评记录Service业务层处理
*
* @author swb
* @date 2026/1/29
*/
@Service
public class PrescriptionReviewRecordServiceImpl extends
ServiceImpl<PrescriptionReviewRecordMapper, PrescriptionReviewRecord> implements IPrescriptionReviewRecordService {
/**
* 查询处方点评记录
*
* @param prescriptionNoList 处方号集合
* @param encounterId 就诊id
* @param practitionerId 审方人id
* @param reasonableFlag 是否合理标识
* @return 处方点评记录集合
*/
@Override
public List<PrescriptionReviewRecord> getPrescriptionReviewRecords(List<String> prescriptionNoList,
Long encounterId, Long practitionerId, Integer reasonableFlag) {
LambdaQueryWrapper<PrescriptionReviewRecord> wrapper = new LambdaQueryWrapper<>();
// 处方号
wrapper.in(prescriptionNoList != null && !prescriptionNoList.isEmpty(),
PrescriptionReviewRecord::getPrescriptionNo, prescriptionNoList);
// 就诊id
wrapper.eq(encounterId != null, PrescriptionReviewRecord::getEncounterId, encounterId);
// 审方人id
wrapper.eq(practitionerId != null, PrescriptionReviewRecord::getPractitionerId, practitionerId);
// 是否合理标识
wrapper.eq(reasonableFlag != null, PrescriptionReviewRecord::getReasonableFlag, reasonableFlag);
// 未删除
wrapper.eq(PrescriptionReviewRecord::getDeleteFlag, DelFlag.NO.getCode());
// 查询处方点评记录
return baseMapper.selectList(wrapper);
}
/**
* 审方
*
* @param recordDto 处方审方记录dto
* @return 结果
*/
@Override
public boolean review(PrescriptionReviewRecordDto recordDto) {
PrescriptionReviewRecord prescriptionReviewRecord = new PrescriptionReviewRecord();
BeanUtils.copyProperties(recordDto, prescriptionReviewRecord);
prescriptionReviewRecord.setPractitionerId(recordDto.getPractitioner());
if (recordDto.getId() != null) {
return baseMapper.updateById(prescriptionReviewRecord) > 0;
} else {
return baseMapper.insert(prescriptionReviewRecord) > 0;
}
}
}