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

fix: 恢复 Bug #497 的后端修改 + 数据库字段同步 (ALTER TABLE doc_request_form ADD COLUMN status)

Browse Source
This commit is contained in:
赵云
2026-05-11 14:57:06 +08:00
committed by 关羽
parent 845354e863
commit c7956a116b
7 changed files with 45 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java Normal file → Executable file
View File

@@ -32,6 +32,18 @@ public interface IRequestFormManageAppService {
*/
List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode);
/**
* 查询申请单（支持筛选）
*
* @param encounterId 就诊id
* @param typeCode 申请单类型
* @param startDate 开始日期（可选，格式：yyyy-MM-dd）
* @param endDate 结束日期（可选，格式：yyyy-MM-dd）
* @param status 单据状态（可选）
* @return 申请单列表
*/
List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status);
/**
* 分页查询申请单
*

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java Normal file → Executable file
View File

@@ -434,7 +434,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
return new java.util.ArrayList<>(); // 返回空列表而不是查询数据库
}
List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status);
List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, null);
for (RequestFormQueryDto requestFormQueryDto : requestFormList) {
// 查询处方详情
List<RequestFormDetailQueryDto> requestFormDetail =

0
openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java Normal file → Executable file
View File

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java Normal file → Executable file
View File

@@ -61,6 +61,11 @@ public class RequestFormQueryDto {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 单据状态 0=待签发 1=已签发 2=已校对 3=待接收 4=已接收 5=已检查 6=已出报告 7=已作废
*/
private Integer status;
/**
* 申请单详情
*/

1
openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml Normal file → Executable file
View File

@@ -12,6 +12,7 @@
drf.desc_json,
drf.requester_id,
drf.create_time,
drf.status,
ap.NAME AS patient_name
FROM doc_request_form AS drf
LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id