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-30 15:36:38 +08:00
parent 32a31a9c3b
commit 6294e1d290
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,16 +354,17 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
queryWrapper.eq(CommonConstants.FieldName.RequestStatus, EventStatus.COMPLETED.getValue()); queryWrapper.eq(CommonConstants.FieldName.RequestStatus, EventStatus.COMPLETED.getValue());
//筛选当前ID的患者历史执行记录 //筛选当前ID的患者历史执行记录
queryWrapper.eq(CommonConstants.FieldName.PatientId,patientId); queryWrapper.eq(CommonConstants.FieldName.PatientId,patientId);
//执行次数大于0
queryWrapper.gt("done_num", 0);
List<OutpatientInfusionRecordDto> infusionPerformList = editRecords(queryWrapper); // List<OutpatientInfusionRecordDto> infusionPerformList = editRecords(queryWrapper);
List<Long> medicationIds = checkServiceRequestIsCompleted(infusionPerformList); // List<Long> medicationIds = checkServiceRequestIsCompleted(infusionPerformList);
// 未产生执行历史 // // 未产生执行历史
if (medicationIds == null || medicationIds.isEmpty()) { // if (medicationIds == null || medicationIds.isEmpty()) {
return infusionPerformList; // return infusionPerformList;
} // }
// 筛选一下执行的药品 // // 筛选一下执行的药品
queryWrapper.in(CommonConstants.FieldName.MedicationId, medicationIds); // queryWrapper.in(CommonConstants.FieldName.MedicationId, medicationIds);
return editRecords(queryWrapper); return editRecords(queryWrapper);
// 门诊输液待执行记录查询 // 门诊输液待执行记录查询