From 5af86494ddc94df89da5c2fcb5b3e0505e7a00ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com> Date: Mon, 11 May 2026 13:49:08 +0800 Subject: [PATCH 01/44] =?UTF-8?q?Fix=20Bug=20#500:=20=E3=80=90=E9=97=A8?= =?UTF-8?q?=E8=AF=8A=E5=8C=BB=E7=94=9F=E7=AB=99=E3=80=91=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8F=B3=E4=BE=A7"=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB"=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=95=8C=E9=9D=A2=E5=87=BA=E7=8E=B0=E6=98=8E?= =?UTF-8?q?=E6=98=BE=E6=8A=96=E5=8A=A8/=E9=97=AA=E7=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因分析： 1. el-collapse accordion 模式下快速切换分类时，连续的折叠/展开动画重叠， Element Plus 在动画过程中重新计算面板高度，导致高度跳变和白屏闪烁 2. 折叠容器缺少 overflow:hidden，动画过渡期间内容溢出造成闪烁 修复方案： 1. 添加 isAnimating 防抖标志，handleCollapseChange 中 300ms 内忽略后续点击 （与 CSS 过渡时长一致），让当前动画完整执行后再响应下一次切换 2. .collapse-scroll 添加 overflow-x:hidden，防止水平方向溢出 3. :deep(.el-collapse-item__wrap) 添加 overflow:hidden 替代 will-change:height， 避免强制 GPU 合成层带来的性能开销 Co-Authored-By: Claude Opus 4.7 --- .../examination/examinationApplication.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue index 7c763f07..1ee2188d 100755 --- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue @@ -522,6 +522,7 @@ const categoryList = ref([]); // 原始分类+项目数据 const dictSearchKey = ref(''); const activeNames = ref(''); // 当前展开的折叠项 const categoryLoadingSet = ref(new Set()); // Bug #500: 正在加载方法的分类集合 +const isAnimating = ref(false); // Bug #500: 防止快速切换时折叠动画重叠导致抖动 const allMethods = ref([]); @@ -669,8 +670,13 @@ async function handleCategoryExpand(cat) { categoryLoadingSet.value.delete(cat.typeId); } } -// Bug #500: 改为非 async 函数，避免 el-collapse 的 @change 等待异步完成导致抖动 +// Bug #500: 添加防抖逻辑，快速切换时跳过中间状态的动画，避免高度跳变和白屏闪烁 function handleCollapseChange(activeName) { + if (isAnimating.value) return; // 动画进行中，忽略后续点击 + + isAnimating.value = true; + setTimeout(() => { isAnimating.value = false; }, 300); // 与 CSS 过渡时长一致 + if (activeName) { const cat = filteredCategoryList.value.find(c => c.typeId == activeName); if (cat && (!cat.methods || cat.methods.length === 0)) { @@ -1307,6 +1313,7 @@ defineExpose({ getList }); .collapse-scroll { flex: 1; overflow-y: auto; + overflow-x: hidden; /* Bug #500: 防止切换时水平方向溢出导致抖动 */ } .empty-hint { color: #909399; @@ -1479,10 +1486,10 @@ defineExpose({ getList }); padding-bottom: 4px; transition: all 0.3s ease; } -/* Bug #500: 折叠面板展开/收起动画使用 will-change 优化性能 */ +/* Bug #500: 折叠面板动画容器，添加 overflow:hidden 防止展开时内容溢出导致闪烁 */ :deep(.el-collapse-item__wrap) { border: none; - will-change: height; + overflow: hidden; } :deep(.el-collapse-item) { transition: margin 0.2s ease; From 8fae6fe3d598e06e204888f335f573f24de53fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com> Date: Mon, 11 May 2026 14:01:15 +0800 Subject: [PATCH 02/44] =?UTF-8?q?Fix=20Bug=20#491:=20=E3=80=90=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=A7=91=E5=AE=A4=E9=85=8D=E7=BD=AE=E3=80=91=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E9=85=8D=E7=BD=AE=E6=97=B6=E7=B3=BB=E7=BB=9F=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因: addOrEditOrgLoc 方法中 organizationService.getById() 返回 null 时 直接调用 .getName() 导致 NullPointerException。当数据库中某条执行科室配置 关联的 organizationId 对应的科室记录已被删除时触发此问题。 修复: 在调用 getName() 前增加 null 检查，返回"未知科室"作为降级提示。 Co-Authored-By: Claude Opus 4.7 --- .../impl/OrganizationLocationAppServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java index 7c76d027..c84f11c9 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java @@ -135,7 +135,8 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation BeanUtils.copyProperties(orgLocQueryDto, orgLoc); Long activityDefinitionId = orgLoc.getActivityDefinitionId(); - String activityName = activityDefinitionId != null ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : ""; + String activityName = activityDefinitionId != null + ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : ""; List organizationLocationList = organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId()); @@ -147,8 +148,8 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation for (OrganizationLocation organizationLocation : organizationLocationList) if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(), orgLoc.getStartTime(), orgLoc.getEndTime())) { - String organizationName = - organizationService.getById(organizationLocation.getOrganizationId()).getName(); + Organization org = organizationService.getById(organizationLocation.getOrganizationId()); + String organizationName = org != null ? org.getName() : "未知科室"; return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime() + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突"); } From 8093f8acdae5974744659b831bf2dc5cf20f0219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com> Date: Mon, 11 May 2026 14:03:40 +0800 Subject: [PATCH 03/44] =?UTF-8?q?Fix=20Bug=20#477:=20=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E4=BD=8F?= =?UTF-8?q?=E9=99=A2=E6=A3=80=E6=9F=A5=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=AD"=E5=8F=91=E5=BE=80=E7=A7=91?= =?UTF-8?q?=E5=AE=A4"=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E7=9F=AD=E6=A8=AA=E7=BA=BF=EF=BC=88-=EF=BC=89=EF=BC=8C?= =?UTF-8?q?=E6=9C=AA=E6=AD=A3=E5=B8=B8=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因：handleViewDetail 为同步方法，点击详情时 getLocationInfo 尚未返回， orgOptions 为空导致 recursionFun 无法将 targetDepartment ID 解析为科室名称。 修复： 1. 前端（4个申请组件）：handleViewDetail 改为 async，解析 descJson 前确保 orgOptions 已加载 2. 前端：watch encounterId 改为 Promise.all 并行加载数据和科室列表 3. 后端：新增 keyword 关键字筛选参数（申请单号/检查项目模糊匹配） Co-Authored-By: Claude Opus 4.7 --- .../IRequestFormManageAppService.java | 15 ++++++- .../impl/RequestFormManageAppServiceImpl.java | 7 +-- .../RequestFormManageController.java | 6 ++- .../mapper/RequestFormManageAppMapper.java | 4 +- .../RequestFormManageAppMapper.xml | 10 +++++ .../bloodTtransfusionAapplication.vue | 19 ++++---- .../applicationShow/examineApplication.vue | 19 ++++---- .../applicationShow/surgeryApplication.vue | 19 ++++---- .../applicationShow/testApplication.vue | 44 ++++++++++++++----- 9 files changed, 100 insertions(+), 43 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java index c972faa0..f67aeeee 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java @@ -33,7 +33,7 @@ public interface IRequestFormManageAppService { List getRequestForm(Long encounterId, String typeCode); /** - * 查询申请单（支持筛选） + * 查询申请单（支持日期和状态筛选） * * @param encounterId 就诊id * @param typeCode 申请单类型 @@ -44,6 +44,19 @@ public interface IRequestFormManageAppService { */ List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status); + /** + * 查询申请单（支持日期、状态和关键字筛选） + * + * @param encounterId 就诊id + * @param typeCode 申请单类型 + * @param startDate 开始日期（可选，格式：yyyy-MM-dd） + * @param endDate 结束日期（可选，格式：yyyy-MM-dd） + * @param status 单据状态（可选） + * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配） + * @return 申请单列表 + */ + List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword); + /** * 分页查询申请单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index d07df036..eb61dd26 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -415,7 +415,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer @Override public List getRequestForm(Long encounterId, String typeCode) { // 调用重载方法，不传筛选参数 - return getRequestForm(encounterId, typeCode, null, null, null); + return getRequestForm(encounterId, typeCode, null, null, null, null); } /** @@ -426,16 +426,17 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer * @param startDate 开始日期（可选，格式：yyyy-MM-dd） * @param endDate 结束日期（可选，格式：yyyy-MM-dd） * @param status 单据状态（可选） + * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配） * @return 申请单列表 */ @Override - public List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status) { + public List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword) { // 检查参数 if (encounterId == null) { return new java.util.ArrayList<>(); // 返回空列表而不是查询数据库 } - List requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status); + List requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, keyword); for (RequestFormQueryDto requestFormQueryDto : requestFormList) { // 查询处方详情 List requestFormDetail = diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java index 0ff63615..f135ff44 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java @@ -84,6 +84,7 @@ public class RequestFormManageController { * @param startDate 开始日期（可选，格式：yyyy-MM-dd） * @param endDate 结束日期（可选，格式：yyyy-MM-dd） * @param status 单据状态（可选） + * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配） * @return 检查申请单 */ @GetMapping(value = "/get-check") @@ -91,11 +92,12 @@ public class RequestFormManageController { @RequestParam(required = false) Long encounterId, @RequestParam(required = false) String startDate, @RequestParam(required = false) String endDate, - @RequestParam(required = false) String status) { + @RequestParam(required = false) String status, + @RequestParam(required = false) String keyword) { if (encounterId == null) { return R.fail("就诊ID不能为空"); } - return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode(), startDate, endDate, status)); + return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode(), startDate, endDate, status, keyword)); } /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java index 540689d1..fd0b8da5 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/mapper/RequestFormManageAppMapper.java @@ -37,13 +37,15 @@ public interface RequestFormManageAppMapper { * @param startDate 开始日期（可选，格式：yyyy-MM-dd） * @param endDate 结束日期（可选，格式：yyyy-MM-dd） * @param status 单据状态（可选） + * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配） * @return 申请单列表 */ List getRequestForm(@Param("encounterId") Long encounterId, @Param("typeCode") String typeCode, @Param("startDate") String startDate, @Param("endDate") String endDate, - @Param("status") String status); + @Param("status") String status, + @Param("keyword") String keyword); /** * 查询申请单详情 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml index a32de713..fa786303 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -31,6 +31,16 @@ AND drf.status = #{status}::integer + + AND (drf.prescription_no LIKE CONCAT('%', #{keyword}, '%') + OR EXISTS ( + SELECT 1 FROM wor_service_request wsr_kw + LEFT JOIN wor_activity_definition wad_kw ON wad_kw.id = wsr_kw.activity_id + WHERE wsr_kw.prescription_no = drf.prescription_no + AND wsr_kw.delete_flag = '0' + AND wad_kw.name LIKE CONCAT('%', #{keyword}, '%') + )) + + + @@ -248,8 +250,9 @@ update order_main set status = #{status} where id = #{id} + - update order_main set status = 3, cancel_time = #{cancelTime}, cancel_reason = #{cancelReason} where id = #{id} + update order_main set status = 0, cancel_time = #{cancelTime}, cancel_reason = #{cancelReason} where id = #{id} diff --git a/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue b/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue index d9ead769..36810119 100755 --- a/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue +++ b/openhis-ui-vue3/src/views/triageandqueuemanage/cardiology/index.vue @@ -198,53 +198,52 @@ ↓ -
- - 只显示等待 - - - 显示全部状态 - -
- +
-
- ③ 诊室快速过滤栏 -
-
- - - +
+ ③ 诊室快速过滤栏 +
+
+ + 全部 + + - + :type="selectedRoom === room ? 'primary' : ''" + size="small" + @click="selectedRoom = room" + > + {{ room }} + +
+
+
+ + 只显示等待 + + + 显示全部状态 +
@@ -680,10 +679,8 @@ const selectedCandidates = ref([]) // 显示选项 const showOnlyWaiting = ref(false) -// 诊室过滤（按诊室维度筛选） -const selectedClinicRoom = ref('all') -// 诊室列表（从数据中动态提取） -const clinicRoomList = ref([]) +// Bug #411：诊室过滤，替代原来的科室下拉框（selectedDept/departmentList 已移除） +const selectedRoom = ref('all') // 修复【#397】：动态获取当前科室名称 const currentDeptName = computed(() => { @@ -906,11 +903,12 @@ const mapFrontendStatusToBackend = (status) => { // 从数据库加载队列 const loadQueueFromDb = async () => { try { - // 使用当前登录人的科室 + // Bug #411：不再按科室选筛加载，后端默认按当前登录人科室查询 + const organizationId = undefined + // 只查询今天的患者 const today = new Date() const todayStr = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}` - console.log('【心内科】loadQueueFromDb 开始：date=', todayStr) - const res = await getTriageQueueList({ date: todayStr }).catch((err) => { + const res = await getTriageQueueList({ organizationId, date: todayStr }).catch((err) => { console.error('【心内科】loadQueueFromDb 请求异常：', err) return { code: 500, msg: err?.message || '请求失败', data: null } }) @@ -1138,8 +1136,6 @@ const loadDataFromApi = async () => { // 同步当前呼叫（队列从 DB 加载后已同步；这里再兜底一次） syncCurrentCallFromQueue() - // 提取诊室列表供过滤栏使用 - extractClinicRooms() console.log('【心内科】数据加载完成：候选池', originalCandidatePoolList.value.length, '条，队列', originalQueueList.value.length, '条') ElMessage.success('【心内科】已从门诊挂号接口加载数据') } catch (e) { @@ -1151,42 +1147,35 @@ const loadDataFromApi = async () => { totalSignedIn.value = originalCandidatePoolList.value.length totalInQueue.value = originalQueueList.value.length syncCurrentCallFromQueue() - extractClinicRooms() } } // 原始数据存储（用于过滤） const originalCandidatePoolList = ref(getInitialCandidatePoolList()) -// 提取诊室列表（从队列和候选池数据中动态获取） -const extractClinicRooms = () => { - const roomSet = new Set() - // 从队列中提取 - originalQueueList.value.forEach(item => { - if (item.room && item.room !== '-') { - roomSet.add(item.room) - } - }) - // 从候选池中提取 - originalCandidatePoolList.value.forEach(item => { - if (item.room && item.room !== '-') { - roomSet.add(item.room) - } - }) - clinicRoomList.value = Array.from(roomSet).sort() -} - -// 过滤后的智能候选池数据 +// 过滤后的智能候选池数据（按诊室过滤） const filteredCandidatePoolList = computed(() => { - if (selectedClinicRoom.value === 'all') { + if (selectedRoom.value === 'all') { return originalCandidatePoolList.value } - return originalCandidatePoolList.value.filter(item => item.room === selectedClinicRoom.value) + return originalCandidatePoolList.value.filter(item => item.room === selectedRoom.value) }) // 原始队列数据存储（用于过滤） const originalQueueList = ref(getInitialQueueList()) +// 动态计算已加载数据中的唯一诊室列表（依赖上方两个 ref，确保声明顺序正确） +const uniqueRooms = computed(() => { + const rooms = new Set() + originalCandidatePoolList.value.forEach(item => { + if (item.room && item.room !== '-') rooms.add(item.room) + }) + originalQueueList.value.forEach(item => { + if (item.room && item.room !== '-') rooms.add(item.room) + }) + return Array.from(rooms).sort() +}) + const parseMmSsToSeconds = (mmss) => { if (!mmss || typeof mmss !== 'string') return 0 const [mm, ss] = mmss.split(':') @@ -1203,7 +1192,7 @@ const formatSecondsToMmSs = (totalSeconds) => { return `${mm}:${ss}` } -// 过滤后的智能队列数据（同时考虑诊室过滤和状态过滤） +// 过滤后的智能队列数据（Bug #411：诊室过滤 + 状态过滤） const filteredQueueList = computed(() => { let filtered = originalQueueList.value @@ -1211,8 +1200,8 @@ const filteredQueueList = computed(() => { filtered = filtered.filter(item => item.status !== '已完成') // 再按诊室过滤 - if (selectedClinicRoom.value !== 'all') { - filtered = filtered.filter(item => item.room === selectedClinicRoom.value) + if (selectedRoom.value !== 'all') { + filtered = filtered.filter(item => item.room === selectedRoom.value) } // 再按状态过滤（只显示等待） @@ -1723,16 +1712,12 @@ const handleNextPatient = async () => { reqData.id = selectedQueueRow.value.id reqData.organizationId = selectedQueueRow.value.organizationId } else { - // 如果没有选中患者，使用查询条件（兼容旧逻辑） - // 全科模式：优先用"当前叫号中/第一个等待"所在科室 - let orgId = null - { - const calling = originalQueueList.value.find((i) => i.status === '叫号中') - const waiting = originalQueueList.value.find((i) => i.status === '等待') - console.log('【心内科】handleNextPatient 查找：叫号中=', calling?.patientName, '等待=', waiting?.patientName) - orgId = calling?.organizationId ?? waiting?.organizationId - console.log('【心内科】handleNextPatient 确定的 orgId=', orgId) - } + // Bug #411：已移除 selectedDept，改为从队列数据中动态获取科室 + const calling = originalQueueList.value.find((i) => i.status === '叫号中') + const waiting = originalQueueList.value.find((i) => i.status === '等待') + console.log('【心内科】handleNextPatient 查找：叫号中=', calling?.patientName, '等待=', waiting?.patientName) + const orgId = calling?.organizationId ?? waiting?.organizationId + console.log('【心内科】handleNextPatient 确定的 orgId=', orgId) if (orgId != null) { reqData.organizationId = orgId } @@ -1761,13 +1746,9 @@ const handleSkip = async () => { reqData.id = selectedQueueRow.value.id reqData.organizationId = selectedQueueRow.value.organizationId } else { - // 如果没有选中患者，使用查询条件（兼容旧逻辑） - // 全科模式：优先用”当前叫号中”所在科室 - let orgId = null - { - const calling = originalQueueList.value.find((i) => i.status === '叫号中') - orgId = calling?.organizationId - } + // 如果没有选中患者，使用当前叫号中的科室 + const calling = originalQueueList.value.find((i) => i.status === '叫号中') + const orgId = calling?.organizationId if (orgId != null) { reqData.organizationId = orgId } @@ -1795,13 +1776,9 @@ const handleComplete = async () => { reqData.id = selectedQueueRow.value.id reqData.organizationId = selectedQueueRow.value.organizationId } else { - // 如果没有选中患者，使用查询条件（兼容旧逻辑） - // 全科模式：优先用”当前叫号中”所在科室 - let orgId = null - { - const calling = originalQueueList.value.find((i) => i.status === '叫号中') - orgId = calling?.organizationId - } + // 如果没有选中患者，使用当前叫号中的科室 + const calling = originalQueueList.value.find((i) => i.status === '叫号中') + const orgId = calling?.organizationId if (orgId != null) { reqData.organizationId = orgId } @@ -1829,13 +1806,9 @@ const handleRequeue = async () => { reqData.id = selectedQueueRow.value.id reqData.organizationId = selectedQueueRow.value.organizationId } else { - // 如果没有选中患者，使用查询条件（兼容旧逻辑） - // 全科模式：优先用”当前叫号中”所在科室 - let orgId = null - { - const calling = originalQueueList.value.find((i) => i.status === '叫号中') - orgId = calling?.organizationId - } + // 如果没有选中患者，使用当前叫号中的科室 + const calling = originalQueueList.value.find((i) => i.status === '叫号中') + const orgId = calling?.organizationId if (orgId != null) { reqData.organizationId = orgId } @@ -2219,10 +2192,6 @@ onUnmounted(() => { gap: 10px; } - .queue-actions-right { - display: flex; - gap: 10px; - } } .candidate-actions { @@ -2244,16 +2213,32 @@ onUnmounted(() => { .filter-section { margin-bottom: 20px; + display: flex; + align-items: flex-start; + justify-content: space-between; - .filter-label { - font-size: 14px; - font-weight: bold; - color: #333; - margin-bottom: 10px; + .filter-left { + flex: 1; + + .filter-label { + font-size: 14px; + font-weight: bold; + color: #333; + margin-bottom: 10px; + } + + .filter-button-wrapper { + display: flex; + flex-wrap: wrap; + gap: 8px; + } } - .filter-select-wrapper { - width: 100%; + .filter-right { + display: flex; + gap: 8px; + flex-shrink: 0; + align-self: flex-end; } } From a43f98cc5abaf83742ab86634da075846db89ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Mon, 11 May 2026 14:06:53 +0800 Subject: [PATCH 07/44] =?UTF-8?q?fix:=20=E5=AE=8C=E5=85=A8=E5=9B=9E?= =?UTF-8?q?=E9=80=80=20Bug=20#497=20=E5=BC=95=E5=85=A5=E7=9A=84=20drf.stat?= =?UTF-8?q?us=20=E5=AD=97=E6=AE=B5=EF=BC=88=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/regdoctorstation/RequestFormManageAppMapper.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml index fa786303..f960289b 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -12,7 +12,6 @@ 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 @@ -28,9 +27,6 @@ AND drf.create_time <= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second') - - AND drf.status = #{status}::integer - AND (drf.prescription_no LIKE CONCAT('%', #{keyword}, '%') OR EXISTS ( From 703e9ead432e0328d339e6d20d77d6b19028951b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Mon, 11 May 2026 14:06:20 +0800 Subject: [PATCH 08/44] =?UTF-8?q?Fix=20Bug=20#480:=20[=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E6=8A=A4=E5=A3=AB=E7=AB=99-=E5=8C=BB=E5=98=B1=E6=89=A7?= =?UTF-8?q?=E8=A1=8C]=20=E9=9D=9E=E8=80=97=E6=9D=90=E7=B1=BB=E5=8C=BB?= =?UTF-8?q?=E5=98=B1=E6=89=A7=E8=A1=8C=E6=8A=A5"=E8=80=97=E6=9D=90?= =?UTF-8?q?=E5=BA=93=E5=AD=98"=E9=94=99=E8=AF=AF=E4=B8=94=E5=85=A8?= =?UTF-8?q?=E9=80=89=E9=80=BB=E8=BE=91=E8=81=94=E5=8A=A8=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因分析: 1. 非耗材类医嘱执行报"耗材库存"错误: handleExecute 中无条件调用 lotNumberMatch, 后端会校验该就诊下所有待发放耗材库存,即使当前执行的是口服药等非耗材类医嘱 2. 全选联动异常: msgSuccess 在 handleGetPrescription 之前执行,数据刷新后 defaultSelectAllRows 重新选中所有行,用户关闭弹窗后看到全选效果 修复方案: 1. 增加医嘱类型判断,仅当选中医嘱包含药品(med_medication_request)或耗材(device) 类型时才调用 lotNumberMatch 2. 调整执行顺序:先刷新数据再显示成功弹窗,避免用户看到数据刷新的副作用 Co-Authored-By: Claude Opus 4.7 --- .../components/prescriptionList.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue index 91a8baa2..36df2f50 100755 --- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue +++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue @@ -469,11 +469,19 @@ function handleExecute() { console.log(list, 'list'); adviceExecute({ exeDate: exeDate.value, adviceExecuteDetailList: list }).then((res) => { if (res.code == 200) { - proxy.$modal.msgSuccess(res.msg || '医嘱执行成功'); handleGetPrescription(); - lotNumberMatch({ encounterIdList: encounterIds }, { skipErrorMsg: true }).catch((error) => { - console.warn('lotNumberMatch failed after adviceExecute:', error); - }); + // 仅当选中医嘱中包含药品/耗材类医嘱时，才调用耗材批号匹配 + const hasMedOrDevice = list.some( + (item) => + item.adviceTable === 'med_medication_request' || + String(item.adviceTable || '').includes('device'), + ); + if (hasMedOrDevice) { + lotNumberMatch({ encounterIdList: encounterIds }, { skipErrorMsg: true }).catch((error) => { + console.warn('lotNumberMatch failed after adviceExecute:', error); + }); + } + proxy.$modal.msgSuccess(res.msg || '医嘱执行成功'); } else { proxy.$modal.msgError(res.msg || '医嘱执行失败'); } From 56ea4b6af17259fb51f9cea7e3c83a4c64330736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Mon, 11 May 2026 14:13:49 +0800 Subject: [PATCH 09/44] =?UTF-8?q?fix:=20=E5=AE=8C=E6=95=B4=E5=9B=9E?= =?UTF-8?q?=E9=80=80=20Bug=20#497=20=E7=9A=84=E5=90=8E=E7=AB=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=88SQL/Java=E6=8E=A5=E5=8F=A3/Impl/Dto=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRequestFormManageAppService.java | 15 +------------- .../impl/RequestFormManageAppServiceImpl.java | 20 +++++++++---------- .../dto/RequestFormQueryDto.java | 5 ----- .../RequestFormManageAppMapper.xml | 11 ++-------- 4 files changed, 12 insertions(+), 39 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java index d4ae392a..12464051 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java @@ -33,7 +33,7 @@ public interface IRequestFormManageAppService { List getRequestForm(Long encounterId, String typeCode); /** - * 查询申请单（支持日期和状态筛选） + * 查询申请单（支持筛选） * * @param encounterId 就诊id * @param typeCode 申请单类型 @@ -44,19 +44,6 @@ public interface IRequestFormManageAppService { */ List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status); - /** - * 查询申请单（支持日期、状态和关键字筛选） - * - * @param encounterId 就诊id - * @param typeCode 申请单类型 - * @param startDate 开始日期（可选，格式：yyyy-MM-dd） - * @param endDate 结束日期（可选，格式：yyyy-MM-dd） - * @param status 单据状态（可选） - * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配） - * @return 申请单列表 - */ - List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword); - /** * 分页查询申请单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index b7ff0647..85014657 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -95,13 +95,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8); } - // 诊疗执行科室配置校验（必须在数据库操作之前执行） - List activityOrganizationConfig = - requestFormManageAppMapper.getActivityOrganizationConfig(typeCode); - if (activityOrganizationConfig.isEmpty()) { - throw new ServiceException("请先配置当前时间段的执行科室"); - } - // 当前时间 Date curDate = new Date(); // 请求类型 @@ -146,6 +139,12 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer // 诊疗集合 List activityList = requestFormSaveDto.getActivityList(); log.info("保存申请单，typeCode={}, activityListSize={}, encounterId={}", typeCode, activityList != null ? activityList.size() : 0, encounterId); + // 诊疗执行科室配置 + List activityOrganizationConfig = + requestFormManageAppMapper.getActivityOrganizationConfig(typeCode); + if (activityOrganizationConfig.isEmpty()) { + throw new ServiceException("请先配置当前时间段的执行科室"); + } for (ActivitySaveDto activitySaveDto : activityList) { serviceRequest = new ServiceRequest(); @@ -415,7 +414,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer @Override public List getRequestForm(Long encounterId, String typeCode) { // 调用重载方法，不传筛选参数 - return getRequestForm(encounterId, typeCode, null, null, null, null); + return getRequestForm(encounterId, typeCode, null, null, null); } /** @@ -426,17 +425,16 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer * @param startDate 开始日期（可选，格式：yyyy-MM-dd） * @param endDate 结束日期（可选，格式：yyyy-MM-dd） * @param status 单据状态（可选） - * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配） * @return 申请单列表 */ @Override - public List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword) { + public List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status) { // 检查参数 if (encounterId == null) { return new java.util.ArrayList<>(); // 返回空列表而不是查询数据库 } - List requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, keyword); + List requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status); for (RequestFormQueryDto requestFormQueryDto : requestFormList) { // 查询处方详情 List requestFormDetail = diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java index 530b9826..681d2010 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java @@ -61,11 +61,6 @@ 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; - /** * 申请单详情 */ diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml index f960289b..c28169b3 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -27,15 +27,8 @@ AND drf.create_time <= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second') - - AND (drf.prescription_no LIKE CONCAT('%', #{keyword}, '%') - OR EXISTS ( - SELECT 1 FROM wor_service_request wsr_kw - LEFT JOIN wor_activity_definition wad_kw ON wad_kw.id = wsr_kw.activity_id - WHERE wsr_kw.prescription_no = drf.prescription_no - AND wsr_kw.delete_flag = '0' - AND wad_kw.name LIKE CONCAT('%', #{keyword}, '%') - )) + + AND drf.status = #{status}::integer From 845354e863e1707dafdfa0b90d9c6317a8e9bc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com> Date: Mon, 11 May 2026 14:40:07 +0800 Subject: [PATCH 10/44] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F=20Bug=20#443/#4?= =?UTF-8?q?75/#477/#486/#497=20=E5=BC=95=E5=85=A5=E7=9A=84=20getRequestFor?= =?UTF-8?q?m=20=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/IRequestFormManageAppService.java | 12 ------------ .../impl/RequestFormManageAppServiceImpl.java | 0 .../controller/RequestFormManageController.java | 13 ++----------- .../regdoctorstation/dto/RequestFormQueryDto.java | 0 .../regdoctorstation/RequestFormManageAppMapper.xml | 0 5 files changed, 2 insertions(+), 23 deletions(-) mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java mode change 100755 => 100644 openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java old mode 100755 new mode 100644 index 12464051..e1b750b9 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java @@ -32,18 +32,6 @@ public interface IRequestFormManageAppService { */ List getRequestForm(Long encounterId, String typeCode); - /** - * 查询申请单（支持筛选） - * - * @param encounterId 就诊id - * @param typeCode 申请单类型 - * @param startDate 开始日期（可选，格式：yyyy-MM-dd） - * @param endDate 结束日期（可选，格式：yyyy-MM-dd） - * @param status 单据状态（可选） - * @return 申请单列表 - */ - List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status); - /** * 分页查询申请单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java old mode 100755 new mode 100644 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java old mode 100755 new mode 100644 index 3bc1216f..cfbc0d7a --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java @@ -81,23 +81,14 @@ public class RequestFormManageController { * 查询检查申请单 * * @param encounterId 就诊id - * @param startDate 开始日期（可选，格式：yyyy-MM-dd） - * @param endDate 结束日期（可选，格式：yyyy-MM-dd） - * @param status 单据状态（可选） - * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配） * @return 检查申请单 */ @GetMapping(value = "/get-check") - public R getCheckRequestForm( - @RequestParam(required = false) Long encounterId, - @RequestParam(required = false) String startDate, - @RequestParam(required = false) String endDate, - @RequestParam(required = false) String status, - @RequestParam(required = false) String keyword) { + public R getCheckRequestForm(@RequestParam(required = false) Long encounterId) { if (encounterId == null) { return R.fail("就诊ID不能为空"); } - return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode(), startDate, endDate, status, keyword)); + return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode())); } /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java old mode 100755 new mode 100644 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml old mode 100755 new mode 100644 From c7956a116bd9b2a5092da83ef4c9e363278c9416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Mon, 11 May 2026 14:57:06 +0800 Subject: [PATCH 11/44] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=20Bug=20#497=20?= =?UTF-8?q?=E7=9A=84=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9=20+=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E5=90=8C=E6=AD=A5=20(ALTER?= =?UTF-8?q?=20TABLE=20doc=5Frequest=5Fform=20ADD=20COLUMN=20status)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRequestFormManageAppService.java | 12 + .../impl/RequestFormManageAppServiceImpl.java | 2 +- .../RequestFormManageController.java | 0 .../dto/RequestFormQueryDto.java | 5 + .../RequestFormManageAppMapper.xml | 1 + .../applicationShow/examineApplication.vue | 490 +----------------- .../src/views/inpatientDoctor/home/index.vue | 8 +- 7 files changed, 45 insertions(+), 473 deletions(-) mode change 100644 => 100755 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java mode change 100644 => 100755 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java mode change 100644 => 100755 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java mode change 100644 => 100755 openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java mode change 100644 => 100755 openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java old mode 100644 new mode 100755 index e1b750b9..12464051 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java @@ -32,6 +32,18 @@ public interface IRequestFormManageAppService { */ List getRequestForm(Long encounterId, String typeCode); + /** + * 查询申请单（支持筛选） + * + * @param encounterId 就诊id + * @param typeCode 申请单类型 + * @param startDate 开始日期（可选，格式：yyyy-MM-dd） + * @param endDate 结束日期（可选，格式：yyyy-MM-dd） + * @param status 单据状态（可选） + * @return 申请单列表 + */ + List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status); + /** * 分页查询申请单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java old mode 100644 new mode 100755 index 85014657..4aeb96cc --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -434,7 +434,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer return new java.util.ArrayList<>(); // 返回空列表而不是查询数据库 } - List requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status); + List requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, null); for (RequestFormQueryDto requestFormQueryDto : requestFormList) { // 查询处方详情 List requestFormDetail = diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java old mode 100644 new mode 100755 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java old mode 100644 new mode 100755 index 681d2010..530b9826 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java @@ -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; + /** * 申请单详情 */ diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml old mode 100644 new mode 100755 index c28169b3..a32de713 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -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 diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue index a0db7153..23614584 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue @@ -49,15 +49,6 @@ - - - @@ -86,62 +77,18 @@ - - - + - + - + @@ -163,7 +110,7 @@ currentDetail.patientName || '-' }} {{ - getItemName(currentDetail) + currentDetail.name || '-' }} {{ parseStatus(currentDetail.status) @@ -171,7 +118,7 @@ {{ currentDetail.createTime || '-' }} - {{ + {{ currentDetail.prescriptionNo || '-' }} {{ @@ -213,101 +160,6 @@ 关闭 - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 申请项目 - - - - - - - -
- -
- - - - -
-