From 8ed2df212d3230016a94fb443c9871dae3687f21 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Thu, 18 Jun 2026 13:52:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=20"Can?=
 =?UTF-8?q?didate=20group=20list=20is=20empty"=EF=BC=88=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/healthlink-his-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java b/healthlink-his-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
index a5408ac95..1ffb2de6c 100755
--- a/healthlink-his-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/healthlink-his-server/core-flowable/src/main/java/com/core/flowable/service/impl/FlowTaskServiceImpl.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.domain.entity.SysRole;
 import com.core.common.core.domain.entity.SysUser;
+import com.core.common.core.domain.model.LoginUser;
 import com.core.common.exception.CustomException;
 import com.core.common.utils.SecurityUtils;
 import com.core.flowable.common.constant.ProcessConstants;
@@ -629,11 +630,20 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     public AjaxResult todoList(FlowQueryVo queryVo) {
         Page<FlowTaskDto> page = new Page<>();
         // 只查看自己的数据
-        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser == null) {
+            return AjaxResult.success(page);
+        }
+        SysUser sysUser = loginUser.getUser();
+        List<String> roleIds = sysUser.getRoles() != null
+            ? sysUser.getRoles().stream().map(role -> role.getRoleId().toString()).collect(Collectors.toList())
+            : Collections.emptyList();
         TaskQuery taskQuery = taskService.createTaskQuery().active().includeProcessVariables()
-            .taskCandidateGroupIn(
-                sysUser.getRoles().stream().map(role -> role.getRoleId().toString()).collect(Collectors.toList()))
-            .taskCandidateOrAssigned(sysUser.getUserId().toString()).orderByTaskCreateTime().desc();
+            .taskCandidateOrAssigned(sysUser.getUserId().toString());
+        if (!roleIds.isEmpty()) {
+            taskQuery.taskCandidateGroupIn(roleIds);
+        }
+        taskQuery.orderByTaskCreateTime().desc();
 
         // TODO 传入名称查询不到数据?
         if (StringUtils.isNotBlank(queryVo.getName())) {

From b002818935b79d030067a03bcb9b652f3d7ee3c3 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Thu, 18 Jun 2026 13:55:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Bug=20#722=20=E2=80=94=20=E4=BD=8F=E9=99=A2?=
 =?UTF-8?q?=E7=97=85=E5=8E=86=E9=A1=B5=E9=9D=A2=E6=89=93=E4=B8=8D=E5=BC=80?=
 =?UTF-8?q?=EF=BC=88=E5=89=8D=E7=AB=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/hospitalizationEmr/index.vue      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/healthlink-his-ui/src/views/doctorstation/components/hospitalizationEmr/index.vue b/healthlink-his-ui/src/views/doctorstation/components/hospitalizationEmr/index.vue
index 108d9773f..a1e074c7c 100755
--- a/healthlink-his-ui/src/views/doctorstation/components/hospitalizationEmr/index.vue
+++ b/healthlink-his-ui/src/views/doctorstation/components/hospitalizationEmr/index.vue
@@ -136,11 +136,11 @@
   </div>
 </template>
 <script setup>
-import {nextTick, onMounted, ref, watch} from 'vue';
+import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch} from 'vue';
 import {ElMessage} from 'element-plus';
 import {getTreeList} from '@/views/basicmanage/caseTemplates/api';
 import {addTemplate, getRecordByEncounterIdList, recordPrint, saveOrUpdateRecord} from './api';
-import {patientInfo} from '../store/patient.js';
+import {patientInfo as storePatientInfo} from '../store/patient.js';
 import dayjs from 'dayjs';
 // 打印工具
 import {PRINT_TEMPLATE, simplePrint} from '@/utils/printUtils.js';
@@ -301,15 +301,15 @@ const handleSubmitOk = async (data) => {
   if (currentOperate.value === 'add') {
     //
     try {
-      if (!patientInfo.value?.encounterId || !patientInfo.value?.patientId) {
+      if (!storePatientInfo.value?.encounterId || !storePatientInfo.value?.patientId) {
         ElMessage.error('请先选择患者！');
         return;
       }
       editForm.value.definitionId = currentSelectTemplate.value.id;
       editForm.value.definitionBusNo = currentSelectTemplate.value.busNo;
       editForm.value.contentJson = JSON.stringify(data);
-      editForm.value.encounterId = patientInfo.value.encounterId;
-      editForm.value.patientId = patientInfo.value.patientId;
+      editForm.value.encounterId = storePatientInfo.value.encounterId;
+      editForm.value.patientId = storePatientInfo.value.patientId;
       editForm.value.recordTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
       // 提交病历
       await saveOrUpdateRecord(editForm.value);
@@ -465,15 +465,15 @@ const selectedHistoryRecordId = ref('');
 
 // 加载最新的病历数据并回显
 const loadLatestMedicalRecord = async () => {
-  if (!patientInfo.value.encounterId || !currentSelectTemplate.value.id) return;
+  if (!storePatientInfo.value.encounterId || !currentSelectTemplate.value.id) return;
 
   loading.value = true;
   try {
     // 获取患者的历史病历记录
     const res = await getRecordByEncounterIdList({
       isPage: 0,
-      encounterId: patientInfo.value.encounterId,
-      patientId: patientInfo.value.patientId,
+      encounterId: storePatientInfo.value.encounterId,
+      patientId: storePatientInfo.value.patientId,
       definitionId: currentSelectTemplate.value.id,
     });