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

门诊输液记录up

Browse Source
This commit is contained in:
liuhongrui
2025-03-30 16:14:00 +08:00
parent 6294e1d290
commit 440b4b13ca
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,6 +374,8 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
queryWrapper.isNull(CommonConstants.FieldName.BasedOnId);
// 状态是进行中
queryWrapper.eq(CommonConstants.FieldName.RequestStatus, EventStatus.IN_PROGRESS.getValue());
//筛选当前ID的患者历史执行记录
queryWrapper.eq(CommonConstants.FieldName.PatientId,patientId);
return editRecords(queryWrapper);
}

29
openhis-server/openhis-application/src/main/java/com/openhis/web/outpatientmanage/controller/OutpatientInfusionRecordController.java
View File

@@ -50,18 +50,18 @@ public class OutpatientInfusionRecordController {
.ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(searchKey, pageNo, pageSize, request));
}
/**
* 点击患者，查询该患者的输液记录
*
* @param outpatientInfusionPatientDto 患者输液信息
* @return 当前患者门诊输液待执行列表
*/
@GetMapping(value = "/patient-infusion-record")
public R<?> getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto,
HttpServletRequest request) {
return R.ok(outpatientInfusionRecordService.getPatientInfusionRecord(outpatientInfusionPatientDto, request));
}
// /**
// * 点击患者，查询该患者的输液记录
// *
// * @param outpatientInfusionPatientDto 患者输液信息
// * @return 当前患者门诊输液待执行列表
// */
// @GetMapping(value = "/patient-infusion-record")
// public R<?> getPatientInfusionRecord(OutpatientInfusionPatientDto outpatientInfusionPatientDto,
// HttpServletRequest request) {
//
// return R.ok(outpatientInfusionRecordService.getPatientInfusionRecord(outpatientInfusionPatientDto, request));
// }
/**
* 批量执行患者门诊输液
@@ -98,12 +98,13 @@ public class OutpatientInfusionRecordController {
/**
* 门诊输液待执行记录查询
*
* @param patientId 患者ID
* @return 门诊输液待执行记录列表
*/
@GetMapping(value = "/infusion-wait-perform-record")
public R<?> getPatientInfusionRecords(HttpServletRequest request) {
public R<?> getPatientInfusionRecords(@RequestParam Long patientId,HttpServletRequest request) {
return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(null,request, false));
return R.ok(outpatientInfusionRecordService.getPatientInfusionPerformRecord(patientId,request, false));
}
/**