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

Merge remote-tracking branch 'origin/develop' into zhaoyun

Browse Source
This commit is contained in:
华佗
2026-06-18 19:22:35 +08:00
parent d86614982a 3fd259b3ea
commit d40514b184
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java
View File

@@ -153,10 +153,11 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
// 就诊ID集合
String encounterIds = dispenseFormSearchParam.getEncounterIds();
dispenseFormSearchParam.setEncounterIds(null);
// 汇总单查询不适用的字段清空（汇总单表无 tcm_flag 等列，避免 SQL 报错）
// 汇总单查询不适用的字段清空（汇总单表无 tcm_flag、summary_status 等列，避免 SQL 报错）
dispenseFormSearchParam.setTcmFlag(null);
dispenseFormSearchParam.setTherapyEnum(null);
dispenseFormSearchParam.setExeTime(null);
dispenseFormSearchParam.setSummaryStatus(null);
// 构建查询条件
QueryWrapper<DispenseFormSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(dispenseFormSearchParam,