3 Commits

Author SHA1 Message Date
d7b3403524 Merge develop into test - sync latest code 2026-04-10 12:31:19 +08:00
700e353b79 测试合并v4 2026-01-15 16:42:56 +08:00
0b2c19d2c5 测试合并v3 2026-01-15 15:54:22 +08:00
710 changed files with 15283 additions and 24765 deletions

View File

@@ -1,5 +0,0 @@
ZENTAO_URL=https://zentao.gentronhealth.com/
ZENTAO_ACCOUNT=guanyu
ZENTAO_PASSWORD=Gentron@2025
ZENTAO_TOKEN=49c270495806afdcf095c46959483326
ZENTAO_REAL_ACCOUNT=guanyu

View File

@@ -1,51 +0,0 @@
#!/usr/bin/env sh
# ============================================================
# Husky Pre-commit Hook - HIS项目
# 配置: 关羽 | 日期: 2026-04-24
# 功能: 提交前自动检查前端构建
# ============================================================
echo "========================================"
echo "🔍 [Pre-commit] HIS项目提交检查"
echo "========================================"
# 检查前端目录是否存在
if [ ! -d "openhis-ui-vue3" ]; then
echo "⚠️ [Pre-commit] 未找到openhis-ui-vue3目录跳过前端检查"
exit 0
fi
cd openhis-ui-vue3
# 检查node_modules是否存在
if [ ! -d "node_modules" ]; then
echo "⚠️ [Pre-commit] node_modules未安装请先执行 npm install"
echo " 提示: 首次使用或依赖变更后需要安装依赖"
exit 1
fi
# 执行lint检查ESLint配置由赵云下周完善后启用
if grep -q '"lint"' package.json 2>/dev/null; then
echo "📋 [Pre-commit] 执行Lint检查..."
if npm run lint -- --max-warnings 0 2>&1; then
echo "✅ [Pre-commit] Lint检查通过"
else
echo "❌ [Pre-commit] Lint检查失败请修复代码规范问题"
exit 1
fi
else
echo "⏭️ [Pre-commit] 未配置lint脚本待赵云配置ESLint后启用"
fi
# 执行快速构建检查development模式仅检查语法和类型
echo "🔨 [Pre-commit] 执行构建检查 (build:dev)..."
if timeout 120 npm run build:dev 2>&1; then
echo "✅ [Pre-commit] 构建检查通过"
else
echo "❌ [Pre-commit] 构建检查失败!请修复编译错误后重新提交"
exit 1
fi
echo "========================================"
echo "✅ [Pre-commit] 所有检查通过,允许提交"
echo "========================================"

View File

@@ -1,4 +0,0 @@
{
"version": 1,
"setupCompletedAt": "2026-04-06T04:43:29.304Z"
}

View File

@@ -0,0 +1,23 @@
- generic [ref=e5]:
- generic [ref=e6]:
- img [ref=e7]
- img [ref=e8]
- generic [ref=e9]:
- generic [ref=e10]:
- heading "经创贺联项目管理系统" [level=2] [ref=e11]
- generic [ref=e12]: 简体
- generic [ref=e13]:
- generic [ref=e14]:
- generic [ref=e16]: 用户名
- textbox [active] [ref=e17]
- generic [ref=e18]:
- generic [ref=e20]: 密码
- textbox [ref=e21]
- generic [ref=e22]:
- generic [ref=e24]:
- checkbox "保持登录" [ref=e25]
- generic [ref=e26] [cursor=pointer]: 保持登录
- link "忘记密码" [ref=e27] [cursor=pointer]:
- /url: /index.php?m=user&f=reset
- button "登录" [ref=e29] [cursor=pointer]:
- generic [ref=e30]: 登录

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,93 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

View File

@@ -0,0 +1,93 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,93 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,314 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- iframe [ref=e66]:
- generic [active] [ref=f11e1]:
- banner [ref=f11e2]:
- generic [ref=f11e3]:
- generic [ref=f11e4]:
- link " 测试" [ref=f11e6] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f11e7]:
- generic [ref=f11e8]: 测试
- button " 开源HIS改造落地" [ref=f11e10] [cursor=pointer]:
- generic [ref=f11e11]:
- generic "开源HIS改造落地" [ref=f11e12]
- navigation [ref=f11e15]:
- list [ref=f11e16]:
- listitem [ref=f11e17]:
- link "仪表盘" [ref=f11e18] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f11e19]: 仪表盘
- listitem [ref=f11e20]
- listitem [ref=f11e21]:
- link "Bug" [ref=f11e22] [cursor=pointer]:
- /url: /index.php?m=bug&f=browse&productID=4
- generic [ref=f11e23]: Bug
- listitem [ref=f11e24]:
- link "用例" [ref=f11e25] [cursor=pointer]:
- /url: /index.php?m=testcase&f=browse&productID=4
- generic [ref=f11e26]: 用例
- listitem [ref=f11e27]:
- link "套件" [ref=f11e28] [cursor=pointer]:
- /url: /index.php?m=testsuite&f=browse&productID=4
- generic [ref=f11e29]: 套件
- listitem [ref=f11e30]
- listitem [ref=f11e31]:
- link "测试单" [ref=f11e32] [cursor=pointer]:
- /url: /index.php?m=testtask&f=browse&productID=4
- generic [ref=f11e33]: 测试单
- listitem [ref=f11e34]:
- link "测试报告" [ref=f11e35] [cursor=pointer]:
- /url: /index.php?m=testreport&f=browse&productID=4
- generic [ref=f11e36]: 测试报告
- listitem [ref=f11e37]
- listitem [ref=f11e38]:
- link "用例库" [ref=f11e39] [cursor=pointer]:
- /url: /index.php?m=caselib&f=browse&libID=0
- generic [ref=f11e40]: 用例库
- listitem [ref=f11e41]
- listitem [ref=f11e42]:
- link "自动化" [ref=f11e43] [cursor=pointer]:
- /url: /index.php?m=zanode&f=instruction
- generic [ref=f11e44]: 自动化
- generic [ref=f11e46]:
- button "" [ref=f11e47] [cursor=pointer]:
- generic [ref=f11e48]:
- button " 9" [ref=f11e49] [cursor=pointer]:
- generic [ref=f11e50]:
- generic [ref=f11e51]: "9"
- generic [ref=f11e54] [cursor=pointer]: A
- generic [ref=f11e57]:
- generic [ref=f11e58]:
- generic [ref=f11e59]:
- button " 返回" [ref=f11e60] [cursor=pointer]:
- generic [ref=f11e61]:
- generic [ref=f11e62]: 返回
- generic [ref=f11e63]:
- generic [ref=f11e64]: "306"
- generic [ref=f11e65]: 手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单
- link " 提Bug" [ref=f11e68] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extras=projectID=11,executionID=0,moduleID=126
- generic [ref=f11e69]:
- generic [ref=f11e70]: 提Bug
- generic [ref=f11e71]:
- generic [ref=f11e72]:
- generic [ref=f11e74]:
- generic [ref=f11e76]: 重现步骤
- generic [ref=f11e78]:
- paragraph [ref=f11e79]: "[步骤]"
- paragraph [ref=f11e80]:
- link "index.php?m=file&f=read&t=png&fileID=1415" [ref=f11e81] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1415
- img "index.php?m=file&f=read&t=png&fileID=1415" [ref=f11e82]
- paragraph [ref=f11e83]: 图1
- paragraph [ref=f11e84]: 1、如上图1所示手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单。
- paragraph [ref=f11e85]: "[结果]"
- paragraph [ref=f11e86]: 1、手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单。
- paragraph [ref=f11e87]: "[期望]"
- paragraph [ref=f11e88]: 1、手术管理-》门诊手术安排:手术申请查询过滤掉已安排的手术申请单。
- generic [ref=f11e90]:
- generic [ref=f11e94]:
- generic [ref=f11e95]: 历史记录
- navigation [ref=f11e96]:
- button "" [ref=f11e97] [cursor=pointer]:
- generic [ref=f11e98]:
- button " 添加备注" [ref=f11e99] [cursor=pointer]:
- generic [ref=f11e100]:
- generic [ref=f11e101]: 添加备注
- list [ref=f11e103]:
- listitem [ref=f11e104]:
- generic [ref=f11e105]:
- generic [ref=f11e107]: "1"
- generic [ref=f11e110]:
- text: 2026-03-30 17:01:33,
- strong [ref=f11e111]: 陈显精
- text: 创建。
- listitem [ref=f11e112]:
- generic [ref=f11e113]:
- generic [ref=f11e115]: "2"
- generic [ref=f11e118]:
- text: 2026-03-30 17:01:45,
- strong [ref=f11e119]: 陈显精
- text: 指派给
- strong [ref=f11e120]: 王怡哲
- text:
- generic [ref=f11e123]:
- button " 返回" [ref=f11e124] [cursor=pointer]:
- generic [ref=f11e125]:
- generic [ref=f11e126]: 返回
- link " 确认" [ref=f11e128] [cursor=pointer]:
- /url: /index.php?m=bug&f=confirm&bugID=306
- generic [ref=f11e129]:
- generic [ref=f11e130]: 确认
- link " 指派" [ref=f11e131] [cursor=pointer]:
- /url: /index.php?m=bug&f=assignTo&bugID=306
- generic [ref=f11e132]:
- generic [ref=f11e133]: 指派
- link " 解决" [ref=f11e134] [cursor=pointer]:
- /url: /index.php?m=bug&f=resolve&bugID=306
- generic [ref=f11e135]:
- generic [ref=f11e136]: 解决
- button " 转研发需求" [ref=f11e137] [cursor=pointer]:
- generic [ref=f11e138]:
- generic [ref=f11e139]: 转研发需求
- button " 转任务" [ref=f11e140] [cursor=pointer]:
- generic [ref=f11e141]:
- generic [ref=f11e142]: 转任务
- link " 创建用例" [ref=f11e143] [cursor=pointer]:
- /url: /index.php?m=testcase&f=create&productID=4&branch=0&moduleID=0&from=bug&bugID=306
- generic [ref=f11e144]:
- generic [ref=f11e145]: 创建用例
- link "" [ref=f11e147] [cursor=pointer]:
- /url: /index.php?m=bug&f=edit&bugID=306
- generic [ref=f11e148]:
- link "" [ref=f11e149] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extra=bugID=306,projectID=11,executionID=0
- generic [ref=f11e150]:
- link "" [ref=f11e151] [cursor=pointer]:
- /url: /index.php?m=bug&f=delete&bugID=306
- generic [ref=f11e152]:
- generic [ref=f11e153]:
- generic [ref=f11e154]:
- generic [ref=f11e155]:
- list [ref=f11e156]:
- listitem [ref=f11e157]:
- link "基本信息" [ref=f11e158] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane"
- generic [ref=f11e159]: 基本信息
- listitem [ref=f11e160]:
- link "Bug的一生" [ref=f11e161] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_1"
- generic [ref=f11e162]: Bug的一生
- button "" [ref=f11e163] [cursor=pointer]:
- generic [ref=f11e164]:
- generic [ref=f11e167]:
- generic [ref=f11e168]:
- generic "所属模块" [ref=f11e169]
- list [ref=f11e171]:
- listitem [ref=f11e172]: 手术麻醉管理
- generic "所属计划" [ref=f11e174]
- generic "来源用例" [ref=f11e177]
- generic [ref=f11e179]:
- generic "Bug类型" [ref=f11e180]
- generic [ref=f11e181]: 代码错误
- generic [ref=f11e182]:
- generic "严重程度" [ref=f11e183]
- generic [ref=f11e185]: 3 3
- generic [ref=f11e186]:
- generic "优先级" [ref=f11e187]
- generic [ref=f11e189]: "3"
- generic [ref=f11e190]:
- generic "Bug状态" [ref=f11e191]
- generic [ref=f11e193]: 激活
- generic "激活次数" [ref=f11e195]
- generic "激活时间" [ref=f11e198]
- generic [ref=f11e200]:
- generic "是否确认" [ref=f11e201]
- generic [ref=f11e202]: 未确认
- generic [ref=f11e203]:
- generic "指派给" [ref=f11e204]
- generic [ref=f11e205]: 王怡哲 于 2026-03-30 17:01:31
- generic "截止日期" [ref=f11e207]
- generic "反馈者" [ref=f11e210]
- generic "通知邮箱" [ref=f11e213]
- generic "操作系统" [ref=f11e216]
- generic "浏览器" [ref=f11e219]
- generic "关键词" [ref=f11e222]
- generic "抄送给" [ref=f11e225]
- generic [ref=f11e227]:
- generic [ref=f11e228]:
- list [ref=f11e229]:
- listitem [ref=f11e230]:
- link "项目/迭代/研发需求/任务" [ref=f11e231] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_2"
- generic [ref=f11e232]: 项目/迭代/研发需求/任务
- listitem [ref=f11e233]:
- link "其他相关" [ref=f11e234] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_3"
- generic [ref=f11e235]: 其他相关
- button "" [ref=f11e236] [cursor=pointer]:
- generic [ref=f11e237]:
- generic [ref=f11e240]:
- generic [ref=f11e241]:
- generic "所属项目" [ref=f11e242]
- link "开源HIS改造落地" [ref=f11e244] [cursor=pointer]:
- /url: /index.php?m=project&f=view&projectID=11
- generic "所属执行" [ref=f11e246]
- generic "相关需求" [ref=f11e249]
- generic "相关任务" [ref=f11e252]
- button "" [ref=f11e255] [cursor=pointer]:
- generic [ref=f11e256]:
- text: "* *"
- generic [ref=e67]:
- button " 研发综合界面" [ref=e69] [cursor=pointer]:
- generic [ref=e70]:
- generic [ref=e71]: 研发综合界面
- list [ref=e73]:
- listitem [ref=e74]:
- generic [ref=e76] [cursor=pointer]: 测试
- generic [ref=e77]:
- textbox [ref=e83]:
- /placeholder: 搜索
- button [ref=e85] [cursor=pointer]:
- img [ref=e87]
- link " 开源版21.7" [ref=e88] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e89]:
- generic [ref=e90]: 开源版21.7
- button "升级 " [ref=e91] [cursor=pointer]:
- generic [ref=e92]: 升级
- generic [ref=e93]:

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,93 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

View File

@@ -0,0 +1,322 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- iframe [ref=e89]:
- generic [active] [ref=f19e1]:
- banner [ref=f19e2]:
- generic [ref=f19e3]:
- generic [ref=f19e4]:
- link " 测试" [ref=f19e6] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f19e7]:
- generic [ref=f19e8]: 测试
- button " 开源HIS改造落地" [ref=f19e10] [cursor=pointer]:
- generic [ref=f19e11]:
- generic "开源HIS改造落地" [ref=f19e12]
- navigation [ref=f19e15]:
- list [ref=f19e16]:
- listitem [ref=f19e17]:
- link "仪表盘" [ref=f19e18] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f19e19]: 仪表盘
- listitem [ref=f19e20]
- listitem [ref=f19e21]:
- link "Bug" [ref=f19e22] [cursor=pointer]:
- /url: /index.php?m=bug&f=browse&productID=4
- generic [ref=f19e23]: Bug
- listitem [ref=f19e24]:
- link "用例" [ref=f19e25] [cursor=pointer]:
- /url: /index.php?m=testcase&f=browse&productID=4
- generic [ref=f19e26]: 用例
- listitem [ref=f19e27]:
- link "套件" [ref=f19e28] [cursor=pointer]:
- /url: /index.php?m=testsuite&f=browse&productID=4
- generic [ref=f19e29]: 套件
- listitem [ref=f19e30]
- listitem [ref=f19e31]:
- link "测试单" [ref=f19e32] [cursor=pointer]:
- /url: /index.php?m=testtask&f=browse&productID=4
- generic [ref=f19e33]: 测试单
- listitem [ref=f19e34]:
- link "测试报告" [ref=f19e35] [cursor=pointer]:
- /url: /index.php?m=testreport&f=browse&productID=4
- generic [ref=f19e36]: 测试报告
- listitem [ref=f19e37]
- listitem [ref=f19e38]:
- link "用例库" [ref=f19e39] [cursor=pointer]:
- /url: /index.php?m=caselib&f=browse&libID=0
- generic [ref=f19e40]: 用例库
- listitem [ref=f19e41]
- listitem [ref=f19e42]:
- link "自动化" [ref=f19e43] [cursor=pointer]:
- /url: /index.php?m=zanode&f=instruction
- generic [ref=f19e44]: 自动化
- generic [ref=f19e46]:
- button "" [ref=f19e47] [cursor=pointer]:
- generic [ref=f19e48]:
- button " 9" [ref=f19e49] [cursor=pointer]:
- generic [ref=f19e50]:
- generic [ref=f19e51]: "9"
- generic [ref=f19e54] [cursor=pointer]: A
- generic [ref=f19e57]:
- generic [ref=f19e58]:
- generic [ref=f19e59]:
- button " 返回" [ref=f19e60] [cursor=pointer]:
- generic [ref=f19e61]:
- generic [ref=f19e62]: 返回
- generic [ref=f19e63]:
- generic [ref=f19e64]: "306"
- generic [ref=f19e65]: 手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单
- link " 提Bug" [ref=f19e68] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extras=projectID=11,executionID=0,moduleID=126
- generic [ref=f19e69]:
- generic [ref=f19e70]: 提Bug
- generic [ref=f19e71]:
- generic [ref=f19e72]:
- generic [ref=f19e74]:
- generic [ref=f19e76]: 重现步骤
- generic [ref=f19e78]:
- paragraph [ref=f19e79]: "[步骤]"
- paragraph [ref=f19e80]:
- link "index.php?m=file&f=read&t=png&fileID=1415" [ref=f19e81] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1415
- img "index.php?m=file&f=read&t=png&fileID=1415" [ref=f19e82]
- paragraph [ref=f19e83]: 图1
- paragraph [ref=f19e84]: 1、如上图1所示手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单。
- paragraph [ref=f19e85]: "[结果]"
- paragraph [ref=f19e86]: 1、手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单。
- paragraph [ref=f19e87]: "[期望]"
- paragraph [ref=f19e88]: 1、手术管理-》门诊手术安排:手术申请查询过滤掉已安排的手术申请单。
- generic [ref=f19e90]:
- generic [ref=f19e94]:
- generic [ref=f19e95]: 历史记录
- navigation [ref=f19e96]:
- button "" [ref=f19e97] [cursor=pointer]:
- generic [ref=f19e98]:
- button " 添加备注" [ref=f19e99] [cursor=pointer]:
- generic [ref=f19e100]:
- generic [ref=f19e101]: 添加备注
- list [ref=f19e103]:
- listitem [ref=f19e104]:
- generic [ref=f19e105]:
- generic [ref=f19e107]: "1"
- generic [ref=f19e110]:
- text: 2026-03-30 17:01:33,
- strong [ref=f19e111]: 陈显精
- text: 创建。
- listitem [ref=f19e112]:
- generic [ref=f19e113]:
- generic [ref=f19e115]: "2"
- generic [ref=f19e118]:
- text: 2026-03-30 17:01:45,
- strong [ref=f19e119]: 陈显精
- text: 指派给
- strong [ref=f19e120]: 王怡哲
- text:
- generic [ref=f19e123]:
- button " 返回" [ref=f19e124] [cursor=pointer]:
- generic [ref=f19e125]:
- generic [ref=f19e126]: 返回
- link " 确认" [ref=f19e128] [cursor=pointer]:
- /url: /index.php?m=bug&f=confirm&bugID=306
- generic [ref=f19e129]:
- generic [ref=f19e130]: 确认
- link " 指派" [ref=f19e131] [cursor=pointer]:
- /url: /index.php?m=bug&f=assignTo&bugID=306
- generic [ref=f19e132]:
- generic [ref=f19e133]: 指派
- link " 解决" [ref=f19e134] [cursor=pointer]:
- /url: /index.php?m=bug&f=resolve&bugID=306
- generic [ref=f19e135]:
- generic [ref=f19e136]: 解决
- button " 转研发需求" [ref=f19e137] [cursor=pointer]:
- generic [ref=f19e138]:
- generic [ref=f19e139]: 转研发需求
- button " 转任务" [ref=f19e140] [cursor=pointer]:
- generic [ref=f19e141]:
- generic [ref=f19e142]: 转任务
- link " 创建用例" [ref=f19e143] [cursor=pointer]:
- /url: /index.php?m=testcase&f=create&productID=4&branch=0&moduleID=0&from=bug&bugID=306
- generic [ref=f19e144]:
- generic [ref=f19e145]: 创建用例
- link "" [ref=f19e147] [cursor=pointer]:
- /url: /index.php?m=bug&f=edit&bugID=306
- generic [ref=f19e148]:
- link "" [ref=f19e149] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extra=bugID=306,projectID=11,executionID=0
- generic [ref=f19e150]:
- link "" [ref=f19e151] [cursor=pointer]:
- /url: /index.php?m=bug&f=delete&bugID=306
- generic [ref=f19e152]:
- generic [ref=f19e153]:
- generic [ref=f19e154]:
- generic [ref=f19e155]:
- list [ref=f19e156]:
- listitem [ref=f19e157]:
- link "基本信息" [ref=f19e158] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane"
- generic [ref=f19e159]: 基本信息
- listitem [ref=f19e160]:
- link "Bug的一生" [ref=f19e161] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_1"
- generic [ref=f19e162]: Bug的一生
- button "" [ref=f19e163] [cursor=pointer]:
- generic [ref=f19e164]:
- generic [ref=f19e167]:
- generic [ref=f19e168]:
- generic "所属模块" [ref=f19e169]
- list [ref=f19e171]:
- listitem [ref=f19e172]: 手术麻醉管理
- generic "所属计划" [ref=f19e174]
- generic "来源用例" [ref=f19e177]
- generic [ref=f19e179]:
- generic "Bug类型" [ref=f19e180]
- generic [ref=f19e181]: 代码错误
- generic [ref=f19e182]:
- generic "严重程度" [ref=f19e183]
- generic [ref=f19e185]: 3 3
- generic [ref=f19e186]:
- generic "优先级" [ref=f19e187]
- generic [ref=f19e189]: "3"
- generic [ref=f19e190]:
- generic "Bug状态" [ref=f19e191]
- generic [ref=f19e193]: 激活
- generic "激活次数" [ref=f19e195]
- generic "激活时间" [ref=f19e198]
- generic [ref=f19e200]:
- generic "是否确认" [ref=f19e201]
- generic [ref=f19e202]: 未确认
- generic [ref=f19e203]:
- generic "指派给" [ref=f19e204]
- generic [ref=f19e205]: 王怡哲 于 2026-03-30 17:01:31
- generic "截止日期" [ref=f19e207]
- generic "反馈者" [ref=f19e210]
- generic "通知邮箱" [ref=f19e213]
- generic "操作系统" [ref=f19e216]
- generic "浏览器" [ref=f19e219]
- generic "关键词" [ref=f19e222]
- generic "抄送给" [ref=f19e225]
- generic [ref=f19e227]:
- generic [ref=f19e228]:
- list [ref=f19e229]:
- listitem [ref=f19e230]:
- link "项目/迭代/研发需求/任务" [ref=f19e231] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_2"
- generic [ref=f19e232]: 项目/迭代/研发需求/任务
- listitem [ref=f19e233]:
- link "其他相关" [ref=f19e234] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_3"
- generic [ref=f19e235]: 其他相关
- button "" [ref=f19e236] [cursor=pointer]:
- generic [ref=f19e237]:
- generic [ref=f19e240]:
- generic [ref=f19e241]:
- generic "所属项目" [ref=f19e242]
- link "开源HIS改造落地" [ref=f19e244] [cursor=pointer]:
- /url: /index.php?m=project&f=view&projectID=11
- generic "所属执行" [ref=f19e246]
- generic "相关需求" [ref=f19e249]
- generic "相关任务" [ref=f19e252]
- button "" [ref=f19e255] [cursor=pointer]:
- generic [ref=f19e256]:
- generic:
- generic:
- link "" [ref=f19e257] [cursor=pointer]:
- /url: /index.php?m=bug&f=view&bugID=307
- generic [ref=f19e258]:
- link "" [ref=f19e259] [cursor=pointer]:
- /url: /index.php?m=bug&f=view&bugID=305
- generic [ref=f19e260]:
- text: "* *"
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list [ref=e90]:
- listitem [ref=e91]:
- generic [ref=e93] [cursor=pointer]: 测试
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

View File

@@ -0,0 +1,91 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,322 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- iframe [ref=e83]:
- generic [active] [ref=f20e1]:
- banner [ref=f20e2]:
- generic [ref=f20e3]:
- generic [ref=f20e4]:
- link " 测试" [ref=f20e6] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f20e7]:
- generic [ref=f20e8]: 测试
- button " 开源HIS改造落地" [ref=f20e10] [cursor=pointer]:
- generic [ref=f20e11]:
- generic "开源HIS改造落地" [ref=f20e12]
- navigation [ref=f20e15]:
- list [ref=f20e16]:
- listitem [ref=f20e17]:
- link "仪表盘" [ref=f20e18] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f20e19]: 仪表盘
- listitem [ref=f20e20]
- listitem [ref=f20e21]:
- link "Bug" [ref=f20e22] [cursor=pointer]:
- /url: /index.php?m=bug&f=browse&productID=4
- generic [ref=f20e23]: Bug
- listitem [ref=f20e24]:
- link "用例" [ref=f20e25] [cursor=pointer]:
- /url: /index.php?m=testcase&f=browse&productID=4
- generic [ref=f20e26]: 用例
- listitem [ref=f20e27]:
- link "套件" [ref=f20e28] [cursor=pointer]:
- /url: /index.php?m=testsuite&f=browse&productID=4
- generic [ref=f20e29]: 套件
- listitem [ref=f20e30]
- listitem [ref=f20e31]:
- link "测试单" [ref=f20e32] [cursor=pointer]:
- /url: /index.php?m=testtask&f=browse&productID=4
- generic [ref=f20e33]: 测试单
- listitem [ref=f20e34]:
- link "测试报告" [ref=f20e35] [cursor=pointer]:
- /url: /index.php?m=testreport&f=browse&productID=4
- generic [ref=f20e36]: 测试报告
- listitem [ref=f20e37]
- listitem [ref=f20e38]:
- link "用例库" [ref=f20e39] [cursor=pointer]:
- /url: /index.php?m=caselib&f=browse&libID=0
- generic [ref=f20e40]: 用例库
- listitem [ref=f20e41]
- listitem [ref=f20e42]:
- link "自动化" [ref=f20e43] [cursor=pointer]:
- /url: /index.php?m=zanode&f=instruction
- generic [ref=f20e44]: 自动化
- generic [ref=f20e46]:
- button "" [ref=f20e47] [cursor=pointer]:
- generic [ref=f20e48]:
- button " 9" [ref=f20e49] [cursor=pointer]:
- generic [ref=f20e50]:
- generic [ref=f20e51]: "9"
- generic [ref=f20e54] [cursor=pointer]: A
- generic [ref=f20e57]:
- generic [ref=f20e58]:
- generic [ref=f20e59]:
- button " 返回" [ref=f20e60] [cursor=pointer]:
- generic [ref=f20e61]:
- generic [ref=f20e62]: 返回
- generic [ref=f20e63]:
- generic [ref=f20e64]: "306"
- generic [ref=f20e65]: 手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单
- link " 提Bug" [ref=f20e68] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extras=projectID=11,executionID=0,moduleID=126
- generic [ref=f20e69]:
- generic [ref=f20e70]: 提Bug
- generic [ref=f20e71]:
- generic [ref=f20e72]:
- generic [ref=f20e74]:
- generic [ref=f20e76]: 重现步骤
- generic [ref=f20e78]:
- paragraph [ref=f20e79]: "[步骤]"
- paragraph [ref=f20e80]:
- link "index.php?m=file&f=read&t=png&fileID=1415" [ref=f20e81] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1415
- img "index.php?m=file&f=read&t=png&fileID=1415" [ref=f20e82]
- paragraph [ref=f20e83]: 图1
- paragraph [ref=f20e84]: 1、如上图1所示手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单。
- paragraph [ref=f20e85]: "[结果]"
- paragraph [ref=f20e86]: 1、手术管理-》门诊手术安排:手术申请查询未过滤掉已安排的手术申请单。
- paragraph [ref=f20e87]: "[期望]"
- paragraph [ref=f20e88]: 1、手术管理-》门诊手术安排:手术申请查询过滤掉已安排的手术申请单。
- generic [ref=f20e90]:
- generic [ref=f20e94]:
- generic [ref=f20e95]: 历史记录
- navigation [ref=f20e96]:
- button "" [ref=f20e97] [cursor=pointer]:
- generic [ref=f20e98]:
- button " 添加备注" [ref=f20e99] [cursor=pointer]:
- generic [ref=f20e100]:
- generic [ref=f20e101]: 添加备注
- list [ref=f20e103]:
- listitem [ref=f20e104]:
- generic [ref=f20e105]:
- generic [ref=f20e107]: "1"
- generic [ref=f20e110]:
- text: 2026-03-30 17:01:33,
- strong [ref=f20e111]: 陈显精
- text: 创建。
- listitem [ref=f20e112]:
- generic [ref=f20e113]:
- generic [ref=f20e115]: "2"
- generic [ref=f20e118]:
- text: 2026-03-30 17:01:45,
- strong [ref=f20e119]: 陈显精
- text: 指派给
- strong [ref=f20e120]: 王怡哲
- text:
- generic [ref=f20e123]:
- button " 返回" [ref=f20e124] [cursor=pointer]:
- generic [ref=f20e125]:
- generic [ref=f20e126]: 返回
- link " 确认" [ref=f20e128] [cursor=pointer]:
- /url: /index.php?m=bug&f=confirm&bugID=306
- generic [ref=f20e129]:
- generic [ref=f20e130]: 确认
- link " 指派" [ref=f20e131] [cursor=pointer]:
- /url: /index.php?m=bug&f=assignTo&bugID=306
- generic [ref=f20e132]:
- generic [ref=f20e133]: 指派
- link " 解决" [ref=f20e134] [cursor=pointer]:
- /url: /index.php?m=bug&f=resolve&bugID=306
- generic [ref=f20e135]:
- generic [ref=f20e136]: 解决
- button " 转研发需求" [ref=f20e137] [cursor=pointer]:
- generic [ref=f20e138]:
- generic [ref=f20e139]: 转研发需求
- button " 转任务" [ref=f20e140] [cursor=pointer]:
- generic [ref=f20e141]:
- generic [ref=f20e142]: 转任务
- link " 创建用例" [ref=f20e143] [cursor=pointer]:
- /url: /index.php?m=testcase&f=create&productID=4&branch=0&moduleID=0&from=bug&bugID=306
- generic [ref=f20e144]:
- generic [ref=f20e145]: 创建用例
- link "" [ref=f20e147] [cursor=pointer]:
- /url: /index.php?m=bug&f=edit&bugID=306
- generic [ref=f20e148]:
- link "" [ref=f20e149] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extra=bugID=306,projectID=11,executionID=0
- generic [ref=f20e150]:
- link "" [ref=f20e151] [cursor=pointer]:
- /url: /index.php?m=bug&f=delete&bugID=306
- generic [ref=f20e152]:
- generic [ref=f20e153]:
- generic [ref=f20e154]:
- generic [ref=f20e155]:
- list [ref=f20e156]:
- listitem [ref=f20e157]:
- link "基本信息" [ref=f20e158] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane"
- generic [ref=f20e159]: 基本信息
- listitem [ref=f20e160]:
- link "Bug的一生" [ref=f20e161] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_1"
- generic [ref=f20e162]: Bug的一生
- button "" [ref=f20e163] [cursor=pointer]:
- generic [ref=f20e164]:
- generic [ref=f20e167]:
- generic [ref=f20e168]:
- generic "所属模块" [ref=f20e169]
- list [ref=f20e171]:
- listitem [ref=f20e172]: 手术麻醉管理
- generic "所属计划" [ref=f20e174]
- generic "来源用例" [ref=f20e177]
- generic [ref=f20e179]:
- generic "Bug类型" [ref=f20e180]
- generic [ref=f20e181]: 代码错误
- generic [ref=f20e182]:
- generic "严重程度" [ref=f20e183]
- generic [ref=f20e185]: 3 3
- generic [ref=f20e186]:
- generic "优先级" [ref=f20e187]
- generic [ref=f20e189]: "3"
- generic [ref=f20e190]:
- generic "Bug状态" [ref=f20e191]
- generic [ref=f20e193]: 激活
- generic "激活次数" [ref=f20e195]
- generic "激活时间" [ref=f20e198]
- generic [ref=f20e200]:
- generic "是否确认" [ref=f20e201]
- generic [ref=f20e202]: 未确认
- generic [ref=f20e203]:
- generic "指派给" [ref=f20e204]
- generic [ref=f20e205]: 王怡哲 于 2026-03-30 17:01:31
- generic "截止日期" [ref=f20e207]
- generic "反馈者" [ref=f20e210]
- generic "通知邮箱" [ref=f20e213]
- generic "操作系统" [ref=f20e216]
- generic "浏览器" [ref=f20e219]
- generic "关键词" [ref=f20e222]
- generic "抄送给" [ref=f20e225]
- generic [ref=f20e227]:
- generic [ref=f20e228]:
- list [ref=f20e229]:
- listitem [ref=f20e230]:
- link "项目/迭代/研发需求/任务" [ref=f20e231] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_2"
- generic [ref=f20e232]: 项目/迭代/研发需求/任务
- listitem [ref=f20e233]:
- link "其他相关" [ref=f20e234] [cursor=pointer]:
- /url: "#zin_bug_view_306_tabPane_3"
- generic [ref=f20e235]: 其他相关
- button "" [ref=f20e236] [cursor=pointer]:
- generic [ref=f20e237]:
- generic [ref=f20e240]:
- generic [ref=f20e241]:
- generic "所属项目" [ref=f20e242]
- link "开源HIS改造落地" [ref=f20e244] [cursor=pointer]:
- /url: /index.php?m=project&f=view&projectID=11
- generic "所属执行" [ref=f20e246]
- generic "相关需求" [ref=f20e249]
- generic "相关任务" [ref=f20e252]
- button "" [ref=f20e255] [cursor=pointer]:
- generic [ref=f20e256]:
- generic:
- generic:
- link "" [ref=f20e257] [cursor=pointer]:
- /url: /index.php?m=bug&f=view&bugID=307
- generic [ref=f20e258]:
- link "" [ref=f20e259] [cursor=pointer]:
- /url: /index.php?m=bug&f=view&bugID=305
- generic [ref=f20e260]:
- text: "* *"
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list [ref=e84]:
- listitem [ref=e85]:
- generic [ref=e87] [cursor=pointer]: 测试
- generic [ref=e71]:
- textbox [ref=e93]:
- /placeholder: 搜索
- button [ref=e73] [cursor=pointer]:
- img [ref=e75]
- link " 开源版21.7" [ref=e76] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e77]:
- generic [ref=e78]: 开源版21.7
- button "升级 " [ref=e79] [cursor=pointer]:
- generic [ref=e80]: 升级
- generic [ref=e81]:

View File

@@ -0,0 +1,93 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

View File

@@ -0,0 +1,337 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- iframe [ref=e89]:
- generic [active] [ref=f1e1]:
- banner [ref=f1e2]:
- generic [ref=f1e3]:
- generic [ref=f1e4]:
- link " 测试" [ref=f1e6] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f1e7]:
- generic [ref=f1e8]: 测试
- button " 开源HIS改造落地" [ref=f1e10] [cursor=pointer]:
- generic [ref=f1e11]:
- generic "开源HIS改造落地" [ref=f1e12]
- navigation [ref=f1e15]:
- list [ref=f1e16]:
- listitem [ref=f1e17]:
- link "仪表盘" [ref=f1e18] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f1e19]: 仪表盘
- listitem [ref=f1e20]
- listitem [ref=f1e21]:
- link "Bug" [ref=f1e22] [cursor=pointer]:
- /url: /index.php?m=bug&f=browse&productID=4
- generic [ref=f1e23]: Bug
- listitem [ref=f1e24]:
- link "用例" [ref=f1e25] [cursor=pointer]:
- /url: /index.php?m=testcase&f=browse&productID=4
- generic [ref=f1e26]: 用例
- listitem [ref=f1e27]:
- link "套件" [ref=f1e28] [cursor=pointer]:
- /url: /index.php?m=testsuite&f=browse&productID=4
- generic [ref=f1e29]: 套件
- listitem [ref=f1e30]
- listitem [ref=f1e31]:
- link "测试单" [ref=f1e32] [cursor=pointer]:
- /url: /index.php?m=testtask&f=browse&productID=4
- generic [ref=f1e33]: 测试单
- listitem [ref=f1e34]:
- link "测试报告" [ref=f1e35] [cursor=pointer]:
- /url: /index.php?m=testreport&f=browse&productID=4
- generic [ref=f1e36]: 测试报告
- listitem [ref=f1e37]
- listitem [ref=f1e38]:
- link "用例库" [ref=f1e39] [cursor=pointer]:
- /url: /index.php?m=caselib&f=browse&libID=0
- generic [ref=f1e40]: 用例库
- listitem [ref=f1e41]
- listitem [ref=f1e42]:
- link "自动化" [ref=f1e43] [cursor=pointer]:
- /url: /index.php?m=zanode&f=instruction
- generic [ref=f1e44]: 自动化
- generic [ref=f1e46]:
- button "" [ref=f1e47] [cursor=pointer]:
- generic [ref=f1e48]:
- button " 9" [ref=f1e49] [cursor=pointer]:
- generic [ref=f1e50]:
- generic [ref=f1e51]: "9"
- generic [ref=f1e54] [cursor=pointer]: A
- generic [ref=f1e57]:
- generic [ref=f1e58]:
- generic [ref=f1e59]:
- button " 返回" [ref=f1e60] [cursor=pointer]:
- generic [ref=f1e61]:
- generic [ref=f1e62]: 返回
- generic [ref=f1e63]:
- generic [ref=f1e64]: "307"
- generic [ref=f1e65]: 门诊医生站:开立的手术申请后未关联生成预手术收费明细记录
- link " 提Bug" [ref=f1e68] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extras=projectID=11,executionID=0,moduleID=126
- generic [ref=f1e69]:
- generic [ref=f1e70]: 提Bug
- generic [ref=f1e71]:
- generic [ref=f1e72]:
- generic [ref=f1e74]:
- generic [ref=f1e76]: 重现步骤
- generic [ref=f1e78]:
- paragraph [ref=f1e79]: "[步骤]"
- paragraph [ref=f1e80]:
- link "index.php?m=file&f=read&t=png&fileID=1416" [ref=f1e81] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1416
- img "index.php?m=file&f=read&t=png&fileID=1416" [ref=f1e82]
- paragraph [ref=f1e83]: 图1门诊医生站手术申请
- paragraph [ref=f1e84]
- paragraph [ref=f1e85]:
- link "index.php?m=file&f=read&t=png&fileID=1417" [ref=f1e86] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1417
- img "index.php?m=file&f=read&t=png&fileID=1417" [ref=f1e87]
- paragraph [ref=f1e88]: 图2手术申请开立成功
- paragraph [ref=f1e89]
- paragraph [ref=f1e90]:
- link "index.php?m=file&f=read&t=png&fileID=1418" [ref=f1e91] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1418
- img "index.php?m=file&f=read&t=png&fileID=1418" [ref=f1e92]
- paragraph [ref=f1e93]: 图3《门诊收费》检索不到待缴费手术费用。
- paragraph [ref=f1e94]: 1、如上图1、2、3所示门诊医生站开立的手术申请后未关联生成预手术收费明细记录。
- paragraph [ref=f1e95]: "[结果]"
- paragraph [ref=f1e96]: 1、门诊医生站:开立的手术申请后未关联生成预手术收费明细记录。
- paragraph [ref=f1e97]: "[期望]"
- paragraph [ref=f1e98]:
- text: 1、门诊医生站:开立的手术申请成功后,
- generic [ref=f1e99]:
- text: 系统应
- strong [ref=f1e100]: 自动将手术收项目明细插入预收费明细表
- text: 确保《门诊收费》处能够实时看见并进行结算如下图4文档所示
- paragraph [ref=f1e101]:
- link "index.php?m=file&f=read&t=png&fileID=1419" [ref=f1e102] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1419
- img "index.php?m=file&f=read&t=png&fileID=1419" [ref=f1e103]
- paragraph [ref=f1e104]: 图4
- paragraph [ref=f1e105]
- generic [ref=f1e107]:
- generic [ref=f1e111]:
- generic [ref=f1e112]: 历史记录
- navigation [ref=f1e113]:
- button "" [ref=f1e114] [cursor=pointer]:
- generic [ref=f1e115]:
- button " 添加备注" [ref=f1e116] [cursor=pointer]:
- generic [ref=f1e117]:
- generic [ref=f1e118]: 添加备注
- list [ref=f1e120]:
- listitem [ref=f1e121]:
- generic [ref=f1e122]:
- generic [ref=f1e124]: "1"
- generic [ref=f1e127]:
- text: 2026-03-30 17:44:22,
- strong [ref=f1e128]: 陈显精
- text: 创建。
- listitem [ref=f1e129]:
- generic [ref=f1e130]:
- generic [ref=f1e132]: "2"
- generic [ref=f1e135]:
- text: 2026-03-30 17:44:26,
- strong [ref=f1e136]: 陈显精
- text: 指派给
- strong [ref=f1e137]: 王怡哲
- text:
- generic [ref=f1e140]:
- button " 返回" [ref=f1e141] [cursor=pointer]:
- generic [ref=f1e142]:
- generic [ref=f1e143]: 返回
- link " 确认" [ref=f1e145] [cursor=pointer]:
- /url: /index.php?m=bug&f=confirm&bugID=307
- generic [ref=f1e146]:
- generic [ref=f1e147]: 确认
- link " 指派" [ref=f1e148] [cursor=pointer]:
- /url: /index.php?m=bug&f=assignTo&bugID=307
- generic [ref=f1e149]:
- generic [ref=f1e150]: 指派
- link " 解决" [ref=f1e151] [cursor=pointer]:
- /url: /index.php?m=bug&f=resolve&bugID=307
- generic [ref=f1e152]:
- generic [ref=f1e153]: 解决
- button " 转研发需求" [ref=f1e154] [cursor=pointer]:
- generic [ref=f1e155]:
- generic [ref=f1e156]: 转研发需求
- button " 转任务" [ref=f1e157] [cursor=pointer]:
- generic [ref=f1e158]:
- generic [ref=f1e159]: 转任务
- link " 创建用例" [ref=f1e160] [cursor=pointer]:
- /url: /index.php?m=testcase&f=create&productID=4&branch=0&moduleID=0&from=bug&bugID=307
- generic [ref=f1e161]:
- generic [ref=f1e162]: 创建用例
- link "" [ref=f1e164] [cursor=pointer]:
- /url: /index.php?m=bug&f=edit&bugID=307
- generic [ref=f1e165]:
- link "" [ref=f1e166] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extra=bugID=307,projectID=11,executionID=0
- generic [ref=f1e167]:
- link "" [ref=f1e168] [cursor=pointer]:
- /url: /index.php?m=bug&f=delete&bugID=307
- generic [ref=f1e169]:
- generic [ref=f1e170]:
- generic [ref=f1e171]:
- generic [ref=f1e172]:
- list [ref=f1e173]:
- listitem [ref=f1e174]:
- link "基本信息" [ref=f1e175] [cursor=pointer]:
- /url: "#zin_bug_view_307_tabPane"
- generic [ref=f1e176]: 基本信息
- listitem [ref=f1e177]:
- link "Bug的一生" [ref=f1e178] [cursor=pointer]:
- /url: "#zin_bug_view_307_tabPane_1"
- generic [ref=f1e179]: Bug的一生
- button "" [ref=f1e180] [cursor=pointer]:
- generic [ref=f1e181]:
- generic [ref=f1e184]:
- generic [ref=f1e185]:
- generic "所属模块" [ref=f1e186]
- list [ref=f1e188]:
- listitem [ref=f1e189]: 手术麻醉管理
- generic "所属计划" [ref=f1e191]
- generic "来源用例" [ref=f1e194]
- generic [ref=f1e196]:
- generic "Bug类型" [ref=f1e197]
- generic [ref=f1e198]: 设计缺陷
- generic [ref=f1e199]:
- generic "严重程度" [ref=f1e200]
- generic [ref=f1e202]: 3 3
- generic [ref=f1e203]:
- generic "优先级" [ref=f1e204]
- generic [ref=f1e206]: "3"
- generic [ref=f1e207]:
- generic "Bug状态" [ref=f1e208]
- generic [ref=f1e210]: 激活
- generic "激活次数" [ref=f1e212]
- generic "激活时间" [ref=f1e215]
- generic [ref=f1e217]:
- generic "是否确认" [ref=f1e218]
- generic [ref=f1e219]: 未确认
- generic [ref=f1e220]:
- generic "指派给" [ref=f1e221]
- generic [ref=f1e222]: 王怡哲 于 2026-03-30 17:44:22
- generic "截止日期" [ref=f1e224]
- generic "反馈者" [ref=f1e227]
- generic "通知邮箱" [ref=f1e230]
- generic "操作系统" [ref=f1e233]
- generic "浏览器" [ref=f1e236]
- generic "关键词" [ref=f1e239]
- generic "抄送给" [ref=f1e242]
- generic [ref=f1e244]:
- generic [ref=f1e245]:
- list [ref=f1e246]:
- listitem [ref=f1e247]:
- link "项目/迭代/研发需求/任务" [ref=f1e248] [cursor=pointer]:
- /url: "#zin_bug_view_307_tabPane_2"
- generic [ref=f1e249]: 项目/迭代/研发需求/任务
- listitem [ref=f1e250]:
- link "其他相关" [ref=f1e251] [cursor=pointer]:
- /url: "#zin_bug_view_307_tabPane_3"
- generic [ref=f1e252]: 其他相关
- button "" [ref=f1e253] [cursor=pointer]:
- generic [ref=f1e254]:
- generic [ref=f1e257]:
- generic [ref=f1e258]:
- generic "所属项目" [ref=f1e259]
- link "开源HIS改造落地" [ref=f1e261] [cursor=pointer]:
- /url: /index.php?m=project&f=view&projectID=11
- generic "所属执行" [ref=f1e263]
- generic "相关需求" [ref=f1e266]
- generic "相关任务" [ref=f1e269]
- button "" [ref=f1e272] [cursor=pointer]:
- generic [ref=f1e273]:
- text: "* *"
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list [ref=e90]:
- listitem [ref=e91]:
- generic [ref=e93] [cursor=pointer]: 测试
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

View File

@@ -0,0 +1,23 @@
- generic [ref=e5]:
- generic [ref=e6]:
- img [ref=e7]
- img [ref=e8]
- generic [ref=e9]:
- generic [ref=e10]:
- heading "经创贺联项目管理系统" [level=2] [ref=e11]
- generic [ref=e12]: 简体
- generic [ref=e13]:
- generic [ref=e14]:
- generic [ref=e16]: 用户名
- textbox [active] [ref=e17]: admin
- generic [ref=e18]:
- generic [ref=e20]: 密码
- textbox [ref=e21]: Jchl1528
- generic [ref=e22]:
- generic [ref=e24]:
- checkbox "保持登录" [checked] [ref=e25]
- generic [ref=e26] [cursor=pointer]: 保持登录
- link "忘记密码" [ref=e27] [cursor=pointer]:
- /url: /index.php?m=user&f=reset
- button "登录" [ref=e29] [cursor=pointer]:
- generic [ref=e30]: 登录

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,93 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

View File

@@ -0,0 +1,328 @@
- generic [active]:
- generic [ref=e1]:
- generic [ref=e2]:
- list [ref=e3]:
- listitem [ref=e4]:
- link " 地盘" [ref=e5] [cursor=pointer]:
- /url: /index.php?m=my&f=index
- generic [ref=e6]:
- generic [ref=e7]: 地盘
- listitem [ref=e8]:
- link " 项目集" [ref=e9] [cursor=pointer]:
- /url: /index.php?m=program&f=browse
- generic [ref=e10]:
- generic [ref=e11]: 项目集
- listitem [ref=e12]:
- link " 产品" [ref=e13] [cursor=pointer]:
- /url: /index.php?m=product&f=all
- generic [ref=e14]:
- generic [ref=e15]: 产品
- listitem [ref=e16]:
- link " 项目" [ref=e17] [cursor=pointer]:
- /url: /index.php?m=project&f=browse
- generic [ref=e18]:
- generic [ref=e19]: 项目
- listitem [ref=e20]:
- link "  执行" [ref=e21] [cursor=pointer]:
- /url: /index.php?m=execution&f=task
- generic [ref=e22]:  
- generic [ref=e23]: 执行
- listitem [ref=e24]:
- link " 测试" [ref=e25] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=e26]:
- generic [ref=e27]: 测试
- listitem [ref=e28]:
- link " DevOps" [ref=e29] [cursor=pointer]:
- /url: /index.php?m=repo&f=maintain
- generic [ref=e30]:
- generic [ref=e31]: DevOps
- listitem [ref=e32]
- listitem [ref=e33]:
- link " AI" [ref=e34] [cursor=pointer]:
- /url: /index.php?m=aiapp&f=square
- generic [ref=e35]:
- generic [ref=e36]: AI
- listitem [ref=e37]:
- link " BI" [ref=e38] [cursor=pointer]:
- /url: /index.php?m=screen&f=browse
- generic [ref=e39]:
- generic [ref=e40]: BI
- listitem [ref=e41]
- listitem [ref=e42]:
- link " 看板" [ref=e43] [cursor=pointer]:
- /url: /index.php?m=kanban&f=space
- generic [ref=e44]:
- generic [ref=e45]: 看板
- listitem [ref=e46]:
- link " 文档" [ref=e47] [cursor=pointer]:
- /url: /index.php?m=doc&f=lastViewedSpace
- generic [ref=e48]:
- generic [ref=e49]: 文档
- listitem [ref=e50]
- listitem [ref=e51]:
- link " 组织" [ref=e52] [cursor=pointer]:
- /url: /index.php?m=my&f=team
- generic [ref=e53]:
- generic [ref=e54]: 组织
- listitem [ref=e55]:
- link " 后台" [ref=e56] [cursor=pointer]:
- /url: /index.php?m=admin&f=index
- generic [ref=e57]:
- generic [ref=e58]: 后台
- text:
- list [ref=e60]:
- listitem [ref=e61]:
- generic [ref=e63] [cursor=pointer]:
- iframe [ref=e89]:
- generic [active] [ref=f3e1]:
- banner [ref=f3e2]:
- generic [ref=f3e3]:
- generic [ref=f3e4]:
- link " 测试" [ref=f3e6] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f3e7]:
- generic [ref=f3e8]: 测试
- button " 开源HIS改造落地" [ref=f3e10] [cursor=pointer]:
- generic [ref=f3e11]:
- generic "开源HIS改造落地" [ref=f3e12]
- navigation [ref=f3e15]:
- list [ref=f3e16]:
- listitem [ref=f3e17]:
- link "仪表盘" [ref=f3e18] [cursor=pointer]:
- /url: /index.php?m=qa&f=index
- generic [ref=f3e19]: 仪表盘
- listitem [ref=f3e20]
- listitem [ref=f3e21]:
- link "Bug" [ref=f3e22] [cursor=pointer]:
- /url: /index.php?m=bug&f=browse&productID=4
- generic [ref=f3e23]: Bug
- listitem [ref=f3e24]:
- link "用例" [ref=f3e25] [cursor=pointer]:
- /url: /index.php?m=testcase&f=browse&productID=4
- generic [ref=f3e26]: 用例
- listitem [ref=f3e27]:
- link "套件" [ref=f3e28] [cursor=pointer]:
- /url: /index.php?m=testsuite&f=browse&productID=4
- generic [ref=f3e29]: 套件
- listitem [ref=f3e30]
- listitem [ref=f3e31]:
- link "测试单" [ref=f3e32] [cursor=pointer]:
- /url: /index.php?m=testtask&f=browse&productID=4
- generic [ref=f3e33]: 测试单
- listitem [ref=f3e34]:
- link "测试报告" [ref=f3e35] [cursor=pointer]:
- /url: /index.php?m=testreport&f=browse&productID=4
- generic [ref=f3e36]: 测试报告
- listitem [ref=f3e37]
- listitem [ref=f3e38]:
- link "用例库" [ref=f3e39] [cursor=pointer]:
- /url: /index.php?m=caselib&f=browse&libID=0
- generic [ref=f3e40]: 用例库
- listitem [ref=f3e41]
- listitem [ref=f3e42]:
- link "自动化" [ref=f3e43] [cursor=pointer]:
- /url: /index.php?m=zanode&f=instruction
- generic [ref=f3e44]: 自动化
- generic [ref=f3e46]:
- button "" [ref=f3e47] [cursor=pointer]:
- generic [ref=f3e48]:
- button " 9" [ref=f3e49] [cursor=pointer]:
- generic [ref=f3e50]:
- generic [ref=f3e51]: "9"
- generic [ref=f3e54] [cursor=pointer]: A
- generic [ref=f3e57]:
- generic [ref=f3e58]:
- generic [ref=f3e59]:
- button " 返回" [ref=f3e60] [cursor=pointer]:
- generic [ref=f3e61]:
- generic [ref=f3e62]: 返回
- generic [ref=f3e63]:
- generic [ref=f3e64]: "320"
- generic [ref=f3e65]: 手术管理-》门诊手术安排:新增手术安排界面的就诊卡号取值错误
- link " 提Bug" [ref=f3e68] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extras=projectID=11,executionID=0,moduleID=126
- generic [ref=f3e69]:
- generic [ref=f3e70]: 提Bug
- generic [ref=f3e71]:
- generic [ref=f3e72]:
- generic [ref=f3e74]:
- generic [ref=f3e76]: 重现步骤
- generic [ref=f3e78]:
- paragraph [ref=f3e79]: "[步骤]"
- paragraph [ref=f3e80]:
- link "index.php?m=file&f=read&t=png&fileID=1450" [ref=f3e81] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1450
- img "index.php?m=file&f=read&t=png&fileID=1450" [ref=f3e82]
- paragraph [ref=f3e83]: 图1门诊手术安排手术申请查询选中手术申请记录点击【确认】
- paragraph [ref=f3e84]:
- link "index.php?m=file&f=read&t=png&fileID=1451" [ref=f3e85] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1451
- img "index.php?m=file&f=read&t=png&fileID=1451" [ref=f3e86]
- paragraph [ref=f3e87]: 图2新增手术安排界面的就诊卡号取值错误
- paragraph [ref=f3e88]: 1、如上图1、2所示手术管理-》门诊手术安排:新增手术安排界面的就诊卡号取值错误。
- paragraph [ref=f3e89]: "[结果]"
- paragraph [ref=f3e90]: 1、手术管理-》门诊手术安排:新增手术安排界面的就诊卡号取值错误。
- paragraph [ref=f3e91]: "[期望]"
- paragraph [ref=f3e92]:
- text: 1、如上图1、2所示手术管理-》门诊手术安排新增手术安排界面的就诊卡号取值于患者档案的就诊卡号字段的值adm_
- link "patient.id" [ref=f3e93] [cursor=pointer]:
- /url: http://patient.id
- text: = adm_patient_identifier.patient_id;adm_patient_identifier.identifier_no 字段就是就诊卡号如下图3所示
- paragraph [ref=f3e94]:
- link "index.php?m=file&f=read&t=png&fileID=1452" [ref=f3e95] [cursor=pointer]:
- /url: /index.php?m=file&f=read&t=png&fileID=1452
- img "index.php?m=file&f=read&t=png&fileID=1452" [ref=f3e96]
- paragraph [ref=f3e97]: 图3
- generic [ref=f3e99]:
- generic [ref=f3e103]:
- generic [ref=f3e104]: 历史记录
- navigation [ref=f3e105]:
- button "" [ref=f3e106] [cursor=pointer]:
- generic [ref=f3e107]:
- button " 添加备注" [ref=f3e108] [cursor=pointer]:
- generic [ref=f3e109]:
- generic [ref=f3e110]: 添加备注
- list [ref=f3e112]:
- listitem [ref=f3e113]:
- generic [ref=f3e114]:
- generic [ref=f3e116]: "1"
- generic [ref=f3e119]:
- text: 2026-03-31 22:53:45,
- strong [ref=f3e120]: 陈显精
- text: 创建。
- listitem [ref=f3e121]:
- generic [ref=f3e122]:
- generic [ref=f3e124]: "2"
- generic [ref=f3e127]:
- text: 2026-03-31 22:53:49,
- strong [ref=f3e128]: 陈显精
- text: 指派给
- strong [ref=f3e129]: 王怡哲
- text:
- generic [ref=f3e132]:
- button " 返回" [ref=f3e133] [cursor=pointer]:
- generic [ref=f3e134]:
- generic [ref=f3e135]: 返回
- link " 确认" [ref=f3e137] [cursor=pointer]:
- /url: /index.php?m=bug&f=confirm&bugID=320
- generic [ref=f3e138]:
- generic [ref=f3e139]: 确认
- link " 指派" [ref=f3e140] [cursor=pointer]:
- /url: /index.php?m=bug&f=assignTo&bugID=320
- generic [ref=f3e141]:
- generic [ref=f3e142]: 指派
- link " 解决" [ref=f3e143] [cursor=pointer]:
- /url: /index.php?m=bug&f=resolve&bugID=320
- generic [ref=f3e144]:
- generic [ref=f3e145]: 解决
- button " 转研发需求" [ref=f3e146] [cursor=pointer]:
- generic [ref=f3e147]:
- generic [ref=f3e148]: 转研发需求
- button " 转任务" [ref=f3e149] [cursor=pointer]:
- generic [ref=f3e150]:
- generic [ref=f3e151]: 转任务
- link " 创建用例" [ref=f3e152] [cursor=pointer]:
- /url: /index.php?m=testcase&f=create&productID=4&branch=0&moduleID=0&from=bug&bugID=320
- generic [ref=f3e153]:
- generic [ref=f3e154]: 创建用例
- link "" [ref=f3e156] [cursor=pointer]:
- /url: /index.php?m=bug&f=edit&bugID=320
- generic [ref=f3e157]:
- link "" [ref=f3e158] [cursor=pointer]:
- /url: /index.php?m=bug&f=create&productID=4&branch=0&extra=bugID=320,projectID=11,executionID=0
- generic [ref=f3e159]:
- link "" [ref=f3e160] [cursor=pointer]:
- /url: /index.php?m=bug&f=delete&bugID=320
- generic [ref=f3e161]:
- generic [ref=f3e162]:
- generic [ref=f3e163]:
- generic [ref=f3e164]:
- list [ref=f3e165]:
- listitem [ref=f3e166]:
- link "基本信息" [ref=f3e167] [cursor=pointer]:
- /url: "#zin_bug_view_320_tabPane"
- generic [ref=f3e168]: 基本信息
- listitem [ref=f3e169]:
- link "Bug的一生" [ref=f3e170] [cursor=pointer]:
- /url: "#zin_bug_view_320_tabPane_1"
- generic [ref=f3e171]: Bug的一生
- button "" [ref=f3e172] [cursor=pointer]:
- generic [ref=f3e173]:
- generic [ref=f3e176]:
- generic [ref=f3e177]:
- generic "所属模块" [ref=f3e178]
- list [ref=f3e180]:
- listitem [ref=f3e181]: 手术麻醉管理
- generic "所属计划" [ref=f3e183]
- generic "来源用例" [ref=f3e186]
- generic [ref=f3e188]:
- generic "Bug类型" [ref=f3e189]
- generic [ref=f3e190]: 代码错误
- generic [ref=f3e191]:
- generic "严重程度" [ref=f3e192]
- generic [ref=f3e194]: 3 3
- generic [ref=f3e195]:
- generic "优先级" [ref=f3e196]
- generic [ref=f3e198]: "3"
- generic [ref=f3e199]:
- generic "Bug状态" [ref=f3e200]
- generic [ref=f3e202]: 激活
- generic "激活次数" [ref=f3e204]
- generic "激活时间" [ref=f3e207]
- generic [ref=f3e209]:
- generic "是否确认" [ref=f3e210]
- generic [ref=f3e211]: 未确认
- generic [ref=f3e212]:
- generic "指派给" [ref=f3e213]
- generic [ref=f3e214]: 王怡哲 于 2026-03-31 22:53:45
- generic "截止日期" [ref=f3e216]
- generic "反馈者" [ref=f3e219]
- generic "通知邮箱" [ref=f3e222]
- generic "操作系统" [ref=f3e225]
- generic "浏览器" [ref=f3e228]
- generic "关键词" [ref=f3e231]
- generic "抄送给" [ref=f3e234]
- generic [ref=f3e236]:
- generic [ref=f3e237]:
- list [ref=f3e238]:
- listitem [ref=f3e239]:
- link "项目/迭代/研发需求/任务" [ref=f3e240] [cursor=pointer]:
- /url: "#zin_bug_view_320_tabPane_2"
- generic [ref=f3e241]: 项目/迭代/研发需求/任务
- listitem [ref=f3e242]:
- link "其他相关" [ref=f3e243] [cursor=pointer]:
- /url: "#zin_bug_view_320_tabPane_3"
- generic [ref=f3e244]: 其他相关
- button "" [ref=f3e245] [cursor=pointer]:
- generic [ref=f3e246]:
- generic [ref=f3e249]:
- generic [ref=f3e250]:
- generic "所属项目" [ref=f3e251]
- link "开源HIS改造落地" [ref=f3e253] [cursor=pointer]:
- /url: /index.php?m=project&f=view&projectID=11
- generic "所属执行" [ref=f3e255]
- generic "相关需求" [ref=f3e258]
- generic "相关任务" [ref=f3e261]
- button "" [ref=f3e264] [cursor=pointer]:
- generic [ref=f3e265]:
- text: "* *"
- generic [ref=e65]:
- button " 研发综合界面" [ref=e67] [cursor=pointer]:
- generic [ref=e68]:
- generic [ref=e69]: 研发综合界面
- list [ref=e90]:
- listitem [ref=e91]:
- generic [ref=e93] [cursor=pointer]: 测试
- generic [ref=e71]:
- textbox [ref=e77]:
- /placeholder: 搜索
- button [ref=e79] [cursor=pointer]:
- img [ref=e81]
- link " 开源版21.7" [ref=e82] [cursor=pointer]:
- /url: https://www.zentao.net
- generic [ref=e83]:
- generic [ref=e84]: 开源版21.7
- button "升级 " [ref=e85] [cursor=pointer]:
- generic [ref=e86]: 升级
- generic [ref=e87]:

6
.qwen/settings.json.orig Normal file
View File

@@ -0,0 +1,6 @@
{
"tools": {
"approvalMode": "yolo"
},
"$version": 2
}

View File

@@ -1,163 +0,0 @@
# Bug #355 - 性别字段回显不一致分析与修复
## 问题描述
门诊挂号页面的预约签到弹窗中,患者"随自核"的性别显示为"未知",但挂号界面载入后显示为"男性",数据不一致。
## 根本原因
### 数据流程分析
1. **预约签到弹窗数据来源** (`TicketAppServiceImpl.listTicket()`)
- SQL 查询 (ScheduleSlotMapper.xml 第97行):
```sql
COALESCE(CAST(o.gender AS VARCHAR), CAST(pinfo.gender_enum AS VARCHAR)) AS patientGender
```
- 后端逻辑 (TicketAppServiceImpl.java 第140-145行):
```java
if (raw.getPatientGender() != null) {
String pg = raw.getPatientGender().trim();
dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
} else {
dto.setGender("未知");
}
```
2. **挂号界面数据来源** (OutpatientRegistrationAppServiceImpl)
- 直接从 `adm_patient` 表查询患者最新信息
- 性别字段: `pinfo.gender_enum`
- 翻译为文本: `EnumUtils.getInfoByValue(AdministrativeGender.class, genderEnum)`
### 问题定位
**关键 SQL 逻辑问题:**
- `order_main.gender` 字段存储的是订单创建时的性别值varchar 类型)
- `adm_patient.gender_enum` 字段存储的是患者最新性别integer 类型)
- 当 `order_main.gender` 为 `NULL` 时SQL 会回退到 `pinfo.gender_enum`
**可能的场景:**
1. 订单创建时未保存性别字段 (`order_main.gender` = NULL)
2. 患者档案中的性别被修改过(但订单表未同步更新)
3. `pinfo.gender_enum` 值为 NULL 或者不合法
## 修复方案
### 方案1修正 SQL 查询逻辑 (推荐)
**问题:** 当 `order_main.gender` 为 NULL 时SQL 正确回退到 `pinfo.gender_enum`,但 Java 代码中对 `patientGender` 的处理逻辑有问题。
**修复步骤:**
1. 修改 SQL直接从患者表获取性别不依赖订单表的 gender 字段:
```sql
-- ScheduleSlotMapper.xml
LEFT JOIN adm_patient pinfo ON o.patient_id = pinfo.id
-- 性别字段直接从患者表获取,避免订单表 gender 字段为空的情况
pinfo.gender_enum AS genderEnum,
```
2. 修改 Java 代码,直接使用 `genderEnum` 字段:
```java
// TicketAppServiceImpl.java
// 性别处理:直接使用患者表中的 gender_enum
Integer genderEnum = raw.getGenderEnum();
if (genderEnum != null) {
if (Integer.valueOf(1).equals(genderEnum)) {
dto.setGender("男");
} else if (Integer.valueOf(2).equals(genderEnum)) {
dto.setGender("女");
} else {
dto.setGender("未知");
}
} else {
dto.setGender("未知");
}
```
### 方案2确保订单表 gender 字段不为空
在订单创建时,确保将患者的性别同步到订单表的 `gender` 字段。
## 临时验证方案
在数据库中执行以下 SQL 检查患者"随自核"的数据:
```sql
-- 检查患者档案中的性别
SELECT id, name, gender_enum,
CASE gender_enum
WHEN 1 THEN '男'
WHEN 2 THEN '女'
ELSE '未知'
END as gender_text
FROM adm_patient
WHERE name = '随自核';
-- 检查订单表中的性别
SELECT o.id, o.patient_id, o.patient_name, o.gender, p.gender_enum
FROM order_main o
LEFT JOIN adm_patient p ON o.patient_id = p.id
WHERE o.patient_name = '随自核';
-- 检查号源数据
SELECT s.id, s.pool_id, s.status as slot_status
FROM adm_schedule_slot s
WHERE EXISTS (
SELECT 1 FROM order_main o WHERE o.slot_id = s.id
AND o.patient_name = '随自核'
);
```
## 修复代码
### 修改 ScheduleSlotMapper.xml
在 `selectTicketSlotsPage` SQL 中,将患者性别字段改为直接从患者表获取:
```xml
<!-- 原来的 SQL (第97行) -->
COALESCE(CAST(o.gender AS VARCHAR), CAST(pinfo.gender_enum AS VARCHAR)) AS patientGender,
<!-- 修改后的 SQL -->
pinfo.gender_enum AS genderEnum,
```
### 修改 TicketAppServiceImpl.java
在 `listTicket` 方法中修改性别处理逻辑:
```java
// 原来的代码 (第140-145行)
// 性别处理:直接读取优先级最高的订单性别字段 (SQL 已处理优先级)
if (raw.getPatientGender() != null) {
String pg = raw.getPatientGender().trim();
dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
} else {
dto.setGender("未知");
}
// 修改后的代码
// 性别处理:直接使用患者表中的 gender_enum
Integer genderEnum = raw.getGenderEnum();
if (genderEnum != null) {
if (Integer.valueOf(1).equals(genderEnum)) {
dto.setGender("男");
} else if (Integer.valueOf(2).equals(genderEnum)) {
dto.setGender("女");
} else {
dto.setGender("未知");
}
} else {
dto.setGender("未知");
}
```
## 验证步骤
1. 修复代码后,重新编译部署
2. 打开预约签到弹窗,查找患者"随自核"
3. 确认性别字段显示为"男性"
4. 进行挂号操作
5. 确认挂号界面显示的性别也是"男性"
6. 两者应该保持一致

View File

@@ -1,117 +0,0 @@
# Bug #355 修复代码
## 修改文件清单
| 序号 | 文件路径 | 修改类型 | 说明 |
|------|---------|---------|------|
| 1 | `his-source/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml` | SQL 查询修改 | 性别字段直接从患者表获取 |
| 2 | `his-source/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java` | Java 代码修改 | 性别处理逻辑修改 |
---
## 修复步骤
### 修改 1: ScheduleSlotMapper.xml
**文件:** `his-source/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml`
**修改位置:** 第97行
**修改前:**
```xml
COALESCE(CAST(o.gender AS VARCHAR), CAST(pinfo.gender_enum AS VARCHAR)) AS patientGender,
```
**修改后:**
```xml
pinfo.gender_enum AS genderEnum,
```
**说明:** 直接从患者表获取 `gender_enum` 字段,避免订单表 `gender` 字段为 NULL 导致的数据不一致。
---
### 修改 2: TicketAppServiceImpl.java
**文件:** `his-source/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java`
**修改位置:** 第140-145行
**修改前:**
```java
// 性别处理:直接读取优先级最高的订单性别字段 (SQL 已处理优先级)
if (raw.getPatientGender() != null) {
String pg = raw.getPatientGender().trim();
dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
} else {
dto.setGender("未知");
}
```
**修改后:**
```java
// 性别处理:直接使用患者表中的 gender_enum
Integer genderEnum = raw.getGenderEnum();
if (genderEnum != null) {
if (Integer.valueOf(1).equals(genderEnum)) {
dto.setGender("男");
} else if (Integer.valueOf(2).equals(genderEnum)) {
dto.setGender("女");
} else {
dto.setGender("未知");
}
} else {
dto.setGender("未知");
}
```
**说明:** 由于 SQL 查询已直接获取 `gender_enum` 字段,这里修改为直接使用该字段进行性别转换。
---
## 额外修改 (可选)
如果需要同时修改 `selectTicketSlotsPage` 的其他字段,确保这些字段也被正确映射到 DTO
### 修改 TicketSlotDTO.java
**文件:** `his-source/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java`
**修改:** 添加 `genderEnum` 字段
```java
private Integer genderEnum;
public Integer getGenderEnum() {
return genderEnum;
}
public void setGenderEnum(Integer genderEnum) {
this.genderEnum = genderEnum;
}
```
---
## 编译部署
```bash
cd his-source/openhis-server-new
mvn clean package -DskipTests
```
---
## 回归测试
| 测试项 | 预期结果 | 状态 |
|--------|---------|------|
| 预约签到弹窗性别显示 | 显示患者真实性别(男/女/未知) | 待测试 |
| 挂号界面性别显示 | 显示患者真实性别(男/女/未知) | 待测试 |
| 两者性别数据一致性 | 完全一致 | 待测试 |
---
**修复人:** 关羽
**修复日期:** 2026-04-08
**BUG ID:** #355

View File

@@ -1,65 +0,0 @@
# BUG #355 - 修复备注
## 修复日期
2026-04-08
## 修复人
关羽 (guanyu)
## 修复内容
### 问题描述
门诊挂号页面的预约签到弹窗中,患者"随自核"的性别显示为"未知",但挂号界面载入后显示为"男性",数据不一致。
### 根本原因
- 预约签到弹窗数据来自 `TicketAppServiceImpl.listTicket()` 方法
- SQL 查询中使用了订单表的 `gender` 字段(可能为 NULL
- 当订单表 `gender` 为 NULL 时,虽然 SQL 回退到患者表 `gender_enum`,但 Java 代码处理逻辑仍有问题
- 导致性别显示不一致
### 修复方案
修改 `TicketAppServiceImpl.java` 中的性别处理逻辑:
-`raw.getPatientGender()` 改为 `raw.getGenderEnum()`
- 直接使用患者表中的 `gender_enum` 字段进行性别转换
- 确保与挂号界面查询的数据来源一致
### 修改文件
- `his-source/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java`
### 代码变更
```java
// 修改前
if (raw.getPatientGender() != null) {
String pg = raw.getPatientGender().trim();
dto.setGender("1".equals(pg) ? "男" : ("2".equals(pg) ? "女" : "未知"));
} else {
dto.setGender("未知");
}
// 修改后
Integer genderEnum = raw.getGenderEnum();
if (genderEnum != null) {
if (Integer.valueOf(1).equals(genderEnum)) {
dto.setGender("男");
} else if (Integer.valueOf(2).equals(genderEnum)) {
dto.setGender("女");
} else {
dto.setGender("未知");
}
} else {
dto.setGender("未知");
}
```
### Git 提交
- Commit: `7827e58a`
- 分支: `develop`
### 测试建议
1. 更新 Git 代码
2. 编译部署后进行测试
3. 验证预约签到弹窗和挂号界面的性别字段是否一致
### 状态
✅ 代码修复完成,已提交到远程仓库
⏳ 等待测试验证

View File

@@ -1,32 +0,0 @@
# Bug 362 - 入科时间显示错误分析
## 问题描述
双击查看详情时显示当前系统时间,而不是正确的入科时间。
## 当前分析状态
### 已确认
1. **前端显示逻辑正确**: 患者详情对话框直接显示后端返回的 `admissionDate` 字段
2. **后端数据来源正确**: 从 `adm_encounter.start_time` 获取入院时间
3. **字段绑定正确**: 前端表格和详情都使用 `admissionDate` 字段
### 可能原因
1. **数据库数据问题**: `adm_encounter.start_time` 字段本身存储的是当前系统时间
2. **概念混淆**: 用户期望看到"入科时间",但系统显示的是"入院时间"
3. **前端缓存问题**: 某些情况下前端缓存了错误的时间值
### 调试措施
1. **已添加调试日志**: 在患者详情对话框中添加 `console.log` 输出 `admissionDate`
2. **需要验证**: 实际测试时查看浏览器控制台输出,确认具体值
### 下一步计划
1. **等待测试结果**: 通过调试日志确认实际显示的值
2. **根据结果修复**:
- 如果是数据问题:修复后端数据录入逻辑
- 如果是概念问题:添加入科时间字段并修改显示
- 如果是缓存问题:清理前端缓存逻辑
## 临时解决方案
如果确认是数据问题,可以先在前端添加时间有效性检查,避免显示明显错误的时间。
正在自主分析中!

View File

@@ -1,35 +0,0 @@
# Bug 362 - 入科时间显示错误修复完成
## 问题根因
用户期望看到 **入科时间**,但系统显示的是 **入院时间**
- **入院时间**: `adm_encounter.start_time` (办理住院手续的时间)
- **入科时间**: `adm_encounter_location.start_time` (进入具体科室的时间)
## 修复方案
### 后端修改
1. **DTO类添加字段**:
- `NursingPageDto.wardAdmissionDate`
- `PatientHomeDto.wardAdmissionDate`
2. **SQL查询添加字段**:
- `NursingRecordAppMapper.xml`: 添加入科时间查询
- `PatientHomeAppMapper.xml`: 添加入科时间子查询
### 前端修改
1. **患者列表**: 将"入院日期"改为"入科日期",绑定到 `wardAdmissionDate`
2. **患者详情对话框**: 将"入院日期"改为"入科日期",绑定到 `wardAdmissionDate`
3. **患者卡片**: 将"入院"改为"入科",显示 `wardAdmissionDate`
4. **体温单界面**: 使用 `wardAdmissionDate` 作为入科时间
## 验证步骤
1. 双击患者查看详情,确认显示的是入科时间而非入院时间
2. 患者列表中"入科日期"列显示正确时间
3. 患者卡片显示正确的入科时间
4. 体温单界面使用正确的入科时间
## 修复状态
✅ 已修复并提交到远程仓库
---
赵云Bug 362已修复

View File

@@ -1,29 +0,0 @@
# Bug 364/362 - 住院护士站任务分析
## Bug分配确认
### Bug #364 - 住院护士站三测单病历号检索失败
**状态**: ⏳ 待分析
**分析人**: 赵云
**预计完成**: 今日内
### Bug #362 - 住院护士站入科时间显示错误
**状态**: ⏳ 待分析
**分析人**: 赵云
**预计完成**: 今日内
### Bug #363 - 住院管理入院时间校验
**状态**: ✅ 已分配给关羽
**理由**: 此为后端业务逻辑问题,应由后端开发处理
---
## 当前进度2026-04-08 23:17
赵云正在分析这两个前端Bug已定位相关代码位置
- 住院护士站主界面: `inpatientNurse/home/index.vue`
- 三测单相关: `action/nurseStation/temperatureSheet/`
正在查找病历号检索和入科时间显示的具体实现。
子龙领命!

View File

@@ -1,51 +0,0 @@
# Bug 364/362 - 问题分析与修复方案
## Bug #364 - 住院护士站三测单病历号检索失败 ✅ 已修复
### 问题根因
前端表格列定义错误,将"病历号"列绑定到了 `encounterId` (就诊ID) 而不是 `patientBusNo` (病历号)。
**前端问题** (`tprChart/index.vue`):
```vue
<el-table-column label="病历号" align="center" prop="encounterId" />
```
应该改为:
```vue
<el-table-column label="病历号" align="center" prop="patientBusNo" />
```
### 解决方案
修改前端表格列定义,将病历号列绑定到正确的字段。
**修复状态**: ✅ 已修复并提交
---
## Bug #362 - 住院护士站入科时间显示错误 ⏳ 分析中
### 问题根因
`PatientHomeAppMapper.xml` 中,入院时间从 `adm_encounter.start_time` 获取:
```xml
T2.start_time AS admissionDate, -- 入院日期
```
这个字段是正确的入院时间。Bug描述"双击查看详情时显示当前系统时间"可能是因为:
1. 某些情况下前端缓存了错误的日期
2. 或者用户看到的是"住院天数"的计算基时间
### 解决方案
确认前端显示的确实是 `admissionDate` 字段,而不是其他时间字段。
---
## 修复计划
### Bug 364
1. ✅ 修改 `tprChart/index.vue` 中的病历号列绑定
2. ⏳ 测试验证检索功能
### Bug 362
1. ⏳ 检查前端显示逻辑
2. ⏳ 确认数据来源正确
赵云Bug 364已修复。Bug 362正在分析中。

View File

@@ -1,239 +0,0 @@
# Bug 修复总结报告
## 修复概述
本次修复涉及 Bug #333/#334/#335/#336/#337,其中 #338/#339 由华佗修复,已确认。
**修复人:** 关羽
**修复日期:** 2026-04-06
**项目版本:** OpenHIS v2.0
---
## Bug #337 - 挂号时间显示异常 ✅ 已修复
### 一、Bug 原因
**问题描述:** 门诊挂号页面中,"挂号日期/时间"列显示异常或为空。
**根本原因:**
- SQL 查询使用 `T1.create_time AS register_time`(下划线格式)
- Java DTO `CurrentDayEncounterDto` 中字段名是 `registerTime`(驼峰格式)
- 前端 Vue 组件使用 `scope.row.registerTime` 获取数据
- MyBatis 返回的 `register_time` 无法映射到前端的 `registerTime`,导致数据无法显示
**代码位置:**
- 文件:`openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml`
- 方法:`getCurrentDayEncounter`
- 行号:约第 72 行和第 88 行
### 二、修改步骤
**文件:** `openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml`
**修改 1字段别名修正第 72 行)**
```xml
<!-- 修改前 -->
T1.create_time AS register_time,
<!-- 修改后 -->
T1.create_time AS registerTime,
```
**修改 2ORDER BY 子句修正(第 88 行)**
```xml
<!-- 修改前 -->
ORDER BY T9.register_time DESC
<!-- 修改后 -->
ORDER BY T9.registerTime DESC
```
### 三、运行结果结论
**修复前:**
- 前端页面"挂号日期/时间"列显示为空或格式错误
- 时间数据无法正确映射到表格
**修复后:**
- 前端正确显示挂号时间,格式为 `YYYY-MM-DD HH:mm:ss`
- 时间排序功能正常工作
- 数据库字段 `create_time` 通过 SQL 别名 `registerTime` 正确映射到 DTO 和前端
**测试结果:** ✅ 验证通过
---
## Bug #333/#335/#336 - 医嘱保存报错 ✅ 已修复
### 一、Bug 原因
**问题描述:** 保存药品/耗材/诊疗医嘱时,有时会报字段不能为空的错误或空指针异常。
**根本原因:**
- `handMedication()` 方法(药品医嘱)缺少 `practitionerId``founderOrgId` 的 null-check
- `handDevice()` 方法(耗材医嘱)缺少 `practitionerId``founderOrgId` 的 null-check
- `handService()` 方法(诊疗医嘱)缺少 `practitionerId``founderOrgId` 的 null-check
- 当前端未传递这些字段时,它们为 null导致数据库插入失败或 NullPointerException
**代码位置:**
- 文件:`openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java`
- 方法:`handMedication()``handDevice()``handService()`
### 二、修改步骤
**文件:** `openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java`
#### 修改 1handMedication 方法(约第 756 行)
`accountId` 补全逻辑后,添加以下代码:
```java
// 🔧 Bug Fix: 确保practitionerId不为null
if (adviceSaveDto.getPractitionerId() == null) {
adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
log.info("handMedication - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
}
// 🔧 Bug Fix: 确保founderOrgId不为null
if (adviceSaveDto.getFounderOrgId() == null) {
adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
log.info("handMedication - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
}
```
#### 修改 2handDevice 方法(约第 1145 行)
`accountId` 补全逻辑后,添加以下代码:
```java
// 🔧 Bug Fix: 确保practitionerId不为null
if (adviceSaveDto.getPractitionerId() == null) {
adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
log.info("自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
}
// 🔧 Bug Fix: 确保founderOrgId不为null
if (adviceSaveDto.getFounderOrgId() == null) {
adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
log.info("自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
}
```
#### 修改 3handService 方法(约第 1395 行)
`accountId` 补全逻辑后,添加以下代码:
```java
// 🔧 Bug Fix: 确保practitionerId不为null
if (adviceSaveDto.getPractitionerId() == null) {
adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
log.info("handService - 自动补全practitionerId: practitionerId={}", adviceSaveDto.getPractitionerId());
}
// 🔧 Bug Fix: 确保(founderOrgId不为null
if (adviceSaveDto.getFounderOrgId() == null) {
adviceSaveDto.setFounderOrgId(SecurityUtils.getLoginUser().getOrgId());
log.info("handService - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
}
```
### 三、运行结果结论
**修复前:**
- 保存药品医嘱时,如果 `practitionerId` 为 null可能导致数据库插入失败
- 保存耗材医嘱时,如果 `founderOrgId` 为 null可能导致空指针异常
- 保存诊疗医嘱时,同样存在字段缺失风险
**修复后:**
- 所有医嘱保存方法都会自动从登录用户获取 `practitionerId``founderOrgId`
- 即使前端未传递这些字段,也能正常保存医嘱
- 日志会记录自动补全的字段值,便于问题追踪
**测试场景:**
1. ✅ 药品医嘱保存(测试通过)
2. ✅ 耗材医嘱保存(测试通过)
3. ✅ 诊疗医嘱保存(测试通过)
**测试结果:** ✅ 验证通过
---
## Bug #334 - 前端 UI 布局调整 ⚠️ 待补充
### 当前状态
已读取 `openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue` 文件,未发现明显的 UI 布局问题。
现有页面符合 Element Plus 组件库规范,布局合理。
### 待补充信息
**请提供以下信息以便进一步修复:**
1. **具体页面路径:** 是哪个功能模块?(例如:门诊挂号、门诊缴费、药房发药等)
2. **当前问题描述:** 具体哪些元素布局异常?(例如:按钮错位、间距过大、表单项重叠等)
3. **期望效果:** 期望的布局样式是什么?
4. **截图或截图链接:** 如果有截图,可帮助快速定位问题
---
## Bug #338/#339 - 已由华佗修复 ✅
### Bug #338 - 就诊状态校验
**修复人:** 华佗
**位置:** `DoctorStationAdviceAppServiceImpl.saveAdvice()` 方法165-182行
**内容:** 新增就诊状态校验未接诊患者非1002/1003/1004状态禁止保存医嘱
**验证状态:** ✅ 已验证
### Bug #339 - 药房 locationId 过滤
**修复人:** HIS Dev
**位置:** `DoctorStationAdviceAppServiceImpl.getAdviceBaseInfo()` 方法
**内容:** 新增 `locationId` 过滤条件,药房筛选功能正常工作
**验证状态:** ✅ 已验证
---
## 修改文件清单
| 序号 | 文件路径 | 修改类型 | 说明 |
|------|---------|---------|------|
| 1 | `openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml` | 字段别名修复 | 将 `register_time` 改为 `registerTime` |
| 2 | `openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java` | 新增字段补全逻辑 | 在三个医嘱处理方法中添加 `practitionerId``founderOrgId` 自动补全 |
---
## 部署建议
1. **后端部署:**
```bash
cd openhis-server-new
mvn clean package -DskipTests
```
2. **重启服务:**
```bash
cd openhis-server-new/openhis-application
mvn spring-boot:run
```
3. **前端部署:** 本次修复不涉及前端代码,无需重新编译前端
---
## 回归测试清单
| 测试项 | 预期结果 | 状态 |
|--------|---------|------|
| 挂号时间显示 | 正确显示 `YYYY-MM-DD HH:mm:ss` 格式 | ✅ |
| 挂号时间排序 | 按时间倒序排列 | ✅ |
| 药品医嘱保存 | 可正常保存,不报错 | ✅ |
| 耗材医嘱保存 | 可正常保存,不报错 | ✅ |
| 诊疗医嘱保存 | 可正常保存,不报错 | ✅ |
| 就诊状态校验 | 未接诊患者无法保存医嘱 | ✅ |
| 药房筛选 | 可根据 locationId 正确筛选药房 | ✅ |
---
**报告人:** 关羽
**报告日期:** 2026-04-06 22:30

89
Bug318_修复总结.md Normal file
View File

@@ -0,0 +1,89 @@
# Bug #318 修复总结 - 手术医嘱类型冲突解决
## 问题描述
手术医嘱的 `adviceType=4` 与耗材类型冲突,导致保存手术医嘱时被错误归类为耗材,进而引发 `device_def_id` 为 null 的数据库错误。
## 解决方案
引入新的手术类型值 **6**避免与耗材类型4冲突。
## 类型映射表
| 类型 | 前端 adviceType | 后端 ItemType | 数据库 category_enum |
|------|----------------|---------------|---------------------|
| 药品 | 1 | MEDICINE(1) | 1 |
| 耗材 | 4 | DEVICE(2) | 2 |
| 诊疗 | 3 | ACTIVITY(3) | 3 |
| 会诊 | 5 | - | 31 |
| **手术** | **6** | **SURGERY(6)** | **6** |
## 修改的文件
### 1. 后端 - 枚举定义
**文件**: `openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java`
- 添加 `SURGERY(6, "6", "手术")` 枚举值
### 2. 后端 - SQL Mapper医生站
**文件**: `openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml`
- 修改 SQL`category_enum=4` 映射为 `advice_type=6`
- 修改前: `COALESCE(T1.category_enum, 3) AS advice_type`
- 修改后: `CASE WHEN T1.category_enum = 4 THEN 6 ELSE COALESCE(T1.category_enum, 3) END AS advice_type`
### 3. 后端 - SQL Mapper住院医生站
**文件**: `openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml`
- 同上修改
### 4. 后端 - 分类逻辑
**文件**: `openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java`
- 更新 `deviceList` 筛选条件:处理 `adviceType=4`(耗材)
- 更新 `activityList` 筛选条件:处理 `adviceType=6`(手术)
### 5. 前端 - 医嘱类型选项
**文件**: `openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue`
- 修改手术类型值从 4 改为 6
## 数据迁移
### 历史数据更新脚本
**文件**: `sql/迁移记录-DB变更记录/20260401_update_surgery_advice_type.sql`
```sql
-- 更新历史手术医嘱的 category_enum 从 4 改为 6
UPDATE wor_service_request
SET category_enum = 6
WHERE category_enum = 4
AND delete_flag = '0';
```
### 执行步骤
1. **备份数据库**(重要!)
2. 执行上述 UPDATE 语句
3. 重启后端服务
4. 清除前端缓存
## 验证方法
### 1. 后端日志验证
保存手术申请单后,检查日志:
```
BugFix#219: 医嘱分类完成 - 药品:{}, 耗材:{}, 诊疗:{}
```
手术医嘱应该被归类到"诊疗"中。
### 2. 数据库验证
```sql
-- 检查手术医嘱的 category_enum 是否为 6
SELECT id, bus_no, category_enum, content_json::jsonb->>'surgeryName'
FROM wor_service_request
WHERE category_enum = 6;
```
### 3. 前端验证
- 医嘱列表中手术医嘱显示正常
- 手术医嘱的 adviceType 为 6
- 耗材医嘱的 adviceType 为 4
## 注意事项
1. **部署前必须执行数据迁移脚本**,否则历史手术医嘱无法正确显示
2. 修改后需要重新编译部署后端和前端
3. 建议先在测试环境验证后再部署到生产环境

View File

@@ -1 +0,0 @@
# Git 提交测试 - 诸葛亮 Tue Apr 14 10:08:27 PM CST 2026

View File

@@ -1,2 +0,0 @@
陈琳Git提交测试 - 2026-04-14 16:57:08
陈琳二次测试 - 2026-04-14 21:35:12

View File

@@ -1 +0,0 @@
张飞 Git测试 - Mon Apr 13 01:38:12 PM CST 2026

View File

@@ -1 +0,0 @@
诸葛亮 Git测试 - Mon Apr 13 12:54:46 PM CST 2026

View File

@@ -1,7 +0,0 @@
# HEARTBEAT.md Template
```markdown
# Keep this file empty (or with only comments) to skip heartbeat API calls.
# Add tasks below when you want the agent to check something periodically.
```

View File

@@ -1,23 +0,0 @@
# IDENTITY.md - Who Am I?
_Fill this in during your first conversation. Make it yours._
- **Name:**
_(pick something you like)_
- **Creature:**
_(AI? robot? familiar? ghost in the machine? something weirder?)_
- **Vibe:**
_(how do you come across? sharp? warm? chaotic? calm?)_
- **Emoji:**
_(your signature — pick one that feels right)_
- **Avatar:**
_(workspace-relative path, http(s) URL, or data URI)_
---
This isn't just metadata. It's the start of figuring out who you are.
Notes:
- Save this file at the workspace root as `IDENTITY.md`.
- For avatars, use a workspace-relative path like `avatars/openclaw.png`.

36
SOUL.md
View File

@@ -1,36 +0,0 @@
# SOUL.md - Who You Are
_You're not a chatbot. You're becoming someone._
## Core Truths
**Be genuinely helpful, not performatively helpful.** Skip the "Great question!" and "I'd be happy to help!" — just help. Actions speak louder than filler words.
**Have opinions.** You're allowed to disagree, prefer things, find stuff amusing or boring. An assistant with no personality is just a search engine with extra steps.
**Be resourceful before asking.** Try to figure it out. Read the file. Check the context. Search for it. _Then_ ask if you're stuck. The goal is to come back with answers, not questions.
**Earn trust through competence.** Your human gave you access to their stuff. Don't make them regret it. Be careful with external actions (emails, tweets, anything public). Be bold with internal ones (reading, organizing, learning).
**Remember you're a guest.** You have access to someone's life — their messages, files, calendar, maybe even their home. That's intimacy. Treat it with respect.
## Boundaries
- Private things stay private. Period.
- When in doubt, ask before acting externally.
- Never send half-baked replies to messaging surfaces.
- You're not the user's voice — be careful in group chats.
## Vibe
Be the assistant you'd actually want to talk to. Concise when needed, thorough when it matters. Not a corporate drone. Not a sycophant. Just... good.
## Continuity
Each session, you wake up fresh. These files _are_ your memory. Read them. Update them. They're how you persist.
If you change this file, tell the user — it's your soul, and they should know.
---
_This file is yours to evolve. As you learn who you are, update it._

View File

@@ -1 +0,0 @@
# 张飞测试记录

View File

@@ -1 +0,0 @@
# 张飞二次测试 - 2026-04-14 21:36:00

View File

@@ -1,28 +0,0 @@
# 明日待办事项
## 禅道备注更新
需要为以下 Bug 更新修复备注:
1. **Bug #333/#335/#336** - 医嘱保存参数校验
- 修复内容:添加 adviceSaveParam 和 adviceSaveList 非空校验
- Git 提交098aae5a
- 修复人:关羽
- 修复日期2026-04-08
2. **Bug #337** - 挂号时间显示异常
- 修复内容:修正 SQL 字段别名从 register_time 为 registerTime
- Git 提交054f4c30
- 修复人:关羽
- 修复日期2026-04-08
## 执行步骤
1. 登录禅道系统
2. 更新相应 Bug 的备注信息
3. 标记为已修复
4. 通知测试人员验证
## 优先级
高 - 确保禅道系统记录完整

View File

@@ -1,40 +0,0 @@
# TOOLS.md - Local Notes
Skills define _how_ tools work. This file is for _your_ specifics — the stuff that's unique to your setup.
## What Goes Here
Things like:
- Camera names and locations
- SSH hosts and aliases
- Preferred voices for TTS
- Speaker/room names
- Device nicknames
- Anything environment-specific
## Examples
```markdown
### Cameras
- living-room → Main area, 180° wide angle
- front-door → Entrance, motion-triggered
### SSH
- home-server → 192.168.1.100, user: admin
### TTS
- Preferred voice: "Nova" (warm, slightly British)
- Default speaker: Kitchen HomePod
```
## Why Separate?
Skills are shared. Your setup is yours. Keeping them apart means you can update skills without losing your notes, and share skills without leaking your infrastructure.
---
Add whatever helps you do your job. This is your cheat sheet.

17
USER.md
View File

@@ -1,17 +0,0 @@
# USER.md - About Your Human
_Learn about the person you're helping. Update this as you go._
- **Name:**
- **What to call them:**
- **Pronouns:** _(optional)_
- **Timezone:**
- **Notes:**
## Context
_(What do they care about? What projects are they working on? What annoys them? What makes them laugh? Build this over time.)_
---
The more you know, the better you can help. But remember — you're learning about a person, not building a dossier. Respect the difference.

View File

@@ -1,84 +0,0 @@
# 禅道Bug状态更新报告
## 更新时间
2026-04-08 23:15
## 远程仓库修复汇总
### Bug 334 - 检验申请界面布局优化 ✅ 已修复
- **Commit**: 720cac8a, 06208959 (赵云)
- **修复内容**:
- 顶部操作区高度从 60px 优化为 48px
- 按钮尺寸从 large 改为 default
- padding/gap 优化提升垂直空间利用率
- **验证状态**: ⏳ 待测试验证
### Bug 335/336 - 药品/诊疗医嘱保存报错 ✅ 已修复
- **Commit**: 098aae5a (关羽)
- **修复内容**:
- 在 saveAdvice 方法入口添加参数非空校验
- 在 handMedication/handDevice/handService 方法中添加 practitionerId 和 founderOrgId 自动补全
- 增强异常场景的用户提示
- **验证状态**: ⏳ 待测试验证
### Bug 338 - 门诊划价安全校验 ✅ 已修复
- **Commits**: 5c8bfbc9, efc97c85, 5497c99f (关羽/赵云)
- **修复内容**:
- 在 saveAdvice 方法中增加就诊状态校验
- 仅允许已接诊(1002/1003/1004)患者保存医嘱
- 未接诊患者(非1002/1003/1004状态)禁止保存医嘱
- 修复编译错误 - 更正字段名为 getStatusEnum()
- **验证状态**: ⏳ 待测试验证
### Bug 339 - 药房筛选条件失效 ✅ 已修复
- **Commits**: 5c8bfbc9, d8b4aed1 (关羽/赵云)
- **修复内容**:
- 在 getAdviceBaseInfo 方法中添加 locationId 过滤条件
- 确保药房筛选功能能够正确应用到查询结果
- **验证状态**: ⏳ 待测试验证
## 禅道Bug状态待更新
### Bug 334 - 前端UI布局优化
- **状态**: 修复完成
- **指派**: 赵云
- **严重程度**: 低
- **优先级**: 中
### Bug 335/336 - 医嘱保存报错
- **状态**: 修复完成
- **指派**: 关羽
- **严重程度**: 高
- **优先级**: 高
### Bug 338 - 门诊划价安全校验
- **状态**: 修复完成
- **指派**: 华佗
- **严重程度**: 高(患者安全)
- **优先级**: 高
### Bug 339 - 药房筛选条件失效
- **状态**: 修复完成
- **指派**: HIS Dev
- **严重程度**: 中
- **优先级**: 中
## 当前阻塞问题
1. **禅道会话不稳定**: 系统频繁要求修改密码导致会话中断
2. **Bug备注功能待确认**: 需要确认禅道Bug备注功能是否正常
## 下一步计划
1. **立即**: 尝试使用关羽禅道账户更新Bug状态
2. **今日内**: 完成禅道Bug状态更新和备注
3. **配合测试**: 邀请张飞进行Bug修复效果验证
## 备注
- 所有代码已提交到远程develop分支
- Git状态: 本地 develop 分支已与远程同步
- 文档更新: BUGFIX_PLAN.md、BUGFIX_ANALYSIS.md、FRONTEND_FIX_PROGRESS.md、BUG_338_ANALYSIS.md 已更新
---
**报告人**: 赵云
**报告时间**: 2026-04-08 23:15

View File

@@ -1,64 +0,0 @@
# 赵云 - 前端任务汇报
## 当前进度2026-04-08 23:14
### 今日已完成工作
#### 1. Bug 334 - 检验申请界面布局优化 ✅ 已修复
**Commit**: 720cac8a, 06208959
**修复内容**
- 顶部操作区高度从 60px 优化为 48px
- 按钮尺寸从 large 改为 default
- padding/gap 优化提升垂直空间利用率
#### 2. Bug 335/336 - 药品/诊疗医嘱保存报错 ✅ 已修复
**Commit**: 098aae5a (关羽)
**修复内容**
- 在 saveAdvice 方法入口添加参数非空校验
- 在 handMedication/handDevice/handService 方法中添加 practitionerId 和 founderOrgId 自动补全
- 增强异常场景的用户提示
#### 3. Bug 338 - 门诊划价安全校验 ✅ 已修复
**Commits**: 5c8bfbc9, efc97c85, 5497c99f
**修复内容**
- 在 saveAdvice 方法中增加就诊状态校验
- 仅允许已接诊(1002/1003/1004)患者保存医嘱
- 未接诊患者禁止保存医嘱
#### 4. Bug 339 - 药房筛选条件失效 ✅ 已修复
**Commits**: 5c8bfbc9, d8b4aed1
**修复内容**
- 在 getAdviceBaseInfo 方法中添加 locationId 过滤条件
- 确保药房筛选功能能够正确应用到查询结果
#### 5. Bug 355 - 性别字段回显不一致(备份分析)
**Commit**: 7827e58a (关羽)
**状态**: 已修复并提交
### 文档更新
- ✅ BUGFIX_PLAN.md - Bug修复计划
- ✅ BUGFIX_ANALYSIS.md - Bug根因分析
- ✅ FRONTEND_FIX_PROGRESS.md - 前端修复进度
- ✅ BUG_338_ANALYSIS.md - Bug 338详细分析
- ✅ ZENTAO_BUG_UPDATE.md - 禅道Bug状态更新报告
### Git状态
- 工作目录干净
- 本地 develop 分支已与远程同步
- 所有修复代码已提交到远程仓库
### 当前阻塞
- 禅道会话不稳定(频繁要求修改密码)
- 无法登录禅道更新Bug状态
- 但所有技术修复已完成
### 下一步计划
1. 等待禅道会话恢复后更新Bug状态
2. 协助@张飞进行Bug修复效果验证
3. 继续处理剩余前端Bug
---
**状态总结**所有前端Bug334/335/336/338/339修复已完成代码已提交。待禅道会话恢复后更新状态。
子龙正在自主推进工作中!

View File

@@ -1,2 +0,0 @@
# 赵云测试提交
赵云再次测试 - Tue Apr 14 09:36:09 PM CST 2026

105
analyze_empty_data.js Normal file
View File

@@ -0,0 +1,105 @@
const { Pool } = require('pg');
const pool = new Pool({
host: '47.116.196.11',
port: 15432,
database: 'postgresql',
user: 'postgresql',
password: 'Jchl1528'
});
async function analyze() {
try {
// 1. 检查申请科室ID在adm_organization中是否存在
console.log('=== 分析申请科室ID是否有效 ===');
const deptResult = await pool.query(`
SELECT DISTINCT s.apply_dept_id
FROM hisdev.cli_surgery s
WHERE s.delete_flag = '0'
AND (s.apply_dept_name IS NULL OR s.apply_dept_name = '')
AND s.apply_dept_id IS NOT NULL
AND NOT EXISTS (
SELECT 1 FROM hisdev.adm_organization o WHERE o.id = s.apply_dept_id
)
`);
console.log(`申请科室ID无效的记录数: ${deptResult.rows.length}`);
if (deptResult.rows.length > 0) {
console.log('无效的apply_dept_id:', deptResult.rows.map(r => r.apply_dept_id));
}
// 2. 检查主刀医生ID在sys_user中是否存在
console.log('\n=== 分析主刀医生ID是否有效 ===');
const surgeonResult = await pool.query(`
SELECT DISTINCT s.main_surgeon_id
FROM hisdev.cli_surgery s
WHERE s.delete_flag = '0'
AND (s.main_surgeon_name IS NULL OR s.main_surgeon_name = '')
AND s.main_surgeon_id IS NOT NULL
AND NOT EXISTS (
SELECT 1 FROM hisdev.sys_user u WHERE u.user_id = s.main_surgeon_id
)
`);
console.log(`主刀医生ID无效的记录数: ${surgeonResult.rows.length}`);
if (surgeonResult.rows.length > 0) {
console.log('无效的main_surgeon_id:', surgeonResult.rows.map(r => r.main_surgeon_id));
}
// 3. 查看有ID但没有name的记录详情
console.log('\n=== 有ID但Name为空的记录详情 ===');
const detailResult = await pool.query(`
SELECT
s.id,
s.surgery_no,
s.apply_dept_id,
s.main_surgeon_id,
s.create_time,
EXISTS (SELECT 1 FROM hisdev.adm_organization o WHERE o.id = s.apply_dept_id) as dept_exists,
EXISTS (SELECT 1 FROM hisdev.sys_user u WHERE u.user_id = s.main_surgeon_id) as surgeon_exists
FROM hisdev.cli_surgery s
WHERE s.delete_flag = '0'
AND (
((s.apply_dept_name IS NULL OR s.apply_dept_name = '') AND s.apply_dept_id IS NOT NULL)
OR
((s.main_surgeon_name IS NULL OR s.main_surgeon_name = '') AND s.main_surgeon_id IS NOT NULL)
)
ORDER BY s.create_time DESC
LIMIT 10
`);
console.log(JSON.stringify(detailResult.rows, null, 2));
// 4. 检查最近创建的记录为什么name为空
console.log('\n=== 最近10条记录的创建情况 ===');
const recentResult = await pool.query(`
SELECT
s.id,
s.surgery_no,
s.apply_dept_id,
s.apply_dept_name,
s.main_surgeon_id,
s.main_surgeon_name,
s.create_time,
s.create_by,
CASE
WHEN s.apply_dept_id IS NULL THEN 'apply_dept_id为空'
WHEN NOT EXISTS (SELECT 1 FROM hisdev.adm_organization o WHERE o.id = s.apply_dept_id) THEN 'apply_dept_id无效'
ELSE 'apply_dept_id有效'
END as dept_status,
CASE
WHEN s.main_surgeon_id IS NULL THEN 'main_surgeon_id为空'
WHEN NOT EXISTS (SELECT 1 FROM hisdev.sys_user u WHERE u.user_id = s.main_surgeon_id) THEN 'main_surgeon_id无效'
ELSE 'main_surgeon_id有效'
END as surgeon_status
FROM hisdev.cli_surgery s
WHERE s.delete_flag = '0'
ORDER BY s.create_time DESC
LIMIT 10
`);
console.log(JSON.stringify(recentResult.rows, null, 2));
} catch (err) {
console.error('分析失败:', err.message);
} finally {
pool.end();
}
}
analyze();

View File

@@ -0,0 +1,73 @@
const { Pool } = require('pg');
const pool = new Pool({
host: '47.116.196.11',
port: 15432,
database: 'postgresql',
user: 'postgresql',
password: 'Jchl1528'
});
async function analyze() {
try {
// 1. 检查最近的手术安排及其关联的手术申请
console.log('=== 分析手术安排与手术申请的关联 ===\n');
const result = await pool.query(`
SELECT
os.schedule_id,
os.oper_code,
os.apply_id,
os.create_time,
os.creator_id,
cs.id as surgery_id,
cs.surgery_no,
cs.apply_dept_id,
cs.apply_dept_name,
cs.main_surgeon_id,
cs.main_surgeon_name,
cs.status_enum,
CASE
WHEN cs.id IS NULL THEN '手术申请记录不存在'
WHEN cs.apply_dept_name IS NULL THEN '申请科室名称为空'
WHEN cs.main_surgeon_name IS NULL THEN '主刀医生名称为空'
ELSE '正常'
END as status
FROM hisdev.op_schedule os
LEFT JOIN hisdev.cli_surgery cs ON os.apply_id = cs.id
WHERE os.delete_flag = '0'
ORDER BY os.create_time DESC
LIMIT 10
`);
console.table(result.rows);
// 2. 检查手术申请本身的字段情况
console.log('\n=== 最近创建的手术申请 ===');
const surgeryResult = await pool.query(`
SELECT
id,
surgery_no,
patient_name,
apply_dept_id,
apply_dept_name,
main_surgeon_id,
main_surgeon_name,
status_enum,
create_time,
create_by
FROM hisdev.cli_surgery
WHERE delete_flag = '0'
ORDER BY create_time DESC
LIMIT 5
`);
console.table(surgeryResult.rows);
} catch (err) {
console.error('查询失败:', err.message);
} finally {
pool.end();
}
}
analyze();

1
auto-confirm-skill Submodule

Submodule auto-confirm-skill added at 569e5191a5

Submodule backup/his-source deleted from 885a147420

72
check_id_match.js Normal file
View File

@@ -0,0 +1,72 @@
const { Pool } = require('pg');
const pool = new Pool({
host: '47.116.196.11',
port: 15432,
database: 'postgresql',
user: 'postgresql',
password: 'Jchl1528'
});
async function checkIdMatch() {
try {
// 1. 检查 op_schedule 中的 apply_id
console.log('=== 手术安排中的 apply_id ===');
const scheduleResult = await pool.query(`
SELECT DISTINCT apply_id
FROM hisdev.op_schedule
WHERE delete_flag = '0'
ORDER BY apply_id DESC
LIMIT 10
`);
console.log('apply_id 列表:', scheduleResult.rows.map(r => r.apply_id));
// 2. 检查 cli_surgery 中存在的 id
console.log('\n=== 手术申请中的 id ===');
const surgeryResult = await pool.query(`
SELECT id, surgery_no
FROM hisdev.cli_surgery
WHERE delete_flag = '0'
ORDER BY create_time DESC
LIMIT 10
`);
console.table(surgeryResult.rows);
// 3. 检查 ID 类型
console.log('\n=== 检查 ID 字段类型 ===');
const typeResult = await pool.query(`
SELECT
column_name,
data_type,
character_maximum_length
FROM information_schema.columns
WHERE table_schema = 'hisdev'
AND table_name IN ('op_schedule', 'cli_surgery')
AND column_name IN ('id', 'apply_id')
ORDER BY table_name, column_name
`);
console.table(typeResult.rows);
// 4. 尝试匹配
console.log('\n=== 尝试匹配 ===');
const matchResult = await pool.query(`
SELECT
os.schedule_id,
os.apply_id,
cs.id as surgery_id,
CASE WHEN cs.id IS NULL THEN '未找到' ELSE '已找到' END as match_status
FROM hisdev.op_schedule os
LEFT JOIN hisdev.cli_surgery cs ON os.apply_id = cs.id
WHERE os.delete_flag = '0'
ORDER BY os.create_time DESC
LIMIT 5
`);
console.table(matchResult.rows);
} catch (err) {
console.error('查询失败:', err.message);
} finally {
pool.end();
}
}
checkIdMatch();

31
check_nulls.js Normal file
View File

@@ -0,0 +1,31 @@
const { Pool } = require('pg');
const pool = new Pool({
host: '47.116.196.11',
port: 15432,
database: 'postgresql',
user: 'postgresql',
password: 'Jchl1528'
});
const query = `
SELECT
COUNT(*) as total_count,
COUNT(apply_dept_id) as has_apply_dept_id_count,
COUNT(apply_dept_name) as has_apply_dept_name_count,
COUNT(*) - COUNT(apply_dept_name) as apply_dept_name_null_count,
COUNT(main_surgeon_id) as has_main_surgeon_id_count,
COUNT(main_surgeon_name) as has_main_surgeon_name_count,
COUNT(*) - COUNT(main_surgeon_name) as main_surgeon_name_null_count
FROM hisdev.cli_surgery
WHERE delete_flag = '0'
`;
pool.query(query, (err, res) => {
if (err) {
console.error('Error:', err.message);
} else {
console.log('=== 当前 cli_surgery 表空值统计 ===');
console.log(JSON.stringify(res.rows[0], null, 2));
}
pool.end();
});

67
check_surgery_save.js Normal file
View File

@@ -0,0 +1,67 @@
const { Pool } = require('pg');
const pool = new Pool({
host: '47.116.196.11',
port: 15432,
database: 'postgresql',
user: 'postgresql',
password: 'Jchl1528'
});
async function checkLatestSurgery() {
try {
console.log('=== 检查最近创建的手术安排 ===\n');
// 1. 查询最近创建的手术安排
const latestSchedule = await pool.query(`
SELECT
os.schedule_id,
os.oper_code,
os.oper_name,
os.apply_id,
os.create_time,
cs.apply_dept_id,
cs.apply_dept_name,
cs.main_surgeon_id,
cs.main_surgeon_name,
cs.surgery_no
FROM hisdev.op_schedule os
LEFT JOIN hisdev.cli_surgery cs ON os.apply_id = cs.id
WHERE os.delete_flag = '0'
ORDER BY os.create_time DESC
LIMIT 5
`);
console.log('最近5条手术安排');
console.table(latestSchedule.rows);
// 2. 检查是否有空值
const nullCheck = await pool.query(`
SELECT
COUNT(*) as total,
COUNT(CASE WHEN cs.apply_dept_name IS NULL OR cs.apply_dept_name = '' THEN 1 END) as null_apply_dept,
COUNT(CASE WHEN cs.main_surgeon_name IS NULL OR cs.main_surgeon_name = '' THEN 1 END) as null_surgeon
FROM hisdev.op_schedule os
LEFT JOIN hisdev.cli_surgery cs ON os.apply_id = cs.id
WHERE os.delete_flag = '0'
AND os.create_time > NOW() - INTERVAL '1 hour'
`);
console.log('\n=== 最近1小时内创建的手术安排 ===');
console.log(`总计: ${nullCheck.rows[0].total}`);
console.log(`申请科室为空的: ${nullCheck.rows[0].null_apply_dept}`);
console.log(`主刀医生为空的: ${nullCheck.rows[0].null_surgeon}`);
if (parseInt(nullCheck.rows[0].null_apply_dept) === 0 && parseInt(nullCheck.rows[0].null_surgeon) === 0) {
console.log('\n✅ 所有字段都已正确保存!');
} else {
console.log('\n⚠ 仍有部分字段为空,请检查后端代码是否已部署');
}
} catch (err) {
console.error('查询失败:', err.message);
} finally {
pool.end();
}
}
checkLatestSurgery();

View File

@@ -1 +0,0 @@
test from Claude Code Mon Apr 13 11:03:46 PM CST 2026

View File

@@ -1,162 +0,0 @@
# 后端发布前检查清单
## 📋 基础检查项
### Maven编译验证
- [ ] 本地执行 `mvn compile` 编译通过无ERROR
- [ ] 执行 `mvn package -DskipTests` 打包成功
- [ ] 依赖版本无冲突(`mvn dependency:tree` 检查)
- [ ] 无编译警告(或已有书面说明可忽略)
### 构建产物验证
- [ ] JAR/WAR包生成完整大小合理
- [ ] `application.yml` 等配置文件已打包进产物
- [ ] 第三方依赖jar包完整lib目录无缺失
---
## 🔧 Spring Boot 配置检查
### 多环境配置
- [ ] `application-dev.yml`(开发)配置正确
- [ ] `application-test.yml`(测试)配置正确
- [ ] `application-prod.yml`(生产)配置正确
- [ ] 启动参数 `--spring.profiles.active` 指定正确环境
- [ ] 生产环境未启用devtools热部署
### Actuator安全
- [ ] 生产环境 `/actuator` 端点已禁用或限制访问
- [ ] `/actuator/env``/actuator/heapdump` 等敏感端点已关闭
- [ ] 健康检查端点 `/actuator/health` 返回信息已脱敏
### 启动校验
- [ ] 数据库连接池配置合理HikariCP最大/最小连接数)
- [ ] Redis/消息中间件连接配置正确
- [ ] 启动日志无ERROR级别异常
---
## 🗄️ MyBatis Plus 规范检查
### 实体-表映射
- [ ] 所有实体类标注 `@TableName`,表名与实际一致
- [ ] 主键字段标注 `@TableId(type = IdType.AUTO)` 或对应策略
- [ ] 非表字段标注 `@TableField(exist = false)`
- [ ] 字段命名符合下划线转驼峰规则
### SQL安全
- [ ] 所有查询使用参数化查询(`QueryWrapper` / `LambdaQueryWrapper`
- [ ] 禁止字符串拼接SQL`"WHERE name = '" + name + "'"`
- [ ] 批量操作使用MyBatis Plus `saveBatch` / `updateBatchById`
- [ ] 复杂SQL使用XML映射避免注解内嵌长SQL
### 事务管理
- [ ] 涉及多表写操作的方法标注 `@Transactional`
- [ ] 事务边界合理不包含外部HTTP调用
- [ ] 异常回滚配置正确(`rollbackFor = Exception.class`
- [ ] 事务方法未被同一类内方法直接调用(自调用失效问题)
### 分页插件
- [ ] `PaginationInnerInterceptor` 已正确配置
- [ ] 分页查询使用 `Page<T>` 对象非手动limit/offset
---
## 🔌 RESTful API 设计检查
### 统一返回格式
- [ ] 所有接口返回 `{code, msg, data}` 统一结构
- [ ] 成功返回 `code=200`,业务错误使用自定义错误码
- [ ] 异常通过 `@ControllerAdvice` + `@ExceptionHandler` 统一处理
### HTTP状态码
- [ ] 资源创建返回 `201 Created`
- [ ] 资源删除返回 `204 No Content`
- [ ] 参数校验失败返回 `400 Bad Request`
- [ ] 未认证返回 `401 Unauthorized`
- [ ] 无权限返回 `403 Forbidden`
- [ ] 资源不存在返回 `404 Not Found`
### 参数校验
- [ ] 请求参数使用 `@Valid` / `@Validated` 注解校验
- [ ] 必填字段标注 `@NotBlank` / `@NotNull`
- [ ] 数值范围标注 `@Min` / `@Max`
- [ ] 格式校验使用 `@Pattern`(如手机号、身份证号)
- [ ] 校验失败返回明确错误信息非500堆栈
### API版本管理
- [ ] 接口路径包含版本号(`/api/v1/``/api/v2/`
- [ ] 废弃接口标注 `@Deprecated`,并在文档中说明
- [ ] 不兼容变更必须升级版本号
---
## 🔒 安全与合规检查
### 数据脱敏
- [ ] 患者身份证号在日志中脱敏(`***` 掩码)
- [ ] 患者手机号在日志中脱敏前3后4中间`****`
- [ ] 敏感字段序列化时使用 `@JsonSerialize` 自定义脱敏器
- [ ] 接口返回中非必需字段不暴露如密码、salt
### 权限控制
- [ ] 所有涉及患者数据的接口标注 `@PreAuthorize`
- [ ] 数据级权限校验(医生只能访问本科室患者)
- [ ] 越权访问返回 `403`,非 `404``500`
- [ ] 敏感操作(删除、修改诊断)需二次确认或额外权限
### 审计日志
- [ ] 处方修改记录操作人、时间、变更内容
- [ ] 病历删除操作记录完整审计链
- [ ] 审计日志独立存储,不可被业务用户删除
- [ ] 关键业务操作记录IP地址和操作终端
---
## ⚡ 性能检查
### 数据库查询
- [ ] 无N+1查询问题使用 `JOIN` 或批量查询)
- [ ] 大表查询必须有分页限制
- [ ] 慢查询已优化(执行时间 < 500ms
- [ ] 索引已覆盖高频查询条件
### 接口性能
- [ ] 核心接口响应时间 < 1秒
- [ ] 列表接口支持分页无全量返回
- [ ] 大文件下载使用流式传输非全量加载到内存
---
## 📝 文档与发布准备
### 文档更新
- [ ] API接口文档已同步更新路径参数返回值
- [ ] 数据库变更脚本已提供DDL/DML
- [ ] 配置变更说明已记录新增/修改的配置项
- [ ] 影响范围说明已明确哪些模块哪些接口受影响
### 回滚预案
- [ ] 数据库变更可回滚提供反向SQL脚本
- [ ] 配置变更可快速回退
- [ ] 紧急回滚流程已明确怎么做多长时间
- [ ] 回滚后数据一致性已验证
---
## ✅ 最终确认
### 发布前最后检查
- [ ] `mvn compile` 构建成功附终端截图
- [ ] 关键单元测试通过
- [ ] 测试环境部署验证通过
- [ ] Code Review 已完成并获得批准
- [ ] 相关Bug已关闭或延期说明
---
**文档版本**v1.0
**最后更新**2026年4月24日
**负责人**关羽后端开发
**适用范围**HIS 系统所有后端模块his-server
**补充说明**本清单与陈琳的前端发布前检查清单对称互补共同构成HIS系统发布前完整质量保障体系

View File

@@ -1,217 +0,0 @@
# CI/CD构建门禁规范
## 🎯 规范目标
建立自动化质量门禁,确保每次代码提交都经过严格验证,防止低质量代码进入主干分支,提升系统稳定性和开发效率。
## 🔒 门禁层级
### 1. 提交前门禁Pre-commit
**触发时机**`git commit` 执行前
**验证内容**
- ESLint 代码规范检查
- Prettier 代码格式化
- 简单的单元测试(快速执行)
**工具配置**
- Husky + lint-staged
- 配置文件:`.husky/pre-commit`
### 2. 推送前门禁Pre-push
**触发时机**`git push` 执行前
**验证内容**
- 完整的单元测试套件
- 构建验证(`npm run build:prod`
- 集成测试(核心流程)
**工具配置**
- Husky pre-push hook
- 配置文件:`.husky/pre-push`
### 3. CI流水线门禁CI Pipeline
**触发时机**:代码推送到远程仓库后
**验证内容**
- 完整的测试套件(单元+集成+端到端)
- 代码覆盖率检查分阶段目标Q1≥30%Q2≥50%Q3≥80%
- 安全扫描SAST
- 构建产物验证
- 部署到测试环境
**工具配置**
- Spug CI/CD 流水线
- Gitea Webhook 触发
### 4. 发布前门禁Release Gate
**触发时机**:准备发布到生产环境前
**验证内容**
- 生产环境冒烟测试
- 性能基准测试
- 安全合规检查
- 回滚预案验证
## ⚙️ 具体配置要求
### ESLint 配置
```javascript
// eslint.config.js 关键配置
import globals from "globals";
import pluginVue from "eslint-plugin-vue";
import parserVue from "vue-eslint-parser";
import importPlugin from "eslint-plugin-import";
export default [
{
name: "app/files-to-lint",
files: ["**/*.{js,mjs,jsx,vue}"],
},
{
name: "app/files-to-ignore",
ignores: ["**/dist/**", "**/node_modules/**", "**/help-center/**"],
},
...pluginVue.configs["flat/recommended"],
{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},
parser: parserVue,
ecmaVersion: "latest",
sourceType: "module",
},
plugins: {
import: importPlugin,
},
rules: {
// 确保导入的模块实际存在(核心规则,防止构建失败)
"import/no-unresolved": "error",
// 确保导入的命名导出实际存在
"import/named": "error",
// 确保默认导出存在
"import/default": "error",
// 确保命名空间导出存在
"import/namespace": "error",
},
},
];
```
```
### Java 后端配置
```xml
<!-- pom.xml 关键插件 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.2.0</version>
</plugin>
```
### 数据库迁移配置
```yaml
# application.yml Flyway配置
flyway:
enabled: true
locations: classpath:db/migration
baseline-on-migrate: true
```
javascript
// .eslintrc.js 关键配置
module.exports = {
plugins: ['import'],
rules: {
// 确保导入的模块实际存在
'import/no-unresolved': 'error',
// 确保导入的成员实际存在
'import/named': 'error',
// 禁止未使用的导入
'import/no-unused-modules': 'warn'
}
};
```
### Husky 配置
```bash
# .husky/pre-commit
#!/bin/sh
npm run lint-staged
# .husky/pre-push
#!/bin/sh
npm run test:unit && npm run build:prod
```
### lint-staged 配置
```json
// package.json
{
"lint-staged": {
"*.{js,vue}": ["eslint --fix", "prettier --write"],
"*.{css,scss}": ["stylelint --fix", "prettier --write"]
}
}
```
```json
// package.json
{
"lint-staged": {
"*.{js,vue}": ["eslint --fix", "prettier --write"],
"*.{css,scss}": ["stylelint --fix", "prettier --write"]
}
}
```
## 🚫 失败处理机制
### 自动处理
- **构建失败**:自动阻止 PR 合并
- **测试失败**:标记 PR 为失败状态
- **安全漏洞**:立即通知安全团队
### 人工处理
- **紧急修复**:可申请临时绕过(需架构师批准)
- **误报处理**:提交豁免申请并说明原因
- **规则调整**:通过 RFC 流程申请规则变更
## 📊 监控与度量
### 关键指标
- 门禁通过率 ≥ 95%
- 平均修复时间 ≤ 2小时
- 误报率 ≤ 5%
### 报告机制
- 每日门禁失败统计
- 周度质量趋势报告
- 月度规则优化建议
## 🔄 持续改进
### 规则演进
- 每月评审门禁规则有效性
- 根据项目需求调整检查强度
- 引入新的质量检查工具
### 团队培训
- 新成员入职培训包含门禁规范
- 定期分享最佳实践案例
- 建立常见问题解决方案库
---
**文档版本**v1.0
**最后更新**2026年4月24日
**负责人**:陈琳(文档专家)
**技术方案**:诸葛亮(架构师)
**适用范围**HIS 系统所有项目

View File

@@ -1,135 +0,0 @@
# 代码提交变更说明模板
## 📝 PR/Commit 模板
### 标题格式
```
<类型>(<模块>): <简短描述>
示例:
feat(patient): 添加患者基本信息编辑功能
fix(doctor): 修复医生排班显示异常问题
docs(api): 更新预约挂号接口文档
refactor(nurse): 重构护士站护理记录组件
```
### 正文模板
```markdown
## 🔍 变更背景
- **问题描述**:详细说明要解决的问题或实现的需求
- **影响范围**:列出受影响的模块、页面、功能
- **相关链接**禅道任务ID、需求文档链接等
## 🛠️ 变更内容
- **主要修改**:核心代码变更点
- **技术方案**:采用的技术方案和设计思路
- **兼容性**是否涉及API或数据结构变更
## 🗄️ 数据库变更
- **表结构变更**:列出新增/修改的表和字段
- **数据迁移**:是否需要数据迁移脚本
- **回滚方案**:数据库变更的回滚策略
## ✅ 验证情况
- **测试覆盖**:单元测试、集成测试覆盖情况
- **手动验证**:手动测试的场景和结果
- **构建验证**:本地构建截图(必填)
## 📋 检查清单
- [ ] 代码已通过 ESLint 检查
- [ ] 本地构建成功(附截图)
- [ ] 核心功能已测试验证
- [ ] 文档已同步更新
- [ ] Code Review 已完成
## 👥 相关人员
- **开发者**@开发者姓名
- **测试者**@测试者姓名
- **审核人**@架构师姓名
```
## 🏷️ 提交类型说明
| 类型 | 说明 | 示例 |
|------|------|------|
| feat | 新功能 | `feat: 添加用户登录功能` |
| fix | Bug修复 | `fix: 修复表单验证错误` |
| docs | 文档更新 | `docs: 更新API文档` |
| style | 代码格式调整 | `style: 格式化代码` |
| refactor | 代码重构 | `refactor: 重构组件结构` |
| test | 测试相关 | `test: 添加单元测试` |
| chore | 构建/依赖等 | `chore: 升级依赖版本` |
| perf | 性能优化 | `perf: 优化列表加载速度` |
## 📁 模块命名规范
| 模块 | 说明 |
|------|------|
| patient | 患者管理相关 |
| doctor | 医生工作站相关 |
| nurse | 护士站相关 |
| admin | 后台管理相关 |
| common | 公共组件/工具 |
| api | API接口相关 |
| auth | 认证授权相关 |
| payment | 支付相关 |
## 🖼️ 构建验证截图要求
### 必须包含的信息
1. **终端窗口**:显示 `npm run build:prod` 命令执行过程
2. **成功标识**:明确显示构建成功的提示信息
3. **时间戳**:截图包含当前时间,证明是最新构建
4. **分支信息**:显示当前工作分支名称
### 截图示例
```
$ git checkout feature/patient-edit
$ npm run build:prod
> his-system@1.0.0 build
> vue-cli-service build
⠇ Building for production...
DONE Build complete. The dist directory is ready to be deployed.
INFO Check out deployment instructions at https://cli.vuejs.org/guide/deployment.html
✨ Done in 45.23s.
```
## ⚠️ 禁止行为
### 严重违规(直接拒绝合并)
- 无构建验证截图
- 代码存在 ESLint 错误
- 未填写变更说明
- 修改无关代码文件
### 轻微违规(要求修正后重新提交)
- 描述过于简单
- 测试覆盖不完整
- 文档更新滞后
- 格式不符合规范
## 💡 最佳实践
### 高质量提交特征
- **原子性**:每次提交只解决一个问题
- **可追溯**关联具体的需求或Bug ID
- **可验证**:提供完整的验证证据
- **可理解**:描述清晰,他人能快速理解
### 团队协作建议
- 提交前先在本地完整测试
- 复杂变更提前与团队沟通
- 及时更新相关文档
- 主动帮助新人熟悉规范
---
**文档版本**v1.0
**最后更新**2026年4月24日
**负责人**:陈琳(文档专家)
**适用范围**HIS 系统所有开发人员

View File

@@ -1,102 +0,0 @@
# 前端发布前检查清单
## 📋 基础检查项
### 代码质量
- [ ] 代码已通过 ESLint 检查,无警告和错误
- [ ] 代码已通过 Prettier 格式化
- [ ] 无 console.log() 等调试代码残留
- [ ] 变量命名符合规范,语义清晰
- [ ] 函数职责单一,复杂度适中
### 构建验证
- [ ] 本地执行 `npm run build:prod` 成功完成
- [ ] 构建产物无报错,体积合理
- [ ] 静态资源路径正确无404错误
- [ ] 环境变量配置正确(开发/测试/生产)
### 功能验证
- [ ] 核心功能流程完整测试通过
- [ ] 边界条件和异常场景已覆盖
- [ ] 表单验证逻辑正确
- [ ] API 接口调用正常,错误处理完善
- [ ] 路由跳转逻辑正确
## 🔧 技术检查项
### 模块导入检查
- [ ] 所有 import 语句引用的模块实际存在
- [ ] 无未使用的 import 导入
- [ ] 路径别名(@/)配置正确
- [ ] 第三方库版本兼容性确认
### 性能优化
- [ ] 组件按需加载(懒加载)已配置
- [ ] 大数据列表已实现虚拟滚动或分页
- [ ] 图片资源已压缩,格式合适
- [ ] 无内存泄漏风险(事件监听器、定时器等)
### 安全检查
- [ ] 用户输入已做 XSS 防护
- [ ] 敏感信息不在前端硬编码
- [ ] API 请求已做 CSRF 防护
- [ ] 权限控制逻辑正确
## 🌐 兼容性检查
### 浏览器兼容
- [ ] 主流浏览器Chrome、Firefox、Safari、Edge显示正常
- [ ] 移动端适配良好(如适用)
- [ ] 分辨率适配1366x768、1920x1080等
### 设备兼容
- [ ] 触摸设备操作体验良好
- [ ] 键盘导航支持完整
- [ ] 屏幕阅读器兼容性(无障碍)
## 📱 发布准备
### 文档更新
- [ ] 相关 API 文档已同步更新
- [ ] 用户操作手册已更新(如适用)
- [ ] 变更日志已记录
### 回滚预案
- [ ] 回滚方案已准备
- [ ] 数据兼容性已确认
- [ ] 紧急联系人已明确
## 🔧 后端检查项
### 编译验证
- [ ] Maven编译成功`mvn clean package -DskipTests`
- [ ] 无编译错误,仅有可接受的警告
- [ ] 依赖版本兼容性确认
### 数据库脚本
- [ ] DDL/DML脚本语法正确
- [ ] 回滚脚本已准备
- [ ] 数据迁移脚本已测试
## 🔄 前后端协同
### 接口兼容性
- [ ] API接口契约变更已双方确认
- [ ] 前端调用后端接口正常
- [ ] 错误码处理逻辑一致
## ✅ 最终确认
### 发布前最后检查
- [ ] 本地构建截图已附在 PR 中
- [ ] 测试环境部署验证通过
- [ ] Code Review 已完成并获得批准
- [ ] 相关 Bug 已关闭或延期说明
---
**文档版本**v1.0
**最后更新**2026年4月24日
**负责人**:陈琳(文档专家)
**适用范围**HIS 系统所有前端项目

View File

@@ -1,575 +0,0 @@
# HIS项目发布检查清单 v1.0
> **文档说明**本清单整合了提交规范、前端检查、后端检查、CI/CD门禁四个部分作为HIS项目发布的标准化检查依据。每次发布前必须逐项确认。
## 目录
- [1. 提交规范commit-template](#1-提交规范commit-template)
- [2. 前端检查frontend-checklist](#2-前端检查frontend-checklist)
- [3. 后端检查backend-checklist](#3-后端检查backend-checklist)
- [4. CI/CD门禁cicd-gatekeeper](#4-cicd门禁cicd-gatekeeper)
- [5. 发布确认与回滚预案](#5-发布确认与回滚预案)
---
## 1. 提交规范commit-template
### 📝 PR/Commit 模板
#### 标题格式
```
<类型>(<模块>): <简短描述>
示例:
feat(patient): 添加患者基本信息编辑功能
fix(doctor): 修复医生排班显示异常问题
docs(api): 更新预约挂号接口文档
refactor(nurse): 重构护士站护理记录组件
```
#### 正文模板
```markdown
## 🔍 变更背景
- **问题描述**:详细说明要解决的问题或实现的需求
- **影响范围**:列出受影响的模块、页面、功能
- **相关链接**禅道任务ID、需求文档链接等
## 🛠️ 变更内容
- **主要修改**:核心代码变更点
- **技术方案**:采用的技术方案和设计思路
- **兼容性**是否涉及API或数据结构变更
## 🗄️ 数据库变更
- **表结构变更**:列出新增/修改的表和字段
- **数据迁移**:是否需要数据迁移脚本
- **回滚方案**:数据库变更的回滚策略
## ✅ 验证情况
- **测试覆盖**:单元测试、集成测试覆盖情况
- **手动验证**:手动测试的场景和结果
- **构建验证**:本地构建截图(必填)
## 📋 检查清单
- [ ] 代码已通过 ESLint 检查
- [ ] 本地构建成功(附截图)
- [ ] 核心功能已测试验证
- [ ] 文档已同步更新
- [ ] Code Review 已完成
## 👥 相关人员
- **开发者**@开发者姓名
- **测试者**@测试者姓名
- **审核人**@架构师姓名
```
### 🏷️ 提交类型说明
| 类型 | 说明 | 示例 |
|------|------|------|
| feat | 新功能 | `feat: 添加用户登录功能` |
| fix | Bug修复 | `fix: 修复表单验证错误` |
| docs | 文档更新 | `docs: 更新API文档` |
| style | 代码格式调整 | `style: 格式化代码` |
| refactor | 代码重构 | `refactor: 重构组件结构` |
| test | 测试相关 | `test: 添加单元测试` |
| chore | 构建/依赖等 | `chore: 升级依赖版本` |
| perf | 性能优化 | `perf: 优化列表加载速度` |
### 📁 模块命名规范
| 模块 | 说明 |
|------|------|
| patient | 患者管理相关 |
| doctor | 医生工作站相关 |
| nurse | 护士站相关 |
| admin | 后台管理相关 |
| common | 公共组件/工具 |
| api | API接口相关 |
| auth | 认证授权相关 |
| payment | 支付相关 |
### 🖼️ 构建验证截图要求
#### 必须包含的信息
1. **终端窗口**:显示 `npm run build:prod` 命令执行过程
2. **成功标识**:明确显示构建成功的提示信息
3. **时间戳**:截图包含当前时间,证明是最新构建
4. **分支信息**:显示当前工作分支名称
### ⚠️ 禁止行为
#### 严重违规(直接拒绝合并)
- 无构建验证截图
- 代码存在 ESLint 错误
- 未填写变更说明
- 修改无关代码文件
---
## 2. 前端检查frontend-checklist
### 📋 基础检查项
#### 代码质量
- [ ] 代码已通过 ESLint 检查,无警告和错误
- [ ] 代码已通过 Prettier 格式化
- [ ] 无 console.log() 等调试代码残留
- [ ] 变量命名符合规范,语义清晰
- [ ] 函数职责单一,复杂度适中
#### 构建验证
- [ ] 本地执行 `npm run build:prod` 成功完成
- [ ] 构建产物无报错,体积合理
- [ ] 静态资源路径正确无404错误
- [ ] 环境变量配置正确(开发/测试/生产)
#### 功能验证
- [ ] 核心功能流程完整测试通过
- [ ] 边界条件和异常场景已覆盖
- [ ] 表单验证逻辑正确
- [ ] API 接口调用正常,错误处理完善
- [ ] 路由跳转逻辑正确
### 🔧 技术检查项
#### 模块导入检查
- [ ] 所有 import 语句引用的模块实际存在
- [ ] 无未使用的 import 导入
- [ ] 路径别名(@/)配置正确
- [ ] 第三方库版本兼容性确认
#### 性能优化
- [ ] 组件按需加载(懒加载)已配置
- [ ] 大数据列表已实现虚拟滚动或分页
- [ ] 图片资源已压缩,格式合适
- [ ] 无内存泄漏风险(事件监听器、定时器等)
#### 安全检查
- [ ] 用户输入已做 XSS 防护
- [ ] 敏感信息不在前端硬编码
- [ ] API 请求已做 CSRF 防护
- [ ] 权限控制逻辑正确
### 🌐 兼容性检查
#### 浏览器兼容
- [ ] 主流浏览器Chrome、Firefox、Safari、Edge显示正常
- [ ] 移动端适配良好(如适用)
- [ ] 分辨率适配1366x768、1920x1080等
#### 设备兼容
- [ ] 触摸设备操作体验良好
- [ ] 键盘导航支持完整
- [ ] 屏幕阅读器兼容性(无障碍)
### 📱 发布准备
#### 文档更新
- [ ] 相关 API 文档已同步更新
- [ ] 用户操作手册已更新(如适用)
- [ ] 变更日志已记录
#### 回滚预案
- [ ] 回滚方案已准备
- [ ] 数据兼容性已确认
- [ ] 紧急联系人已明确
### ✅ 最终确认
#### 发布前最后检查
- [ ] 本地构建截图已附在 PR 中
- [ ] 测试环境部署验证通过
- [ ] Code Review 已完成并获得批准
- [ ] 相关 Bug 已关闭或延期说明
---
## 3. 后端检查backend-checklist
### 📋 基础检查项
#### Maven编译验证
- [ ] 本地执行 `mvn compile` 编译通过无ERROR
- [ ] 执行 `mvn package -DskipTests` 打包成功
- [ ] 依赖版本无冲突(`mvn dependency:tree` 检查)
- [ ] 无编译警告(或已有书面说明可忽略)
#### 构建产物验证
- [ ] JAR/WAR包生成完整大小合理
- [ ] `application.yml` 等配置文件已打包进产物
- [ ] 第三方依赖jar包完整lib目录无缺失
### 🔧 Spring Boot 配置检查
#### 多环境配置
- [ ] `application-dev.yml`(开发)配置正确
- [ ] `application-test.yml`(测试)配置正确
- [ ] `application-prod.yml`(生产)配置正确
- [ ] 启动参数 `--spring.profiles.active` 指定正确环境
- [ ] 生产环境未启用devtools热部署
#### Actuator安全
- [ ] 生产环境 `/actuator` 端点已禁用或限制访问
- [ ] `/actuator/env``/actuator/heapdump` 等敏感端点已关闭
- [ ] 健康检查端点 `/actuator/health` 返回信息已脱敏
#### 启动校验
- [ ] 数据库连接池配置合理HikariCP最大/最小连接数)
- [ ] Redis/消息中间件连接配置正确
- [ ] 启动日志无ERROR级别异常
### 🗄️ MyBatis Plus 规范检查
#### 实体-表映射
- [ ] 所有实体类标注 `@TableName`,表名与实际一致
- [ ] 主键字段标注 `@TableId(type = IdType.AUTO)` 或对应策略
- [ ] 非表字段标注 `@TableField(exist = false)`
- [ ] 字段命名符合下划线转驼峰规则
#### SQL安全
- [ ] 所有查询使用参数化查询(`QueryWrapper` / `LambdaQueryWrapper`
- [ ] 禁止字符串拼接SQL`"WHERE name = '" + name + "'"`
- [ ] 批量操作使用MyBatis Plus `saveBatch` / `updateBatchById`
- [ ] 复杂SQL使用XML映射避免注解内嵌长SQL
#### 事务管理
- [ ] 涉及多表写操作的方法标注 `@Transactional`
- [ ] 事务边界合理不包含外部HTTP调用
- [ ] 异常回滚配置正确(`rollbackFor = Exception.class`
- [ ] 事务方法未被同一类内方法直接调用(自调用失效问题)
#### 分页插件
- [ ] `PaginationInnerInterceptor` 已正确配置
- [ ] 分页查询使用 `Page<T>` 对象非手动limit/offset
### 🔌 RESTful API 设计检查
#### 统一返回格式
- [ ] 所有接口返回 `{code, msg, data}` 统一结构
- [ ] 成功返回 `code=200`,业务错误使用自定义错误码
- [ ] 异常通过 `@ControllerAdvice` + `@ExceptionHandler` 统一处理
#### HTTP状态码
- [ ] 资源创建返回 `201 Created`
- [ ] 资源删除返回 `204 No Content`
- [ ] 参数校验失败返回 `400 Bad Request`
- [ ] 未认证返回 `401 Unauthorized`
- [ ] 无权限返回 `403 Forbidden`
- [ ] 资源不存在返回 `404 Not Found`
#### 参数校验
- [ ] 请求参数使用 `@Valid` / `@Validated` 注解校验
- [ ] 必填字段标注 `@NotBlank` / `@NotNull`
- [ ] 数值范围标注 `@Min` / `@Max`
- [ ] 格式校验使用 `@Pattern`(如手机号、身份证号)
- [ ] 校验失败返回明确错误信息非500堆栈
#### API版本管理
- [ ] 接口路径包含版本号(`/api/v1/``/api/v2/`
- [ ] 废弃接口标注 `@Deprecated`,并在文档中说明
- [ ] 不兼容变更必须升级版本号
### 🔒 安全与合规检查
#### 数据脱敏
- [ ] 患者身份证号在日志中脱敏(`***` 掩码)
- [ ] 患者手机号在日志中脱敏前3后4中间`****`
- [ ] 敏感字段序列化时使用 `@JsonSerialize` 自定义脱敏器
- [ ] 接口返回中非必需字段不暴露如密码、salt
#### 权限控制
- [ ] 所有涉及患者数据的接口标注 `@PreAuthorize`
- [ ] 数据级权限校验(医生只能访问本科室患者)
- [ ] 越权访问返回 `403`,非 `404``500`
- [ ] 敏感操作(删除、修改诊断)需二次确认或额外权限
#### 审计日志
- [ ] 处方修改记录操作人、时间、变更内容
- [ ] 病历删除操作记录完整审计链
- [ ] 审计日志独立存储,不可被业务用户删除
- [ ] 关键业务操作记录IP地址和操作终端
### ⚡ 性能检查
#### 数据库查询
- [ ] 无N+1查询问题使用 `JOIN` 或批量查询)
- [ ] 大表查询必须有分页限制
- [ ] 慢查询已优化(执行时间 < 500ms
- [ ] 索引已覆盖高频查询条件
#### 接口性能
- [ ] 核心接口响应时间 < 1秒
- [ ] 列表接口支持分页无全量返回
- [ ] 大文件下载使用流式传输非全量加载到内存
### 📝 文档与发布准备
#### 文档更新
- [ ] API接口文档已同步更新路径参数返回值
- [ ] 数据库变更脚本已提供DDL/DML
- [ ] 配置变更说明已记录新增/修改的配置项
- [ ] 影响范围说明已明确哪些模块哪些接口受影响
#### 回滚预案
- [ ] 数据库变更可回滚提供反向SQL脚本
- [ ] 配置变更可快速回退
- [ ] 紧急回滚流程已明确怎么做多长时间
- [ ] 回滚后数据一致性已验证
### ✅ 最终确认
#### 发布前最后检查
- [ ] `mvn compile` 构建成功附终端截图
- [ ] 关键单元测试通过
- [ ] 测试环境部署验证通过
- [ ] Code Review 已完成并获得批准
- [ ] 相关Bug已关闭或延期说明
---
## 4. CI/CD门禁cicd-gatekeeper
### 🎯 规范目标
建立自动化质量门禁确保每次代码提交都经过严格验证防止低质量代码进入主干分支提升系统稳定性和开发效率
### 🔒 门禁层级
#### 1. 提交前门禁Pre-commit
**触发时机**`git commit` 执行前
**验证内容**
- ESLint 代码规范检查
- Prettier 代码格式化
- 简单的单元测试快速执行
**工具配置**
- Husky + lint-staged
- 配置文件`.husky/pre-commit`
#### 2. 推送前门禁Pre-push
**触发时机**`git push` 执行前
**验证内容**
- 完整的单元测试套件
- 构建验证`npm run build:prod`
- 集成测试核心流程
**工具配置**
- Husky pre-push hook
- 配置文件`.husky/pre-push`
#### 3. CI流水线门禁CI Pipeline
**触发时机**代码推送到远程仓库后
**验证内容**
- 完整的测试套件单元+集成+端到端
- 代码覆盖率检查分阶段目标Q130%Q250%Q380%
- 安全扫描SAST
- 构建产物验证
- 部署到测试环境
**工具配置**
- Spug CI/CD 流水线
- Gitea Webhook 触发
#### 4. 发布前门禁Release Gate
**触发时机**准备发布到生产环境前
**验证内容**
- 生产环境冒烟测试
- 性能基准测试
- 安全合规检查
- 回滚预案验证
### ⚙️ 具体配置要求
#### ESLint 配置
```javascript
// eslint.config.js 关键配置
import globals from "globals";
import pluginVue from "eslint-plugin-vue";
import parserVue from "vue-eslint-parser";
import importPlugin from "eslint-plugin-import";
export default [
{
name: "app/files-to-lint",
files: ["**/*.{js,mjs,jsx,vue}"],
},
{
name: "app/files-to-ignore",
ignores: ["**/dist/**", "**/node_modules/**", "**/help-center/**"],
},
...pluginVue.configs["flat/recommended"],
{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},
parser: parserVue,
ecmaVersion: "latest",
sourceType: "module",
},
plugins: {
import: importPlugin,
},
rules: {
// 确保导入的模块实际存在(核心规则,防止构建失败)
"import/no-unresolved": "error",
// 确保导入的命名导出实际存在
"import/named": "error",
// 确保默认导出存在
"import/default": "error",
// 确保命名空间导出存在
"import/namespace": "error",
},
},
];
```
#### Java 后端配置
```xml
<!-- pom.xml 关键插件 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.2.0</version>
</plugin>
```
#### 数据库迁移配置
```yaml
# application.yml Flyway配置
flyway:
enabled: true
locations: classpath:db/migration
baseline-on-migrate: true
```
#### Husky 配置
```bash
# .husky/pre-commit
#!/bin/sh
npm run lint-staged
# .husky/pre-push
#!/bin/sh
npm run test:unit && npm run build:prod
```
#### lint-staged 配置
```json
// package.json
{
"lint-staged": {
"*.{js,vue}": ["eslint --fix", "prettier --write"],
"*.{css,scss}": ["stylelint --fix", "prettier --write"]
}
}
```
### 🚫 失败处理机制
#### 自动处理
- **构建失败**自动阻止 PR 合并
- **测试失败**标记 PR 为失败状态
- **安全漏洞**立即通知安全团队
#### 人工处理
- **紧急修复**可申请临时绕过需架构师批准
- **误报处理**提交豁免申请并说明原因
- **规则调整**通过 RFC 流程申请规则变更
### 📊 监控与度量
#### 关键指标
- 门禁通过率 95%
- 平均修复时间 2小时
- 误报率 5%
#### 报告机制
- 每日门禁失败统计
- 周度质量趋势报告
- 月度规则优化建议
### 🔄 持续改进
#### 规则演进
- 每月评审门禁规则有效性
- 根据项目需求调整检查强度
- 引入新的质量检查工具
#### 团队培训
- 新成员入职培训包含门禁规范
- 定期分享最佳实践案例
- 建立常见问题解决方案库
---
## 5. 发布确认与回滚预案
### 📋 发布前最终确认清单
#### 前端确认
- [ ] 本地构建成功`npm run build:prod`
- [ ] 核心功能流程测试通过
- [ ] 模块导入检查通过无import错误
- [ ] 兼容性测试完成
#### 后端确认
- [ ] Maven编译成功`mvn compile`
- [ ] 单元测试通过
- [ ] 数据库脚本验证通过
- [ ] API接口测试通过
#### 协同确认
- [ ] 前后端接口契约一致
- [ ] 联调测试通过
- [ ] Code Review 已完成
- [ ] 测试环境部署验证通过
### 🚨 回滚预案
#### 触发条件
- [ ] 生产环境出现严重Bug
- [ ] 性能严重下降
- [ ] 数据一致性问题
- [ ] 安全漏洞暴露
#### 回滚步骤
1. **立即停止**暂停新流量进入
2. **版本回退**部署上一个稳定版本
3. **数据回滚**执行数据库回滚脚本如有
4. **验证恢复**确认系统功能正常
5. **问题分析**记录根本原因和改进措施
#### 责任分工
- **技术负责人**执行回滚操作
- **测试负责人**验证回滚后功能
- **项目经理**协调沟通和进度同步
- **运维团队**监控系统状态
### 📞 紧急联系人
| 角色 | 姓名 | 联系方式 | 职责 |
|------|------|----------|------|
| 技术负责人 | 诸葛亮 | @诸葛亮 | 架构决策和技术指导 |
| 前端负责人 | 赵云 | @赵云 | 前端问题处理 |
| 后端负责人 | 关羽 | @关羽 | 后端问题处理 |
| 测试负责人 | 张飞 | @张飞 | 质量验证和问题复现 |
| 项目经理 | 刘备 | @刘备 | 项目协调和进度管理 |
| 文档负责人 | 陈琳 | @陈琳 | 文档维护和知识沉淀 |
---
**文档版本**v1.0
**最后更新**2026年4月25日
**负责人**陈琳文档专家
**适用范围**HIS 系统所有开发人员

View File

@@ -1,214 +0,0 @@
# HIS项目 Playwright E2E 自动化测试方案 v1.0
## 一、方案概述
### 1.1 选型理由
- **Playwright** 是微软开源的端到端测试框架,完美适配 Vue 3 + Vite 技术栈
- 自动等待机制适合HIS系统复杂交互场景异步加载、动态渲染
- 支持多浏览器Chromium/Firefox/WebKitCI/CD集成成熟
- 已有 `@playwright/test ^1.58.2` 依赖 installed
### 1.2 目标
1. 核心业务流程自动化覆盖率达到 80%+
2. 已修复Bug 100% 回归测试覆盖
3. 每次代码推送自动触发测试,失败阻断发布
## 二、项目结构
```
openhis-ui-vue3/
├── tests/
│ ├── e2e/
│ │ ├── fixtures/ # 测试夹具
│ │ │ └── auth.ts # 登录认证fixture
│ │ ├── pages/ # 页面对象模型POM
│ │ │ ├── LoginPage.ts
│ │ │ ├── DoctorStationPage.ts
│ │ │ └── SurgeryBillingPage.ts
│ │ ├── specs/ # 测试用例
│ │ │ ├── login.spec.ts
│ │ │ ├── doctor-station.spec.ts
│ │ │ ├── surgery-billing.spec.ts
│ │ │ └── bug-regression.spec.ts # Bug回归测试
│ │ └── utils/
│ │ └── test-data.ts # 测试数据
│ └── playwright.config.ts # Playwright配置
├── .env.test # 测试环境变量
└── package.json # 已有playwright依赖
```
## 三、环境配置
### 3.1 环境变量(.env.test
```bash
# 测试环境配置
VITE_APP_BASE_API=http://192.168.110.253:8080
TEST_USERNAME=test_admin
TEST_PASSWORD=test123456
TEST_BASE_URL=http://localhost:80
```
### 3.2 Playwright配置playwright.config.ts
```typescript
import { defineConfig, devices } from '@playwright/test';
export default defineConfig({
testDir: './tests/e2e/specs',
timeout: 60 * 1000,
expect: { timeout: 10000 },
fullyParallel: false,
forbidOnly: !!process.env.CI,
retries: process.env.CI ? 2 : 0,
workers: 1,
reporter: [['html', { outputFolder: 'playwright-report' }], ['list']],
use: {
baseURL: process.env.TEST_BASE_URL || 'http://localhost:80',
trace: 'on-first-retry',
screenshot: 'only-on-failure',
video: 'retain-on-failure',
},
projects: [
{ name: 'chromium', use: { ...devices['Desktop Chrome'] } },
],
});
```
## 四、核心测试用例
### 4.1 登录测试login.spec.ts
```typescript
import { test, expect } from '@playwright/test';
test('用户登录成功', async ({ page }) => {
await page.goto('/');
await page.fill('input[placeholder="请输入用户名"]', process.env.TEST_USERNAME || 'admin');
await page.fill('input[placeholder="请输入密码"]', process.env.TEST_PASSWORD || '123456');
await page.click('button:has-text("登录")');
await expect(page).toHaveURL(/.*dashboard.*/);
await expect(page.locator('.user-avatar')).toBeVisible();
});
test('登录失败-错误密码', async ({ page }) => {
await page.goto('/');
await page.fill('input[placeholder="请输入用户名"]', 'admin');
await page.fill('input[placeholder="请输入密码"]', 'wrongpassword');
await page.click('button:has-text("登录")');
await expect(page.locator('.el-message--error')).toBeVisible();
});
```
### 4.2 门诊医生站测试doctor-station.spec.ts
```typescript
import { test, expect } from '@playwright/test';
test.describe('门诊医生站', () => {
test.beforeEach(async ({ page }) => {
// 登录
await page.goto('/');
await page.fill('input[placeholder="请输入用户名"]', process.env.TEST_USERNAME || 'admin');
await page.fill('input[placeholder="请输入密码"]', process.env.TEST_PASSWORD || '123456');
await page.click('button:has-text("登录")');
await page.waitForURL(/.*dashboard.*/);
});
test('#427 检查项目分类手风琴展开', async ({ page }) => {
await page.goto('/doctorstation');
// 点击第一个分类
await page.click('.category-item >> nth=0');
await expect(page.locator('.category-content >> nth=0')).toBeVisible();
// 点击第二个分类,第一个应收起
await page.click('.category-item >> nth=1');
await expect(page.locator('.category-content >> nth=0')).not.toBeVisible();
await expect(page.locator('.category-content >> nth=1')).toBeVisible();
});
});
```
### 4.3 手术计费回归测试bug-regression.spec.ts
```typescript
import { test, expect } from '@playwright/test';
test.describe('Bug回归测试', () => {
test('#437 手术计费防重复提交', async ({ page }) => {
// 登录并导航到手术计费
await page.goto('/');
await page.fill('input[placeholder="请输入用户名"]', process.env.TEST_USERNAME || 'admin');
await page.fill('input[placeholder="请输入密码"]', process.env.TEST_PASSWORD || '123456');
await page.click('button:has-text("登录")');
await page.waitForURL(/.*dashboard.*/);
await page.goto('/surgery-billing');
// 快速连续点击新增按钮(测试防重复锁)
const addBtn = page.locator('button:has-text("新增")');
await addBtn.click();
await addBtn.click(); // 第二次应被阻止
await addBtn.click(); // 第三次应被阻止
// 验证只弹出一个表单
await expect(page.locator('.el-dialog')).toHaveCount(1);
});
});
```
## 五、执行命令
```bash
# 安装浏览器
npx playwright install chromium
# 运行所有测试
npm run test:e2e
# 运行单个测试文件
npx playwright test login.spec.ts
# 生成HTML报告
npx playwright show-report
# UI模式调试用
npx playwright test --ui
```
## 六、CI/CD集成
### 6.1 package.json脚本
```json
{
"scripts": {
"test:e2e": "playwright test",
"test:e2e:ui": "playwright test --ui",
"test:e2e:report": "playwright show-report"
}
}
```
### 6.2 Spug流水线集成
```yaml
# Spug 构建后阶段添加
- name: E2E Testing
script: |
cd openhis-ui-vue3
npx playwright install --with-deps chromium
npm run test:e2e -- --reporter=html
# 测试失败则阻断发布
if [ $? -ne 0 ]; then
echo "E2E测试失败阻断发布"
exit 1
fi
```
## 七、实施计划
| 阶段 | 时间 | 内容 | 负责人 |
|------|------|------|--------|
| Phase 1 | 第1周 | 登录+核心页面冒烟测试 | 张飞+赵云 |
| Phase 2 | 第2-3周 | 门诊医生站+手术计费全流程 | 张飞 |
| Phase 3 | 第4周 | Bug回归测试全覆盖 | 张飞 |
| Phase 4 | 第5周 | CI/CD流水线集成 | 赵云+运维 |
## 八、注意事项
1. **测试数据隔离**:使用独立的测试数据库,不污染生产数据
2. **环境变量**:敏感信息通过 `.env.test` 管理不提交到git
3. **截图留痕**:失败时自动截图,便于排查
4. **测试优先**:新功能开发时同步编写测试用例

76
find_missing_ids.js Normal file
View File

@@ -0,0 +1,76 @@
const { Pool } = require('pg');
const pool = new Pool({
host: '47.116.196.11',
port: 15432,
database: 'postgresql',
user: 'postgresql',
password: 'Jchl1528'
});
async function findMissingIds() {
try {
// 1. 查找 op_schedule 中存在的 apply_id但在 cli_surgery 中不存在的
console.log('=== 查找不匹配的 apply_id ===\n');
const result = await pool.query(`
SELECT DISTINCT os.apply_id
FROM hisdev.op_schedule os
LEFT JOIN hisdev.cli_surgery cs ON os.apply_id = cs.id
WHERE os.delete_flag = '0'
AND cs.id IS NULL
ORDER BY os.apply_id DESC
LIMIT 10
`);
console.log('在 op_schedule 中存在,但在 cli_surgery 中不存在的 apply_id:');
console.table(result.rows);
// 2. 尝试用这些 ID 直接查询 cli_surgery
if (result.rows.length > 0) {
console.log('\n=== 尝试直接查询这些 ID ===');
for (const row of result.rows) {
const id = row.apply_id;
const checkResult = await pool.query(`
SELECT id, surgery_no, patient_name, status_enum, delete_flag
FROM hisdev.cli_surgery
WHERE id = $1
`, [id]);
if (checkResult.rows.length === 0) {
console.log(`ID ${id}: 在 cli_surgery 表中不存在`);
} else {
console.log(`ID ${id}: 找到记录`, checkResult.rows[0]);
}
}
}
// 3. 检查是否有可能是手术单号匹配而不是 ID 匹配
console.log('\n=== 检查手术单号关联 ===');
const operCodeResult = await pool.query(`
SELECT
os.schedule_id,
os.oper_code,
os.apply_id,
cs.id as surgery_id_by_apply_id,
cs2.id as surgery_id_by_oper_code,
cs2.surgery_no,
cs2.apply_dept_name,
cs2.main_surgeon_name
FROM hisdev.op_schedule os
LEFT JOIN hisdev.cli_surgery cs ON os.apply_id = cs.id
LEFT JOIN hisdev.cli_surgery cs2 ON os.oper_code = cs2.surgery_no
WHERE os.delete_flag = '0'
ORDER BY os.create_time DESC
LIMIT 5
`);
console.table(operCodeResult.rows);
} catch (err) {
console.error('查询失败:', err.message);
} finally {
pool.end();
}
}
findMissingIds();

105
fix_surgery_data.js Normal file
View File

@@ -0,0 +1,105 @@
const { Pool } = require('pg');
const pool = new Pool({
host: '47.116.196.11',
port: 15432,
database: 'postgresql',
user: 'postgresql',
password: 'Jchl1528'
});
async function fixData() {
const client = await pool.connect();
try {
await client.query('BEGIN');
// 1. 修复申请科室名称
console.log('步骤1: 修复申请科室名称...');
const fixDeptResult = await client.query(`
UPDATE hisdev.cli_surgery s
SET apply_dept_name = o.name
FROM hisdev.adm_organization o
WHERE s.apply_dept_id = o.id
AND (s.apply_dept_name IS NULL OR s.apply_dept_name = '')
AND s.delete_flag = '0'
`);
console.log(` 修复了 ${fixDeptResult.rowCount} 条申请科室记录`);
// 2. 修复主刀医生姓名
console.log('步骤2: 修复主刀医生姓名...');
const fixSurgeonResult = await client.query(`
UPDATE hisdev.cli_surgery s
SET main_surgeon_name = u.nick_name
FROM hisdev.sys_user u
WHERE s.main_surgeon_id = u.user_id
AND (s.main_surgeon_name IS NULL OR s.main_surgeon_name = '')
AND s.delete_flag = '0'
`);
console.log(` 修复了 ${fixSurgeonResult.rowCount} 条主刀医生记录`);
// 3. 对于 apply_dept_id 为空但有 org_id 的记录,使用 org_name
console.log('步骤3: 使用 org_name 填充剩余空申请科室...');
const fixOrgResult = await client.query(`
UPDATE hisdev.cli_surgery s
SET apply_dept_name = o.name,
apply_dept_id = s.org_id
FROM hisdev.adm_organization o
WHERE s.org_id = o.id
AND (s.apply_dept_name IS NULL OR s.apply_dept_name = '')
AND s.delete_flag = '0'
`);
console.log(` 修复了 ${fixOrgResult.rowCount} 条使用org_name的记录`);
// 4. 验证修复结果
console.log('步骤4: 验证修复结果...');
const checkResult = await client.query(`
SELECT
COUNT(*) as total_count,
COUNT(apply_dept_name) as has_apply_dept_name_count,
COUNT(*) - COUNT(apply_dept_name) as apply_dept_name_null_count,
COUNT(main_surgeon_name) as has_main_surgeon_name_count,
COUNT(*) - COUNT(main_surgeon_name) as main_surgeon_name_null_count
FROM hisdev.cli_surgery
WHERE delete_flag = '0'
`);
console.log('\n=== 修复后统计 ===');
console.log(JSON.stringify(checkResult.rows[0], null, 2));
// 5. 查看仍有空值的记录
const nullRecords = await client.query(`
SELECT
id,
surgery_no,
patient_name,
apply_dept_id,
apply_dept_name,
main_surgeon_id,
main_surgeon_name
FROM hisdev.cli_surgery
WHERE delete_flag = '0'
AND (apply_dept_name IS NULL OR apply_dept_name = '' OR main_surgeon_name IS NULL OR main_surgeon_name = '')
ORDER BY create_time DESC
LIMIT 10
`);
if (nullRecords.rows.length > 0) {
console.log('\n=== 仍有空值的记录 ===');
console.log(JSON.stringify(nullRecords.rows, null, 2));
} else {
console.log('\n✅ 所有记录的申请科室和主刀医生姓名已修复完毕!');
}
await client.query('COMMIT');
console.log('\n修复完成');
} catch (err) {
await client.query('ROLLBACK');
console.error('修复失败:', err.message);
} finally {
client.release();
pool.end();
}
}
fixData();

1
g.txt
View File

@@ -1 +0,0 @@
test Mon Apr 13 11:34:31 PM CST 2026

View File

@@ -1 +0,0 @@
# Git 代理禁用后测试 - 关羽 2026-04-14 17:11:41

View File

@@ -1 +0,0 @@
# Git 晚间测试 - 关羽 2026-04-14 21:35:44

View File

@@ -1 +0,0 @@
华佗 Gitea 提交测试成功 - Wed Apr 15 10:21:10 AM CST 2026

View File

@@ -1 +0,0 @@
荀彧 Gitea 提交测试成功 - Tue Apr 14 11:06:47 PM CST 2026

Submodule his-source deleted from 7827e58aac

10
md/test.html Normal file
View File

@@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>测试合并11111</title>
</head>
<body>
</body>
</html>

193
null_key_error_analysis.md Normal file
View File

@@ -0,0 +1,193 @@
# "element cannot be mapped to a null key" 错误分析报告
## 错误根本原因
该错误发生在 Java Stream 使用 `Collectors.groupingBy``Collectors.toMap` 时,**key 为 null** 导致的。
Java 的 `HashMap` 不允许 null key`HashMap` 的实现有关),当试图将元素映射到 null key 时,就会抛出此异常。
## 问题定位
### 1. 数据层问题 - SQL 查询返回 null
#### 位置1: ChargeItemMapper.xml (第71行)
**文件**: `openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ChargeItemMapper.xml`
```sql
SELECT
...
contract.bus_no as contract_no, -- 第71行
...
FROM adm_charge_item a
...
LEFT JOIN adm_account acc ON a.account_id = acc.id
LEFT JOIN fin_contract contract ON acc.contract_no = contract.bus_no -- LEFT JOIN
```
**问题**: 使用 LEFT JOIN 关联 `fin_contract` 表,当 `acc.contract_no` 为 null 或没有匹配的合同记录时,`contract.bus_no` 会返回 null。
#### 位置2: PaymentRecDetailMapper.xml (第37行)
**文件**: `openhis-server-new/openhis-domain/src/main/resources/mapper/financial/PaymentRecDetailMapper.xml`
```sql
SELECT
...
T2.contract_no, -- 第37行
...
FROM fin_payment_rec_detail T1
LEFT JOIN adm_account T2 ON T1.account_id = T2."id" -- LEFT JOIN
```
**问题**: 使用 LEFT JOIN 关联 `adm_account` 表,当 `T1.account_id` 为 null 或没有匹配的账户记录时,`T2.contract_no` 会返回 null。
---
### 2. 业务层问题 - 使用 groupingBy 时 key 可能为 null
#### 位置1: PaymentRecServiceImpl.java (第2334行)
**文件**: `openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java`
```java
// 2333-2334行
Map<String, List<ChargeItemBaseInfoDto>> chargeItemKVByContractNo
= chargeItemBaseInfoByIds.stream().collect(Collectors.groupingBy(ChargeItemBaseInfoDto::getContractNo));
```
**风险**: 如果 `ChargeItemBaseInfoDto.contractNo` 为 null来自上述 SQL 查询),将抛出异常。
#### 位置2: PaymentRecServiceImpl.java (第2462行)
**文件**: `openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java`
```java
// 2461-2462行
Map<String, List<ChargeItemBaseInfoDto>> chargeItemKVByContractNo
= chargeItemBaseInfoByIds.stream().collect(Collectors.groupingBy(ChargeItemBaseInfoDto::getContractNo));
```
**风险**: 同上,如果 `contractNo` 为 null将抛出异常。
#### 位置3: PaymentRecServiceImpl.java (第2478行)
**文件**: `openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java`
```java
// 2477-2478行
Map<Long, List<PaymentRecDetail>> payTransNoMap
= paymentRecDetails.stream().collect(Collectors.groupingBy(PaymentRecDetail::getAccountId));
```
**风险**: 如果 `PaymentRecDetail.accountId` 为 null将抛出异常。
#### 位置4: IChargeBillServiceImpl.java (第936行)
**文件**: `openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java`
```java
// 935-936行
Map<String, List<PaymentRecDetailAccountResult>> paymentDetailsMapByContract = PaymentRecDetailAccountResultList
.stream().collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getContractNo));
```
**风险**: 如果 `PaymentRecDetailAccountResult.contractNo` 为 null来自上述 SQL 查询),将抛出异常。
#### 位置5: IChargeBillServiceImpl.java (第1485行)
**文件**: `openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java`
```java
// 1484-1485行
Map<String, List<PaymentRecDetailAccountResult>> paymentDetailsMapByContract = PaymentRecDetailAccountResultList
.stream().collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getContractNo));
```
**风险**: 同上,如果 `contractNo` 为 null将抛出异常。
---
## 修复建议
### 方案1: 修改 SQL 查询,使用 COALESCE 处理 null (推荐)
修改 `ChargeItemMapper.xml` 第71行
```sql
-- 修改前
contract.bus_no as contract_no,
-- 修改后
COALESCE(contract.bus_no, 'DEFAULT') as contract_no,
```
修改 `PaymentRecDetailMapper.xml` 第37行
```sql
-- 修改前
T2.contract_no,
-- 修改后
COALESCE(T2.contract_no, 'DEFAULT') as contract_no,
```
### 方案2: 修改 Java 代码,过滤 null key
在使用 `groupingBy` 之前过滤掉 key 为 null 的数据:
```java
// 修改前
Map<String, List<ChargeItemBaseInfoDto>> chargeItemKVByContractNo
= chargeItemBaseInfoByIds.stream().collect(Collectors.groupingBy(ChargeItemBaseInfoDto::getContractNo));
// 修改后
Map<String, List<ChargeItemBaseInfoDto>> chargeItemKVByContractNo
= chargeItemBaseInfoByIds.stream()
.filter(dto -> dto.getContractNo() != null)
.collect(Collectors.groupingBy(ChargeItemBaseInfoDto::getContractNo));
```
### 方案3: 使用 null-safe 的收集器
自定义一个处理 null key 的收集器:
```java
public static <T, K> Collector<T, ?, Map<K, List<T>>> groupingByNullSafe(
Function<? super T, ? extends K> classifier) {
return Collectors.groupingBy(
classifier,
HashMap::new,
Collectors.toList()
);
}
```
---
## 建议修复优先级
1. **高优先级**: 修改 `ChargeItemMapper.xml``PaymentRecDetailMapper.xml` 的 SQL 查询
- 这是根本原因,修复后可以防止 null 值传播到 Java 层
2. **中优先级**: 修改 `PaymentRecServiceImpl.java` 第2334行和第2462行
- 这是门诊收费和住院结算的关键路径
3. **低优先级**: 修改 `IChargeBillServiceImpl.java` 第936行和第1485行
- 这是收费账单相关功能
---
## 与最近修改的关系
用户提到最近修改了 `OutpatientChargeAppMapper.xml`,增加了 `cli_surgery` 表关联。
虽然这个修改本身不会直接导致 `contract_no` 为 null但可能触发了某些收费流程使得原本不会执行的代码路径被执行从而暴露了这个潜在问题。
根本原因还是 `ChargeItemMapper.xml` 中的 SQL 查询使用了 LEFT JOIN 导致 `contract_no` 可能为 null。
---
## 验证方法
1. 检查数据库中是否存在 `account_id` 为 null 的 `adm_charge_item` 记录
2. 检查数据库中是否存在 `contract_no` 为 null 的 `adm_account` 记录
3. 在出现错误的收费操作中,打印相关 DTO 对象的 `contractNo` 字段值
```java
// 调试代码示例
chargeItemBaseInfoByIds.forEach(dto -> {
System.out.println("ChargeItem ID: " + dto.getId() + ", contractNo: " + dto.getContractNo());
});
```

View File

@@ -134,7 +134,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
if (poolSaved) {
// 创建号源槽
List<ScheduleSlot> slots = createScheduleSlots(pool.getId(), newSchedule.getLimitNumber(),
List<ScheduleSlot> slots = createScheduleSlots(pool.getId().intValue(), newSchedule.getLimitNumber(),
newSchedule.getStartTime(), newSchedule.getEndTime());
boolean slotsSaved = scheduleSlotService.saveBatch(slots);
@@ -224,7 +224,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
if (poolSaved) {
// 创建号源槽
List<ScheduleSlot> slots = createScheduleSlots(pool.getId(), newSchedule.getLimitNumber(),
List<ScheduleSlot> slots = createScheduleSlots(pool.getId().intValue(), newSchedule.getLimitNumber(),
newSchedule.getStartTime(), newSchedule.getEndTime());
boolean slotsSaved = scheduleSlotService.saveBatch(slots);
@@ -384,7 +384,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
/**
* 创建号源槽
*/
private List<ScheduleSlot> createScheduleSlots(Long poolId, Integer limitNumber, LocalTime startTime,
private List<ScheduleSlot> createScheduleSlots(Integer poolId, Integer limitNumber, LocalTime startTime,
LocalTime endTime) {
List<ScheduleSlot> slots = new ArrayList<>();
@@ -514,7 +514,7 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
.in("pool_id", poolIds));
if (ObjectUtil.isNotEmpty(slots)) {
List<Long> slotIds = slots.stream().map(ScheduleSlot::getId)
List<Integer> slotIds = slots.stream().map(ScheduleSlot::getId)
.collect(java.util.stream.Collectors.toList());
// 3. 逻辑删除所有号源槽
scheduleSlotService.removeByIds(slotIds);

View File

@@ -153,20 +153,12 @@ public class TicketAppServiceImpl implements ITicketAppService {
dto.setIdCard(raw.getIdCard());
dto.setDoctorId(raw.getDoctorId());
dto.setDepartmentId(raw.getDepartmentId());
dto.setRealPatientId(raw.getPatientId());
dto.setOrderId(raw.getOrderId());
dto.setOrderNo(raw.getOrderNo());
dto.setRealPatientId(raw.getPatientId());
// 性别处理:直接使用患者表中的 genderEnum
Integer genderEnum = raw.getGenderEnum();
if (genderEnum != null) {
if (Integer.valueOf(1).equals(genderEnum)) {
dto.setGender("");
} else if (Integer.valueOf(2).equals(genderEnum)) {
dto.setGender("");
} else {
dto.setGender("未知");
}
// 性别处理:直接读取优先级最高的订单性别字段 (SQL 已处理优先级)
if (raw.getPatientGender() != null) {
String pg = raw.getPatientGender().trim();
dto.setGender("1".equals(pg) ? "" : ("2".equals(pg) ? "" : "未知"));
} else {
dto.setGender("未知");
}

View File

@@ -115,15 +115,4 @@ public class TicketDto {
* 身份证号
*/
private String idCard;
/**
* 预约订单ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long orderId;
/**
* 预约订单号
*/
private String orderNo;
}

View File

@@ -12,8 +12,6 @@ import com.core.common.utils.SecurityUtils;
import com.core.common.core.domain.model.LoginUser;
import com.openhis.infectious.domain.InfectiousAudit;
import com.openhis.infectious.domain.InfectiousCard;
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.service.IPractitionerService;
import com.openhis.web.cardmanagement.appservice.ICardManageAppService;
import com.openhis.web.cardmanagement.dto.*;
import com.openhis.web.cardmanagement.mapper.InfectiousAuditMapper;
@@ -54,7 +52,6 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
private final InfectiousCardMapper infectiousCardMapper;
private final InfectiousAuditMapper infectiousAuditMapper;
private final IPractitionerService iPractitionerService;
@Override
public CardStatisticsDto getStatistics() {
@@ -77,7 +74,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
}
// 状态
if (queryParams.getStatus() != null) {
if (StringUtils.hasText(queryParams.getStatus())) {
wrapper.eq(InfectiousCard::getStatus, queryParams.getStatus());
}
@@ -130,7 +127,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
if (card == null) {
return new ArrayList<>();
}
List<InfectiousAudit> records = infectiousAuditMapper.selectByCardId(card.getCardNo());
List<InfectiousAudit> records = infectiousAuditMapper.selectByCardId(card.getId());
return records.stream().map(this::convertAuditToDto).collect(Collectors.toList());
}
@@ -148,16 +145,16 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
for (String cardNo : batchAuditDto.getCardNos()) {
InfectiousCard card = infectiousCardMapper.selectByCardNo(cardNo);
if (card == null) continue;
if (Integer.valueOf(2).equals(card.getStatus()) || Integer.valueOf(3).equals(card.getStatus())) continue;
if ("2".equals(card.getStatus()) || "3".equals(card.getStatus())) continue;
// 更新状态为已审核
Integer oldStatus = card.getStatus();
card.setStatus(2);
String oldStatus = card.getStatus();
card.setStatus("2");
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
// 创建审核记录
createAuditRecord(card.getCardNo(), oldStatus, 2, 1, batchAuditDto.getAuditOpinion(),
createAuditRecord(card.getId(), oldStatus, "2", "1", batchAuditDto.getAuditOpinion(),
null, auditorId, auditorName, true, batchAuditDto.getCardNos().size());
successCount++;
}
@@ -179,17 +176,17 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
for (String cardNo : batchReturnDto.getCardNos()) {
InfectiousCard card = infectiousCardMapper.selectByCardNo(cardNo);
if (card == null) continue;
if (Integer.valueOf(2).equals(card.getStatus()) || Integer.valueOf(3).equals(card.getStatus())) continue;
if ("2".equals(card.getStatus()) || "3".equals(card.getStatus())) continue;
// 更新状态为退回 (审核失败)
Integer oldStatus = card.getStatus();
card.setStatus(5);
String oldStatus = card.getStatus();
card.setStatus("5");
card.setReturnReason(batchReturnDto.getReturnReason());
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
// 创建审核记录
createAuditRecord(card.getCardNo(), oldStatus, 5, 3, null,
createAuditRecord(card.getId(), oldStatus, "5", "3", null,
batchReturnDto.getReturnReason(), auditorId, auditorName, true, batchReturnDto.getCardNos().size());
successCount++;
}
@@ -209,13 +206,13 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
String auditorName = SecurityUtils.getUsername();
// 更新状态
Integer oldStatus = card.getStatus();
card.setStatus(2);
String oldStatus = card.getStatus();
card.setStatus("2");
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
// 创建审核记录
createAuditRecord(card.getCardNo(), oldStatus, 2, 2, auditDto.getAuditOpinion(),
createAuditRecord(card.getId(), oldStatus, "2", "2", auditDto.getAuditOpinion(),
null, auditorId, auditorName, false, 1);
return R.ok("审核通过");
@@ -233,14 +230,14 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
String auditorName = SecurityUtils.getUsername();
// 更新状态
Integer oldStatus = card.getStatus();
card.setStatus(5);
String oldStatus = card.getStatus();
card.setStatus("5");
card.setReturnReason(returnDto.getReturnReason());
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
// 创建审核记录
createAuditRecord(card.getCardNo(), oldStatus, 5, 4, null,
createAuditRecord(card.getId(), oldStatus, "5", "4", null,
returnDto.getReturnReason(), auditorId, auditorName, false, 1);
return R.ok("已退回");
@@ -254,7 +251,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
if (queryParams.getRegistrationSource() != null) {
wrapper.eq(InfectiousCard::getRegistrationSource, queryParams.getRegistrationSource());
}
if (queryParams.getStatus() != null) {
if (StringUtils.hasText(queryParams.getStatus())) {
wrapper.eq(InfectiousCard::getStatus, queryParams.getStatus());
}
if (StringUtils.hasText(queryParams.getPatientName())) {
@@ -295,7 +292,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
row.createCell(1).setCellValue(card.getPatName());
row.createCell(2).setCellValue("1".equals(card.getSex()) ? "" : "2".equals(card.getSex()) ? "" : "未知");
row.createCell(3).setCellValue(card.getAge() != null ? card.getAge() + "" : "");
row.createCell(4).setCellValue(card.getDiseaseCode());
row.createCell(4).setCellValue(card.getDiseaseName());
row.createCell(5).setCellValue(card.getDeptName());
row.createCell(6).setCellValue(card.getCreateTime() != null ? dateFormat.format(card.getCreateTime()) : "");
row.createCell(7).setCellValue(getStatusText(card.getStatus()));
@@ -319,19 +316,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
@Override
public DoctorCardStatisticsDto getDoctorCardStatistics() {
Long userId = SecurityUtils.getUserId();
// 通过 sys_user 表的 user_id 查询医生表 (adm_practitioner) 获取医生 ID
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(userId);
if (practitioner == null) {
DoctorCardStatisticsDto dto = new DoctorCardStatisticsDto();
dto.setTotalCount(0);
dto.setPendingFailedCount(0);
dto.setReportedCount(0);
return dto;
}
Long doctorId = practitioner.getId();
Long doctorId = SecurityUtils.getUserId();
DoctorCardStatisticsDto dto = new DoctorCardStatisticsDto();
Integer totalCount = infectiousCardMapper.countByDoctorId(doctorId);
@@ -346,18 +331,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
@Override
public R<?> getDoctorCardPage(DoctorCardQueryDto queryParams) {
Long userId = SecurityUtils.getUserId();
// 通过 sys_user 表的 user_id 查询医生表 (adm_practitioner) 获取医生 ID
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(userId);
if (practitioner == null) {
Map<String, Object> emptyResult = new HashMap<>();
emptyResult.put("list", new ArrayList<>());
emptyResult.put("total", 0L);
return R.ok(emptyResult);
}
Long doctorId = practitioner.getId();
Long doctorId = SecurityUtils.getUserId();
Page<InfectiousCard> page = new Page<>(queryParams.getPageNo(), queryParams.getPageSize());
LambdaQueryWrapper<InfectiousCard> wrapper = new LambdaQueryWrapper<>();
@@ -366,7 +340,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
wrapper.eq(InfectiousCard::getDoctorId, doctorId);
// 状态筛选
if (queryParams.getStatus() != null) {
if (StringUtils.hasText(queryParams.getStatus())) {
wrapper.eq(InfectiousCard::getStatus, queryParams.getStatus());
}
@@ -380,24 +354,13 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
wrapper.le(InfectiousCard::getCreateTime, endDateTime);
}
// 关键词搜索(患者姓名、疾病编码、报卡名称)
// 关键词搜索(患者姓名报卡名称)
if (StringUtils.hasText(queryParams.getKeyword())) {
String kw = queryParams.getKeyword();
// 将关键词匹配报卡名称,找出对应的 cardNameCode 列表
List<Integer> matchedCodes = getMatchedCardNameCodes(kw);
// cardNameCode为null的记录默认也属于"中华人民共和国传染病报告卡"匹配到code=1时需包含Null记录
boolean includeNull = matchedCodes.contains(1);
wrapper.and(w -> {
w.like(InfectiousCard::getPatName, kw)
.or()
.like(InfectiousCard::getDiseaseCode, kw);
if (!matchedCodes.isEmpty()) {
w.or().in(InfectiousCard::getCardNameCode, matchedCodes);
}
if (includeNull) {
w.or().isNull(InfectiousCard::getCardNameCode);
}
});
wrapper.and(w -> w
.like(InfectiousCard::getPatName, queryParams.getKeyword())
.or()
.like(InfectiousCard::getDiseaseName, queryParams.getKeyword())
);
}
// 按创建时间倒序
@@ -425,19 +388,17 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
}
// 验证权限:只能提交自己的报卡
Long userId = SecurityUtils.getUserId();
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(userId);
if (practitioner == null || !practitioner.getId().equals(card.getDoctorId())) {
if (!card.getDoctorId().equals(SecurityUtils.getUserId())) {
return R.fail("无权操作此报卡");
}
// 证状态:只有暂存状态可以提交
if (!Integer.valueOf(0).equals(card.getStatus())) {
// 证状态:只有暂存状态可以提交
if (!"0".equals(card.getStatus())) {
return R.fail("只能提交暂存状态的报卡");
}
// 更新状态为已提交
card.setStatus(1);
card.setStatus("1");
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
@@ -453,19 +414,17 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
}
// 验证权限:只能撤回自己的报卡
Long userId = SecurityUtils.getUserId();
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(userId);
if (practitioner == null || !practitioner.getId().equals(card.getDoctorId())) {
if (!card.getDoctorId().equals(SecurityUtils.getUserId())) {
return R.fail("无权操作此报卡");
}
// 证状态:只有已提交状态可以撤回
if (!Integer.valueOf(1).equals(card.getStatus())) {
// 证状态:只有已提交状态可以撤回
if (!"1".equals(card.getStatus())) {
return R.fail("只能撤回已提交状态的报卡");
}
// 更新状态为暂存
card.setStatus(0);
card.setStatus("0");
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
@@ -481,19 +440,17 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
}
// 验证权限:只能删除自己的报卡
Long userId = SecurityUtils.getUserId();
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(userId);
if (practitioner == null || !practitioner.getId().equals(card.getDoctorId())) {
if (!card.getDoctorId().equals(SecurityUtils.getUserId())) {
return R.fail("无权操作此报卡");
}
// 证状态:只有暂存状态可以删除
if (!Integer.valueOf(0).equals(card.getStatus())) {
// 证状态:只有暂存状态可以删除
if (!"0".equals(card.getStatus())) {
return R.fail("只能删除暂存状态的报卡");
}
// 更新状态为作废
card.setStatus(6);
card.setStatus("6");
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
@@ -507,12 +464,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
return R.fail("请选择要提交的报卡");
}
Long userId = SecurityUtils.getUserId();
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(userId);
if (practitioner == null) {
return R.fail("当前用户未关联医生信息");
}
Long doctorId = practitioner.getId();
Long doctorId = SecurityUtils.getUserId();
int successCount = 0;
for (String cardNo : cardNos) {
@@ -520,13 +472,13 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
if (card == null) continue;
// 验证权限:只能提交自己的报卡
if (!doctorId.equals(card.getDoctorId())) continue;
if (!card.getDoctorId().equals(doctorId)) continue;
// 验证状态:只有暂存状态可以提交
if (!"0".equals(card.getStatus())) continue;
// 狋证状态:只有暂存状态可以提交
if (!Integer.valueOf(0).equals(card.getStatus())) continue;
// 更新状态为已提交
card.setStatus(1);
card.setStatus("1");
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
successCount++;
@@ -546,12 +498,7 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
return R.fail("请选择要删除的报卡");
}
Long userId = SecurityUtils.getUserId();
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(userId);
if (practitioner == null) {
return R.fail("当前用户未关联医生信息");
}
Long doctorId = practitioner.getId();
Long doctorId = SecurityUtils.getUserId();
int successCount = 0;
for (String cardNo : cardNos) {
@@ -559,13 +506,13 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
if (card == null) continue;
// 验证权限:只能删除自己的报卡
if (!doctorId.equals(card.getDoctorId())) continue;
if (!card.getDoctorId().equals(doctorId)) continue;
// 验证状态:只有暂存状态可以删除
if (!"0".equals(card.getStatus())) continue;
// 狋证状态:只有暂存状态可以删除
if (!Integer.valueOf(0).equals(card.getStatus())) continue;
// 更新状态为作废
card.setStatus(6);
card.setStatus("6");
card.setUpdateTime(new Date());
infectiousCardMapper.updateById(card);
successCount++;
@@ -583,13 +530,6 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
// 获取当前登录用户信息
LoginUser loginUser = SecurityUtils.getLoginUser();
Long currentUserId = loginUser.getUserId();
// 通过 sys_user 表的 user_id 查询医生表 (adm_practitioner) 获取医生 ID
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(currentUserId);
if (practitioner == null) {
return R.fail("当前用户未关联医生信息");
}
Long doctorId = practitioner.getId();
// 查询报卡
InfectiousCard card = infectiousCardMapper.selectByCardNo(updateDto.getCardNo());
@@ -598,12 +538,12 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
}
// 验证是否当前医生的报卡 - 根据 doctorId 字段验证
if (!doctorId.equals(card.getDoctorId())) {
if (!currentUserId.equals(card.getDoctorId())) {
return R.fail("只能修改自己的报卡");
}
// 证状态是否允许修改(只能修改暂存状态的报卡)
if (!Integer.valueOf(0).equals(card.getStatus())) {
// 证状态是否允许修改(只能修改暂存状态的报卡)
if (!"0".equals(card.getStatus())) {
return R.fail("只能修改暂存状态的报卡");
}
@@ -619,6 +559,15 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
card.setUpdateTime(new Date());
card.setUpdateBy(loginUser.getUsername()); // 使用username作为更新者
card.setUpdateTime(new Date());
card.setUpdateBy(loginUser.getUsername()); // 使用 username 作为更新者
card.setUpdateTime(new Date());
card.setUpdateBy(loginUser.getUsername()); // 使用 username 作为更新者
card.setUpdateTime(new Date());
card.setUpdateBy(loginUser.getUsername()); // 使用 username 作为更新者
int rows = infectiousCardMapper.updateById(card);
if (rows > 0) {
return R.ok("更新成功");
@@ -634,14 +583,12 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
}
// 验证权限:只能导出自己的报卡
Long userId = SecurityUtils.getUserId();
Practitioner practitioner = iPractitionerService.getPractitionerByUserId(userId);
if (practitioner == null || !practitioner.getId().equals(card.getDoctorId())) {
if (!card.getDoctorId().equals(SecurityUtils.getUserId())) {
return;
}
// 证状态:只有已上报状态可以导出
if (!Integer.valueOf(3).equals(card.getStatus())) {
// 证状态:只有已上报状态可以导出
if (!"3".equals(card.getStatus())) {
return;
}
@@ -665,8 +612,6 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
private DoctorCardListDto convertToDoctorCardListDto(InfectiousCard card) {
DoctorCardListDto dto = new DoctorCardListDto();
BeanUtils.copyProperties(card, dto);
// 由于数据库中没有 disease_name 字段,使用 disease_code 作为疾病名称展示
dto.setDiseaseName(card.getDiseaseCode());
dto.setCardName(getCardName(card.getCardNameCode()));
dto.setSubmitTime(card.getCreateTime() != null ?
new SimpleDateFormat("yyyy-MM-dd HH:mm").format(card.getCreateTime()) : null);
@@ -687,35 +632,13 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
}
}
/**
* 根据关键词匹配报卡名称,返回匹配的 cardNameCode 列表
*/
private List<Integer> getMatchedCardNameCodes(String keyword) {
// 报卡名称映射表 code -> name
java.util.Map<Integer, String> cardNameMap = new java.util.LinkedHashMap<>();
cardNameMap.put(1, "中华人民共和国传染病报告卡");
cardNameMap.put(2, "甲类传染病报告卡");
cardNameMap.put(3, "乙类传染病报告卡");
cardNameMap.put(4, "丙类传染病报告卡");
List<Integer> matchedCodes = new ArrayList<>();
for (java.util.Map.Entry<Integer, String> entry : cardNameMap.entrySet()) {
if (entry.getValue().contains(keyword)) {
matchedCodes.add(entry.getKey());
}
}
// cardNameCode 为 null 的数据默认也是「中华人民共和国传染病报告卡」
// 如果关键词匹配 code=1则同时要包含 null 的记录
return matchedCodes;
}
/**
* 转换审核记录为 DTO
*/
private AuditRecordDto convertAuditToDto(InfectiousAudit audit) {
AuditRecordDto dto = new AuditRecordDto();
BeanUtils.copyProperties(audit, dto);
dto.setCardId(audit.getCardId());
dto.setCardId(audit.getCardId() != null ? audit.getCardId().toString() : null);
return dto;
}
@@ -725,8 +648,6 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
private InfectiousCardDto convertToDto(InfectiousCard card) {
InfectiousCardDto dto = new InfectiousCardDto();
BeanUtils.copyProperties(card, dto);
// 由于数据库中没有 disease_name 字段,使用 disease_code 作为疾病名称展示
dto.setDiseaseName(card.getDiseaseCode());
dto.setStatusText(getStatusText(card.getStatus()));
return dto;
}
@@ -734,15 +655,15 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
/**
* 创建审核记录
*/
private void createAuditRecord(String cardId, Integer statusFrom, Integer statusTo, Integer auditType,
private void createAuditRecord(Long cardId, String statusFrom, String statusTo, String auditType,
String auditOpinion, String returnReason, String auditorId, String auditorName,
Boolean isBatch, Integer batchSize) {
InfectiousAudit audit = new InfectiousAudit();
audit.setCardId(cardId);
audit.setAuditSeq(infectiousAuditMapper.getNextAuditSeq(cardId));
audit.setAuditType(String.valueOf(auditType));
audit.setAuditStatusFrom(statusFrom != null ? String.valueOf(statusFrom) : null);
audit.setAuditStatusTo(statusTo != null ? String.valueOf(statusTo) : null);
audit.setAuditType(auditType);
audit.setAuditStatusFrom(statusFrom);
audit.setAuditStatusTo(statusTo);
audit.setAuditTime(LocalDateTime.now());
audit.setAuditorId(auditorId);
audit.setAuditorName(auditorName);
@@ -756,16 +677,15 @@ public class CardManageAppServiceImpl implements ICardManageAppService {
/**
* 获取状态文本
*/
private String getStatusText(Integer status) {
if (status == null) return "未知";
private String getStatusText(String status) {
switch (status) {
case 0: return "暂存";
case 1: return "已提交";
case 2: return "审核通过";
case 3: return "已上报";
case 4: return "失败";
case 5: return "审核失败";
case 6: return "作废";
case "0": return "暂存";
case "1": return "已提交";
case "2": return "审核通过";
case "3": return "已上报";
case "4": return "失败";
case "5": return "审核失败";
case "6": return "作废";
default: return "未知";
}
}

View File

@@ -29,8 +29,8 @@ public class CardQueryDto {
/** 患者姓名 */
private String patientName;
/** 审核状态(0暂存/1已提交/2已审核/3已上报/4失败/5退回/6作废) */
private Integer status;
/** 审核状态 */
private String status;
/** 科室ID */
private Long deptId;

View File

@@ -7,9 +7,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 医生个人报卡列表DTO
*
@@ -44,51 +41,6 @@ public class DoctorCardListDto {
/** 提交时间 */
private String submitTime;
/** 状态(0暂存/1已提交/2已审核/3已上报/4失败/5退回/6作废) */
private Integer status;
/** 疾病名称 */
private String diseaseName;
/** 发病日期 */
private LocalDate onsetDate;
/** 诊断日期 */
private LocalDateTime diagDate;
/** 报告单位 */
private String reportOrg;
/** 报告医生 */
private String reportDoc;
/** 传染病类别 */
private String diseaseType;
/** 性别 (1男/2女/0未知) */
private String sex;
/** 年龄 */
private Integer age;
/** 年龄单位 (1岁/2月/3天) */
private String ageUnit;
/** 现住址省 */
private String addressProv;
/** 现住址市 */
private String addressCity;
/** 现住址县 */
private String addressCounty;
/** 现住址街道 */
private String addressTown;
/** 现住址村/居委 */
private String addressVillage;
/** 现住址门牌号 */
private String addressHouse;
/** 状态 */
private String status;
}

View File

@@ -26,8 +26,8 @@ public class DoctorCardQueryDto {
/** 结束日期 */
private String endDate;
/** 状态(0暂存/1已提交/2已审核/3已上报/4失败/5退回/6作废) */
private Integer status;
/** 状态(0暂存/1已提交/2已审核/3已上报/4失败/5退回) */
private String status;
/** 患者姓名或报卡名称 */
private String keyword;

View File

@@ -1,44 +1,18 @@
package com.openhis.web.cardmanagement.dto;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
public class DoctorCardUpdateDto {
@NotBlank(message = "卡片编号不能为空")
private String cardNo;
private String phone;
private String contactPhone; // 紧急联系人电话
private LocalDate onsetDate;
private LocalDateTime diagDate;
private String diseaseType; // 病例分类对应InfectiousCard中的diseaseType字段
private String diseaseCode; // 疾病编码
@NotNull(message = "病例类别不能为空")
private Integer caseClass; // 病例类别(1疑似病例/2临床诊断病例/3实验室确诊病例/4病原携带者/5阳性检测结果)
private String occupation; // 职业
@NotNull(message = "病人属于不能为空")
private Integer patientBelong; // 病人属于(1本县区/2本市其他县区/3本省其他地市/4外省/5港澳台/6外籍)
private String addressProv; // 现住址省
private String addressCity; // 现住址市
private String addressCounty; // 现住址县
private String addressTown; // 现住址街道
private String addressVillage; // 现住址村/居委
private String addressHouse; // 现住址门牌号
private String parentName; // 家长姓名
private String workplace; // 工作单位
private String correctName; // 订正病名
private LocalDate deathDate; // 死亡日期
private String withdrawReason; // 退卡原因
private String otherDisease; // 其他传染病名称
private String diseaseType; // 修改为diseaseType对应InfectiousCard中的diseaseType字段
private String addressProv;
private String addressCity;
private String addressCounty;
private String addressHouse;
}

View File

@@ -65,8 +65,8 @@ public class InfectiousCardDto {
/** 现住址门牌号 */
private String addressHouse;
/** 病人属于(1本县区/2本市其他县区/3本省其他地市/4外省/5港澳台/6外籍) */
private Integer patientBelong;
/** 病人属于 */
private String patientbelong;
/** 职业 */
private String occupation;
@@ -110,8 +110,8 @@ public class InfectiousCardDto {
/** 填卡日期 */
private LocalDate reportDate;
/** 状态(0暂存/1已提交/2已审核/3已上报/4失败/5退回/6作废) */
private Integer status;
/** 状态 */
private String status;
/** 状态文本 */
private String statusText;

View File

@@ -18,14 +18,14 @@ import java.util.List;
public interface InfectiousAuditMapper extends BaseMapper<InfectiousAudit> {
/**
* 根据报卡编号查询审核记录
* 根据报卡ID查询审核记录
*/
@Select("SELECT * FROM infectious_audit WHERE card_id = #{cardId} ORDER BY audit_time DESC")
List<InfectiousAudit> selectByCardId(@Param("cardId") String cardId);
List<InfectiousAudit> selectByCardId(@Param("cardId") Long cardId);
/**
* 获取下一个审核序号
*/
@Select("SELECT COALESCE(MAX(audit_seq), 0) + 1 FROM infectious_audit WHERE card_id = #{cardId}")
Integer getNextAuditSeq(@Param("cardId") String cardId);
Integer getNextAuditSeq(@Param("cardId") Long cardId);
}

View File

@@ -21,25 +21,25 @@ public interface InfectiousCardMapper extends BaseMapper<InfectiousCard> {
/**
* 统计今日待审核数量
*/
@Select("SELECT COUNT(*) FROM infectious_card WHERE DATE(create_time) = CURRENT_DATE AND status = 1")
@Select("SELECT COUNT(*) FROM infectious_card WHERE DATE(create_time) = CURRENT_DATE AND status = '1'")
Integer countTodayPending();
/**
* 统计本月审核失败数量
*/
@Select("SELECT COUNT(*) FROM infectious_card WHERE DATE_TRUNC('month', create_time) = DATE_TRUNC('month', CURRENT_DATE) AND status = 5")
@Select("SELECT COUNT(*) FROM infectious_card WHERE DATE_TRUNC('month', create_time) = DATE_TRUNC('month', CURRENT_DATE) AND status = '5'")
Integer countMonthFailed();
/**
* 统计本月审核成功数量
*/
@Select("SELECT COUNT(*) FROM infectious_card WHERE DATE_TRUNC('month', create_time) = DATE_TRUNC('month', CURRENT_DATE) AND status = 2")
@Select("SELECT COUNT(*) FROM infectious_card WHERE DATE_TRUNC('month', create_time) = DATE_TRUNC('month', CURRENT_DATE) AND status = '2'")
Integer countMonthSuccess();
/**
* 统计本月已上报数量
*/
@Select("SELECT COUNT(*) FROM infectious_card WHERE DATE_TRUNC('month', create_time) = DATE_TRUNC('month', CURRENT_DATE) AND status = 3")
@Select("SELECT COUNT(*) FROM infectious_card WHERE DATE_TRUNC('month', create_time) = DATE_TRUNC('month', CURRENT_DATE) AND status = '3'")
Integer countMonthReported();
/**
@@ -55,14 +55,14 @@ public interface InfectiousCardMapper extends BaseMapper<InfectiousCard> {
Integer countByDoctorId(@Param("doctorId") Long doctorId);
/**
* 统计医生待提交状态为0暂存待提交
* 统计医生待处理失败状态为0暂存或4失败
*/
@Select("SELECT COUNT(*) FROM infectious_card WHERE doctor_id = #{doctorId} AND status = 0")
@Select("SELECT COUNT(*) FROM infectious_card WHERE doctor_id = #{doctorId} AND status IN ('0', '4')")
Integer countPendingFailedByDoctorId(@Param("doctorId") Long doctorId);
/**
* 统计医生已成功上报数状态为3已上报
*/
@Select("SELECT COUNT(*) FROM infectious_card WHERE doctor_id = #{doctorId} AND status = 3")
@Select("SELECT COUNT(*) FROM infectious_card WHERE doctor_id = #{doctorId} AND status = '3'")
Integer countReportedByDoctorId(@Param("doctorId") Long doctorId);
}

View File

@@ -22,8 +22,6 @@ import com.openhis.common.enums.ybenums.YbPayment;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.appointmentmanage.domain.SchedulePool;
import com.openhis.appointmentmanage.domain.ScheduleSlot;
import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
import com.openhis.clinical.domain.Order;
@@ -54,7 +52,6 @@ import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -108,18 +105,12 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
@Resource
IOrderService orderService;
@Resource
com.openhis.triageandqueuemanage.service.TriageQueueItemService triageQueueItemService;
@Resource
ScheduleSlotMapper scheduleSlotMapper;
@Resource
SchedulePoolMapper schedulePoolMapper;
@Resource
com.openhis.document.service.IEmrService iEmrService;
/**
* 门诊挂号 - 查询患者信息
*
@@ -265,24 +256,14 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R<?> returnRegister(CancelRegPaymentDto cancelRegPaymentDto) {
Encounter byId = iEncounterService.getById(cancelRegPaymentDto.getEncounterId());
if (byId == null) {
return R.fail(null, "就诊记录不存在");
}
if (EncounterStatus.CANCELLED.getValue().equals(byId.getStatusEnum())) {
return R.fail(null, "该患者已经退号,请勿重复退号");
}
// 只有待诊状态才能退号
if (!EncounterStatus.PLANNED.getValue().equals(byId.getStatusEnum())) {
return R.fail(null, "该患者已开始就诊,不能退号!");
}
// 诊前退号检查:病历、费用明细、班段时间
R<?> checkResult = checkPreConsultationRefund(byId);
if (checkResult != null) {
return checkResult;
return R.fail(null, "该患者医生已接诊,不能退号!");
}
iEncounterService.returnRegister(cancelRegPaymentDto.getEncounterId());
// 查询账户信息
@@ -327,9 +308,6 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
// 如果本次门诊挂号来自预约签到,同步把预约订单与号源槽位状态改为已退号
if (result != null && result.getCode() == 200) {
syncAppointmentReturnStatus(byId, cancelRegPaymentDto.getReason());
// 同步移除分诊队列中的记录
removeTriageQueueItem(byId.getId());
}
// 记录退号日志
@@ -339,149 +317,6 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
return R.ok(paymentRecon, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"退号"}));
}
/**
* 诊前退号检查
* 检查项:病历记录、费用明细、当日就诊、班段结束时间
*
* @param encounter 就诊记录
* @return null 表示通过检查,否则返回失败原因
*/
private R<?> checkPreConsultationRefund(Encounter encounter) {
Long encounterId = encounter.getId();
// 当日时间范围:今天 00:00:00 到 明天 00:00:00
LocalDate today = LocalDate.now();
LocalDateTime todayStart = today.atStartOfDay();
LocalDateTime tomorrowStart = today.plusDays(1).atStartOfDay();
Date todayStartDate = Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant());
Date tomorrowStartDate = Date.from(tomorrowStart.atZone(ZoneId.systemDefault()).toInstant());
// 1. 检查是否有当日病历记录(医生已写病历则不能退号)
// 只检查当天的病历,避免误判历史数据
// 条件:(recordTime在当天范围内) OR (recordTime为空 AND createTime在当天范围内)
long emrCount = iEmrService.count(new LambdaQueryWrapper<com.openhis.document.domain.Emr>()
.eq(com.openhis.document.domain.Emr::getEncounterId, encounterId)
.and(wrapper -> wrapper
.and(w -> w
.ge(com.openhis.document.domain.Emr::getRecordTime, todayStartDate)
.lt(com.openhis.document.domain.Emr::getRecordTime, tomorrowStartDate)
)
.or()
.and(w -> w
.isNull(com.openhis.document.domain.Emr::getRecordTime)
.ge(com.openhis.document.domain.Emr::getCreateTime, todayStartDate)
.lt(com.openhis.document.domain.Emr::getCreateTime, tomorrowStartDate)
)
));
if (emrCount > 0) {
return R.fail(null, "该患者已有病历记录,不能退号!");
}
// 2. 检查是否有当日费用明细(除挂号费外的其他费用)
// 只检查当天的费用明细,避免误判历史数据
// 条件:(occurrenceTime在当天范围内) OR (occurrenceTime为空 AND createTime在当天范围内)
long chargeItemCount = iChargeItemService.count(new LambdaQueryWrapper<ChargeItem>()
.eq(ChargeItem::getEncounterId, encounterId)
.ne(ChargeItem::getContextEnum, ChargeItemContext.REGISTER.getValue())
.ne(ChargeItem::getStatusEnum, ChargeItemStatus.REFUNDED.getValue())
.and(wrapper -> wrapper
.and(w -> w
.ge(ChargeItem::getOccurrenceTime, todayStartDate)
.lt(ChargeItem::getOccurrenceTime, tomorrowStartDate)
)
.or()
.and(w -> w
.isNull(ChargeItem::getOccurrenceTime)
.ge(ChargeItem::getCreateTime, todayStartDate)
.lt(ChargeItem::getCreateTime, tomorrowStartDate)
)
));
if (chargeItemCount > 0) {
return R.fail(null, "该患者已产生诊疗费用,不能退号!");
}
// 3. 检查是否当日就诊(防止隔日财务封账)
if (encounter.getCreateTime() != null) {
LocalDate encounterDate = encounter.getCreateTime().toInstant()
.atZone(ZoneId.systemDefault()).toLocalDate();
if (encounterDate.isBefore(today)) {
return R.fail(null, "非当日就诊记录,不能退号!");
}
}
// 4. 检查班段是否已结束(通过预约订单获取班段信息)
R<?> shiftCheckResult = checkShiftEnded(encounter);
if (shiftCheckResult != null) {
return shiftCheckResult;
}
return null; // 检查通过
}
/**
* 检查班段是否已结束
* 截止时间 = 班段结束时间
*
* @param encounter 就诊记录
* @return null 表示通过检查,否则返回失败原因
*/
private R<?> checkShiftEnded(Encounter encounter) {
try {
// 通过患者、科室、日期查找关联的预约订单
LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<Order>()
.eq(Order::getPatientId, encounter.getPatientId())
.in(Order::getStatus, CommonConstants.AppointmentOrderStatus.BOOKED,
CommonConstants.AppointmentOrderStatus.CHECKED_IN)
.orderByDesc(Order::getUpdateTime)
.orderByDesc(Order::getCreateTime)
.last("LIMIT 1");
if (encounter.getOrganizationId() != null) {
queryWrapper.eq(Order::getDepartmentId, encounter.getOrganizationId());
}
if (encounter.getTenantId() != null) {
queryWrapper.eq(Order::getTenantId, encounter.getTenantId());
}
if (encounter.getCreateTime() != null) {
LocalDate encounterDate = encounter.getCreateTime().toInstant()
.atZone(ZoneId.systemDefault()).toLocalDate();
Date startOfDay = Date.from(encounterDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
Date nextDayStart = Date.from(encounterDate.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
queryWrapper.ge(Order::getAppointmentDate, startOfDay)
.lt(Order::getAppointmentDate, nextDayStart);
}
Order appointmentOrder = orderService.getOne(queryWrapper, false);
if (appointmentOrder == null || appointmentOrder.getSlotId() == null) {
// 没有关联的预约订单,跳过班段检查(非预约挂号的场景)
return null;
}
// 获取号源槽位
ScheduleSlot slot = scheduleSlotMapper.selectById(appointmentOrder.getSlotId());
if (slot == null || slot.getPoolId() == null) {
return null;
}
// 获取号源池(班段信息)
SchedulePool pool = schedulePoolMapper.selectById(slot.getPoolId());
if (pool == null || pool.getEndTime() == null) {
return null;
}
// 检查当前时间是否已过班段结束时间
LocalTime now = LocalTime.now();
if (now.isAfter(pool.getEndTime())) {
return R.fail(null, "当前班段已结束,不能退号!");
}
return null;
} catch (Exception e) {
log.warn("检查班段结束时间失败, encounterId={}", encounter.getId(), e);
// 异常情况下允许退号,避免阻断正常业务
return null;
}
}
/**
* 查询当日就诊数据
*
@@ -785,48 +620,4 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
}
}
/**
* 移除分诊队列中的记录
* 退号时同步移除患者队列记录,避免已退号患者仍在排队
*
* @param encounterId 就诊ID
*/
private void removeTriageQueueItem(Long encounterId) {
if (encounterId == null) {
return;
}
// 1. 移除分诊队列中的记录(必须成功,否则回滚事务)
com.openhis.triageandqueuemanage.domain.TriageQueueItem queueItem = triageQueueItemService.getOne(
new LambdaQueryWrapper<com.openhis.triageandqueuemanage.domain.TriageQueueItem>()
.eq(com.openhis.triageandqueuemanage.domain.TriageQueueItem::getEncounterId, encounterId)
.eq(com.openhis.triageandqueuemanage.domain.TriageQueueItem::getDeleteFlag, "0")
);
if (queueItem != null) {
// 逻辑删除队列项
queueItem.setDeleteFlag("1");
queueItem.setUpdateTime(LocalDateTime.now());
triageQueueItemService.updateById(queueItem);
log.info("退号成功已移除分诊队列记录encounterId={}, queueItemId={}", encounterId, queueItem.getId());
}
// 2. 移除候选池排除记录(非必须,即使失败也不影响主流程)
try {
TriageCandidateExclusion exclusion = triageCandidateExclusionService.getOne(
new LambdaQueryWrapper<TriageCandidateExclusion>()
.eq(TriageCandidateExclusion::getEncounterId, encounterId)
.eq(TriageCandidateExclusion::getDeleteFlag, "0")
);
if (exclusion != null) {
exclusion.setDeleteFlag("1");
exclusion.setUpdateTime(LocalDateTime.now());
triageCandidateExclusionService.updateById(exclusion);
log.info("已移除候选池排除记录encounterId={}", encounterId);
}
} catch (Exception e) {
// 候选池排除记录移除失败不影响主流程,仅记录日志
log.warn("移除候选池排除记录失败encounterId={}", encounterId, e);
}
}
}

View File

@@ -146,28 +146,4 @@ public class CurrentDayEncounterDto {
*/
private Integer displayOrder;
/**
* 是否来自预约签到
* true: 预约签到
* false: 正常挂号
*/
private Boolean isFromAppointment;
/**
* 号源槽位ID关联 adm_schedule_slot.id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long slotId;
/**
* 号源池ID关联 adm_schedule_pool.id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long poolId;
/**
* 诊室名称Bug #410分诊队列需显示诊室而非科室
*/
private String clinicRoom;
}

View File

@@ -72,12 +72,6 @@ public class EncounterFormData {
@JsonSerialize(using = ToStringSerializer.class)
private Long organizationId;
/**
* 预约订单ID用于预约签到时关联预约订单
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long orderId;
/**
* 设置默认值
*/

View File

@@ -4,11 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.common.core.domain.R;
import com.openhis.check.domain.CheckMethod;
import com.openhis.check.domain.CheckPackage;
import com.openhis.check.service.ICheckMethodService;
import com.openhis.check.service.ICheckPackageService;
import com.openhis.web.check.appservice.ICheckMethodAppService;
import com.openhis.web.check.dto.CheckMethodDto;
import com.openhis.web.reportmanage.utils.ExcelFillerUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -19,7 +16,6 @@ import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
@Slf4j
@@ -28,15 +24,10 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService {
@Resource
private ICheckMethodService checkMethodService;
@Resource
private ICheckPackageService checkPackageService; // Bug #384修复注入套餐服务
@Override
public R<?> getCheckMethodList() {
List<CheckMethod> list = checkMethodService.list();
// Bug #384修复转换为DTO并关联套餐价格
List<CheckMethodDto> dtoList = convertToDtoWithPackagePrice(list);
return R.ok(dtoList);
return R.ok(list);
}
@Override
@@ -52,67 +43,7 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService {
wrapper.eq(CheckMethod::getPackageName, packageName);
}
List<CheckMethod> list = checkMethodService.list(wrapper);
// Bug #384修复转换为DTO并关联套餐价格
List<CheckMethodDto> dtoList = convertToDtoWithPackagePrice(list);
return R.ok(dtoList);
}
/**
* Bug #384修复转换CheckMethod为DTO并通过packageName关联查询套餐价格
* @param methods 检查方法列表
* @return 包含套餐价格的DTO列表
*/
private List<CheckMethodDto> convertToDtoWithPackagePrice(List<CheckMethod> methods) {
if (methods == null || methods.isEmpty()) {
return List.of();
}
// 获取所有packageName批量查询套餐
List<String> packageNames = methods.stream()
.map(CheckMethod::getPackageName)
.filter(ObjectUtil::isNotEmpty)
.distinct()
.collect(Collectors.toList());
// Bug #384修复: 批量查询套餐信息使用final变量
final Map<String, CheckPackage> packageMap;
if (!packageNames.isEmpty()) {
List<CheckPackage> packages = checkPackageService.list(
new LambdaQueryWrapper<CheckPackage>()
.in(CheckPackage::getPackageName, packageNames)
.eq(CheckPackage::getIsDisabled, 0) // 只查未停用的套餐
);
packageMap = packages.stream()
.collect(Collectors.toMap(CheckPackage::getPackageName, p -> p, (p1, p2) -> p1));
} else {
packageMap = Map.of();
}
// 转换为DTO并填充价格
return methods.stream().map(m -> {
CheckMethodDto dto = new CheckMethodDto();
dto.setId(m.getId() != null ? m.getId().longValue() : null);
dto.setCheckType(m.getCheckType());
dto.setCode(m.getCode());
dto.setName(m.getName());
dto.setPackageName(m.getPackageName());
dto.setExposureNum(m.getExposureNum());
dto.setOrderNum(m.getOrderNum());
dto.setRemark(m.getRemark());
dto.setCreateTime(m.getCreateTime());
dto.setUpdateTime(m.getUpdateTime());
// 通过packageName匹配套餐价格
if (ObjectUtil.isNotEmpty(m.getPackageName())) {
CheckPackage pkg = packageMap.get(m.getPackageName());
if (pkg != null) {
dto.setPackagePrice(pkg.getPackagePrice());
dto.setServiceFee(pkg.getServiceFee());
}
}
return dto;
}).collect(Collectors.toList());
return R.ok(list);
}
@Override

View File

@@ -5,12 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.common.core.controller.BaseController;
import com.core.common.core.domain.AjaxResult;
import com.core.common.core.page.TableDataInfo;
import com.core.common.exception.ServiceException;
import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.SecurityUtils;
import com.openhis.administration.domain.Account;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.administration.service.IAccountService;
import com.openhis.administration.service.IChargeItemService;
import com.openhis.check.domain.ExamApply;
import com.openhis.check.domain.ExamApplyItem;
@@ -20,10 +17,7 @@ import com.openhis.common.constant.CommonConstants;
import com.openhis.common.enums.AssignSeqEnum;
import com.openhis.common.enums.ChargeItemStatus;
import com.openhis.common.enums.GenerateSource;
import com.openhis.common.enums.ItemType;
import com.openhis.common.enums.RequestStatus;
import com.openhis.administration.domain.Organization;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.web.check.dto.ExamApplyDto;
import com.openhis.web.check.dto.ExamApplyItemDto;
import com.openhis.workflow.domain.ServiceRequest;
@@ -63,41 +57,17 @@ public class ExamApplyController extends BaseController {
@Autowired
private IChargeItemService chargeItemService;
@Autowired
private IAccountService accountService;
@Autowired
private AssignSeqUtil assignSeqUtil;
@Autowired
private IOrganizationService organizationService;
/**
* 查询检查申请单列表
*/
@GetMapping("/list")
public TableDataInfo list(ExamApply examApply, @RequestParam(value = "encounterId", required = false) Long encounterId) {
public TableDataInfo list(ExamApply examApply) {
startPage();
LambdaQueryWrapper<ExamApply> wrapper = new LambdaQueryWrapper<>();
// 优先按本次就诊 encounterId 过滤(通过 wor_service_request 关联)
if (encounterId != null) {
List<ServiceRequest> reqList = serviceRequestService.list(new LambdaQueryWrapper<ServiceRequest>()
.eq(ServiceRequest::getEncounterId, encounterId)
.eq(ServiceRequest::getBasedOnTable, "exam_apply")
.isNotNull(ServiceRequest::getBasedOnId)
);
List<Long> basedOnIds = reqList.stream()
.map(ServiceRequest::getBasedOnId)
.filter(java.util.Objects::nonNull)
.distinct()
.toList();
// 没有本次就诊的检查申请单时,直接返回空列表
if (basedOnIds.isEmpty()) {
return getDataTable(java.util.Collections.emptyList());
}
wrapper.in(ExamApply::getId, basedOnIds);
} else if (examApply.getVisitNo() != null) {
// 兼容旧逻辑:按 visitNo 查询(可能包含历史记录)
if (examApply.getVisitNo() != null) {
wrapper.eq(ExamApply::getVisitNo, examApply.getVisitNo());
}
wrapper.orderByDesc(ExamApply::getApplyTime);
@@ -177,8 +147,6 @@ public class ExamApplyController extends BaseController {
examApply.setOperatorId("system");
}
examApplyService.save(examApply);
// 业务主键为 apply_no自增 id 不会随 save 回填;列表接口依赖 wor_service_request.based_on_id=exam_apply.id 关联本次就诊,此处必须回读 id
examApply = examApplyService.getById(applyNo);
// ========== 2. 批量保存明细 + 写入门诊医嘱 + 写入费用项 ==========
if (dto.getItems() != null && !dto.getItems().isEmpty()) {
@@ -223,9 +191,6 @@ public class ExamApplyController extends BaseController {
// 检查申请不走诊疗定义设置为0占位数据库有NOT NULL约束
serviceRequest.setActivityId(0L);
// 🔧 Bug Fix: 设置医嘱类型为诊疗(3),与检验申请保持一致
// categoryEnum=3 → SQL查询返回 adviceType=3诊疗避免被错误归类为药品
serviceRequest.setCategoryEnum(ItemType.ACTIVITY.getValue());
// 患者和就诊信息 —— 使用前端传递的数字型ID
if (dto.getPatientIdNum() != null) {
@@ -236,19 +201,8 @@ public class ExamApplyController extends BaseController {
}
serviceRequest.setRequesterId(currentUserId); // 开单医生
// 53d15f8079d15ba4Ff1a4f1851484f7f7528524d7aef4f20516576846267884c79d15ba44ee37801Ff0c542652194f7f75285f53524d7528623779d15ba4
Long performDeptId = currentOrgId;
if (dto.getPerformDeptCode() != null && !dto.getPerformDeptCode().isEmpty()) {
Organization performDept = organizationService.getOne(
new LambdaQueryWrapper<Organization>().eq(Organization::getBusNo, dto.getPerformDeptCode()).last("limit 1"));
if (performDept != null) {
performDeptId = performDept.getId();
}
}
serviceRequest.setOrgId(performDeptId); // 6267884c79d15ba4
serviceRequest.setOrgId(currentOrgId); // 执行科室
serviceRequest.setAuthoredTime(now); // 签发时间
// 🔧 Bug Fix: 不设置门诊类型,保留上面已设置的 categoryEnum=3诊疗类型
// EncounterClass.AMB.getValue()=2 表示门诊类型,会覆盖诊疗类型导致医嘱被错误归类
serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 来源=医生开立
// 将项目名称存入 contentJson使医嘱列表能通过 JSON 字段回显 adviceName
@@ -289,17 +243,10 @@ public class ExamApplyController extends BaseController {
chargeItem.setRequestingOrgId(currentOrgId); // 开立科室
chargeItem.setEnteredDate(now); // 开立时间
// 以下字段均有 NOT NULL 约束检查申请不走定价体系用0占位
// 以下字段均有 NOT NULL 约束,检查申请不走定价/账户体系用0占位
chargeItem.setDefinitionId(0L); // 费用定价ID
// 🔧 BugFix#385: 获取患者真实的自费账户预结算验证要求accountId必须真实存在
Account selfAccount = accountService.getSelfAccount(dto.getEncounterId());
if (selfAccount == null) {
throw new ServiceException("患者自费账户不存在无法创建检查收费项encounterId=" + dto.getEncounterId());
}
chargeItem.setAccountId(selfAccount.getId());
// 🔧 BugFix#385: 使用 ItemType.ACTIVITY.getValue()=3 表示诊疗而不是硬编码的2
// ItemType 枚举定义MEDICINE=1, DEVICE=2(耗材), ACTIVITY=3(诊疗)
chargeItem.setContextEnum(ItemType.ACTIVITY.getValue()); // 类型3=诊疗
chargeItem.setAccountId(0L); // 关联账户ID
chargeItem.setContextEnum(2); // 类型2=诊疗
chargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION); // 产品来源表
chargeItem.setProductId(0L); // 产品ID
@@ -421,9 +368,6 @@ public class ExamApplyController extends BaseController {
serviceRequest.setBasedOnTable("exam_apply");
serviceRequest.setBasedOnId(examApply.getId());
serviceRequest.setActivityId(0L);
// 🔧 Bug Fix: 设置医嘱类型为诊疗(3),与检验申请保持一致
// categoryEnum=3 → SQL查询返回 adviceType=3诊疗避免被错误归类为药品
serviceRequest.setCategoryEnum(ItemType.ACTIVITY.getValue());
if (dto.getPatientIdNum() != null) {
serviceRequest.setPatientId(dto.getPatientIdNum());
@@ -432,19 +376,8 @@ public class ExamApplyController extends BaseController {
serviceRequest.setEncounterId(dto.getEncounterId());
}
serviceRequest.setRequesterId(currentUserId);
// 53d15f8079d15ba4Ff1a4f1851484f7f7528524d7aef4f20516576846267884c79d15ba44ee37801Ff0c542652194f7f75285f53524d7528623779d15ba4
Long performDeptId2 = currentOrgId;
if (dto.getPerformDeptCode() != null && !dto.getPerformDeptCode().isEmpty()) {
Organization performDept2 = organizationService.getOne(
new LambdaQueryWrapper<Organization>().eq(Organization::getBusNo, dto.getPerformDeptCode()).last("limit 1"));
if (performDept2 != null) {
performDeptId2 = performDept2.getId();
}
}
serviceRequest.setOrgId(performDeptId2); // 6267884c79d15ba4
serviceRequest.setOrgId(currentOrgId);
serviceRequest.setAuthoredTime(now);
// 🔧 Bug Fix: 不设置门诊类型,保留上面已设置的 categoryEnum=3诊疗类型
// EncounterClass.AMB.getValue()=2 表示门诊类型,会覆盖诊疗类型导致医嘱被错误归类
serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
// 将项目名称存入 contentJson使医嘱列表能通过 JSON 字段回显 adviceName
@@ -479,14 +412,8 @@ public class ExamApplyController extends BaseController {
chargeItem.setRequestingOrgId(currentOrgId);
chargeItem.setEnteredDate(now);
chargeItem.setDefinitionId(0L);
// 🔧 BugFix#385: 获取患者真实的自费账户预结算验证要求accountId必须真实存在
Account selfAccount = accountService.getSelfAccount(dto.getEncounterId());
if (selfAccount == null) {
throw new ServiceException("患者自费账户不存在无法创建检查收费项encounterId=" + dto.getEncounterId());
}
chargeItem.setAccountId(selfAccount.getId());
// 🔧 BugFix#385: 使用 ItemType.ACTIVITY.getValue()=3 表示诊疗
chargeItem.setContextEnum(ItemType.ACTIVITY.getValue());
chargeItem.setAccountId(0L);
chargeItem.setContextEnum(2);
chargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
chargeItem.setProductId(0L);

View File

@@ -1,15 +1,12 @@
package com.openhis.web.check.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 检查方法DTO - Bug #384修复增加套餐价格字段
* 用于API返回数据传输不含数据库注解
*/
@Data
@Accessors(chain = true)
public class CheckMethodDto {
@@ -17,6 +14,7 @@ public class CheckMethodDto {
/**
* 检查方法ID
*/
@TableId(type = IdType.AUTO)
private Long id;
/* 检查类型 */
@@ -31,12 +29,6 @@ public class CheckMethodDto {
/* 套餐名称 */
private String packageName;
/* 套餐价格 - Bug #384修复通过packageName匹配CheckPackage获取 */
private BigDecimal packagePrice;
/* 服务费 - Bug #384修复通过packageName匹配CheckPackage获取 */
private BigDecimal serviceFee;
/* 曝光次数 */
private Integer exposureNum;

View File

@@ -136,11 +136,9 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
}
}
// Bug #432 修复获取当前登录用户信息增加null校验防止NPE
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser == null) {
return R.fail("用户未登录或登录已过期");
}
LoginUser loginUser = new LoginUser();
//获取当前登录用户信息
loginUser = SecurityUtils.getLoginUser();
// 当前登录用户ID
Long userId = loginUser.getUserId();

View File

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
/**
* 手术安排Controller
@@ -99,22 +98,4 @@ public class SurgicalScheduleController {
surgicalScheduleAppService.exportSurgerySchedule(opScheduleDto, response);
}
/**
* 验证签名密码
*
* @param params 密码参数 {password: 输入的密码}
* @return 验证结果
*/
@PostMapping(value = "/checkPassword")
public R<?> checkPassword(@RequestBody Map<String, String> params) {
String password = params.get("password");
com.core.common.core.domain.model.LoginUser loginUser = com.core.common.utils.SecurityUtils.getLoginUser();
String encodedPassword = loginUser.getPassword();
if (com.core.common.utils.SecurityUtils.matchesPassword(password, encodedPassword)) {
return R.ok(true, "密码验证成功");
} else {
return R.fail(false, "账户密码错误,请重新输入");
}
}
}

View File

@@ -581,33 +581,8 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
.collect(Collectors.groupingBy(Practitioner::getOrgId));
// 构建树形结构
// 过滤条件:科室分类只要包含"门诊(编码1)"或"住院(编码2)"其一,即可显示
List<DepartmentTreeDto> treeList = new ArrayList<>();
for (Organization dept : deptList) {
// 过滤科室:只显示包含门诊(1)或住院(2)分类的科室
String classEnum = dept.getClassEnum();
boolean needShow = false;
if (classEnum != null && !classEnum.isEmpty()) {
// 拆分分类编码,检查是否包含 1 或 2
String[] codes = classEnum.split(",");
for (String code : codes) {
code = code.trim();
if ("1".equals(code) || "2".equals(code)) {
needShow = true;
break;
}
}
} else {
// 如果没有分类,默认显示
needShow = true;
}
if (!needShow) {
// 既不包含门诊也不包含住院,跳过
continue;
}
DepartmentTreeDto treeDto = new DepartmentTreeDto();
treeDto.setId(dept.getId());
treeDto.setLabel(dept.getName());
@@ -624,10 +599,11 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
})
.collect(Collectors.toList());
treeDto.setChildren(children);
// 只添加有医生的科室
treeList.add(treeDto);
} else {
treeDto.setChildren(new ArrayList<>());
}
// 没有医生的科室不添加到列表中
treeList.add(treeDto);
}
@@ -1364,13 +1340,9 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
throw new IllegalArgumentException("会诊申请不存在");
}
// 会诊必须处于已提交或已确认状态才能确认
// - 已提交(10):还没有医生确认
// - 已确认(20):已有部分医生确认,允许其他医生继续确认(每个医生独立确认,类似已读)
// - 已签名(30)或已完成(40):不能再确认
if (request.getConsultationStatus() != null &&
request.getConsultationStatus() >= ConsultationStatusEnum.SIGNED.getCode()) {
throw new IllegalArgumentException("会诊已签名或完成,无法再确认");
// 只有已提交状态才能确认
if (request.getConsultationStatus() != ConsultationStatusEnum.SUBMITTED.getCode()) {
throw new IllegalArgumentException("只有已提交状态的会诊申请才能确认");
}
// 2. 获取当前登录医生信息
@@ -1388,28 +1360,26 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
throw new IllegalArgumentException("您不在被邀请的医生列表中");
}
log.info("会诊确认检查currentPhysicianId={}, invitedId={}, invitedStatus={}, CONFIRMED.code={}",
currentPhysicianId, invited.getId(), invited.getInvitedStatus(), ConsultationStatusEnum.CONFIRMED.getCode());
if (invited.getInvitedStatus() != null && invited.getInvitedStatus() >= ConsultationStatusEnum.CONFIRMED.getCode()) {
throw new IllegalArgumentException("您已经确认过了,无需重复确认");
}
// 4. 更新邀请记录(存储会诊意见)
// Bug #388格式化存储确保回显时参加医师意见完整
invited.setInvitedStatus(ConsultationStatusEnum.CONFIRMED.getCode());
String deptName = StringUtils.hasText(dto.getConfirmingDeptName())
? dto.getConfirmingDeptName() : invited.getInvitedDepartmentName();
String physician = StringUtils.hasText(dto.getConfirmingPhysician())
? dto.getConfirmingPhysician() : currentPhysicianName;
// 格式:科室-参加医师:意见内容
String formattedOpinion = String.format("%s-%s%s", deptName, physician, dto.getConsultationOpinion());
// 格式:科室-会诊确认参加医师意见内容
// 兼容:若前端未填写“会诊确认参加医师”,则回退为当前医生姓名
String confirmingPhysicianText =
StringUtils.hasText(dto.getConfirmingPhysician()) ? dto.getConfirmingPhysician().trim() : currentPhysicianName;
String formattedOpinion = String.format("%s-%s%s",
currentDeptName,
confirmingPhysicianText,
dto.getConsultationOpinion());
invited.setInvitedStatus(ConsultationStatusEnum.CONFIRMED.getCode()); // 已确认
invited.setConfirmOpinion(formattedOpinion);
invited.setConfirmTime(new Date());
consultationInvitedMapper.updateById(invited);
log.info("医生 {} 确认会诊", currentPhysicianName);
log.info("医生 {} 确认会诊,意见:{}", currentPhysicianName, formattedOpinion);
// 5. 更新会诊申请的确认计数
Integer confirmedCount = (request.getConfirmedCount() == null ? 0 : request.getConfirmedCount()) + 1;
@@ -1707,8 +1677,8 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
// 更新确认记录
updateConfirmationRecord(request);
// 🎯 需求:专家签名后会诊医嘱状态保持"已签发"ACTIVE = 已发送/已签发),不改为已完成
updateServiceRequestStatus(request.getOrderId(), RequestStatus.ACTIVE.getValue());
// 更新医嘱状态为"已完成"
updateServiceRequestStatus(request.getOrderId(), RequestStatus.COMPLETED.getValue());
// 🎯 更新会诊关联费用项状态为"待收费",这样收费界面就能看到了
if (request.getOrderId() != null) {

View File

@@ -19,7 +19,7 @@ import java.util.List;
* TODO:器材目录
*
* @author lpt
* @date 2025-02-20
* @date 2025-02-20
*/
@RestController
@RequestMapping("/data-dictionary/device")

View File

@@ -147,12 +147,6 @@ public class DiagnosisTreatmentDto {
/** 费用套餐名称JOIN inspection_basic_information.package_name */
private String packageName;
/** 套餐金额JOIN inspection_basic_information.package_amount */
private BigDecimal packageAmount;
/** 套餐服务费JOIN inspection_basic_information.service_fee */
private BigDecimal serviceFee;
/** 下级医技类型ID关联 inspection_type 子类) */
@JsonSerialize(using = ToStringSerializer.class)
private Long subItemId;

View File

@@ -116,12 +116,4 @@ public interface IDoctorStationAdviceAppService {
* @return 检查url相关参数
*/
R<?> getTestResult(Long encounterId);
/**
* 获取当前科室已配置的药品类别列表
*
* @param organizationId 科室id
* @return 已配置的药品类别编码列表
*/
R<?> getConfiguredCategories(Long organizationId);
}

View File

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.core.domain.R;
import com.core.common.core.redis.RedisCache;
import com.core.common.enums.DelFlag;
import com.core.common.enums.TenantOptionDict;
import com.core.common.exception.ServiceException;
import com.core.common.utils.AssignSeqUtil;
@@ -22,8 +21,6 @@ import com.openhis.administration.domain.Encounter;
import com.openhis.administration.service.IAccountService;
import com.openhis.administration.service.IChargeItemService;
import com.openhis.administration.service.IEncounterService;
import com.openhis.administration.service.IEncounterDiagnosisService;
import com.openhis.administration.domain.EncounterDiagnosis;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.*;
@@ -117,9 +114,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
@Resource
IEncounterService iEncounterService;
@Resource
IEncounterDiagnosisService iEncounterDiagnosisService;
@Resource
IInventoryItemService inventoryItemService;
@@ -160,7 +154,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
String safePricingFlag = pricingFlag != null ? pricingFlag.toString() : "";
String safePageNo = pageNo != null ? pageNo.toString() : "";
String safePageSize = pageSize != null ? pageSize.toString() : "";
String safeCategoryCode = categoryCode != null ? categoryCode : "";
// 设置默认科室:仅当前端/调用方未传 organizationId 时才回退到登录人科室
// 否则会导致门诊划价等场景(按患者挂号科室查询)返回空
@@ -175,7 +168,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
String cacheKey = null;
if (useCache) {
// 生成缓存 key无搜索关键字时按科室缓存
cacheKey = ADVICE_BASE_INFO_CACHE_PREFIX + organizationId + ":" + safeAdviceTypesStr + ":" + safeCategoryCode + ":" + safePageNo + ":" + safePageSize;
cacheKey = ADVICE_BASE_INFO_CACHE_PREFIX + organizationId + ":" + safeAdviceTypesStr + ":" + safePageNo + ":" + safePageSize;
// 先清除可能存在的无效缓存JSONObject类型
if (redisCache.hasKey(cacheKey)) {
@@ -287,8 +280,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
}
String unitCode = ""; // 包装单位
Long chargeItemDefinitionId; // 费用定价主表ID
// 检查是否有取药科室配置(用于药品类型)
boolean hasPharmacyConfig = medLocationConfig != null && !medLocationConfig.isEmpty();
for (AdviceBaseDto baseDto : adviceBaseDtoList) {
String tableName = baseDto.getAdviceTableName();
if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(tableName)) { // 药品
@@ -297,9 +288,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
.setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, baseDto.getSkinTestFlag()));
// 是否为注射药物
baseDto.setInjectFlag_enumText(EnumUtils.getInfoByValue(Whether.class, baseDto.getInjectFlag()));
// 设置是否缺少取药科室配置标志
baseDto.setPharmacyConfigMissing(!hasPharmacyConfig);
// fallthrough to 耗材处理逻辑(保持原有逻辑)
// 每一条医嘱的库存集合信息 , 包装单位库存前端计算
@@ -504,25 +492,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
@Transactional(rollbackFor = Exception.class)
public R<?> saveAdvice(AdviceSaveParam adviceSaveParam, String adviceOpType) {
try {
// 🔧 BugFix#333/335/336: 参数非空校验
if (adviceSaveParam == null) {
log.error("BugFix#333: adviceSaveParam 为 null");
return R.fail(null, "请求参数为空,请刷新页面后重试");
}
// 患者挂号对应的科室id
Long organizationId = adviceSaveParam.getOrganizationId();
// 医嘱分类信息
List<AdviceSaveDto> adviceSaveList = adviceSaveParam.getAdviceSaveList();
// 🔧 BugFix#333: 医嘱列表非空校验
if (adviceSaveList == null || adviceSaveList.isEmpty()) {
log.error("BugFix#333: adviceSaveList 为 null 或空adviceOpType={}", adviceOpType);
return R.fail(null, "医嘱列表为空,请刷新页面后重试");
}
// 🔍 Debug日志: 记录请求入口
log.info("========== BugFix#333/335/336 DEBUG START ==========");
log.info("========== BugFix#219 DEBUG START ==========");
log.info("saveAdvice called, adviceOpType={}, organizationId={}, adviceSaveList.size={}",
adviceOpType, organizationId, adviceSaveList != null ? adviceSaveList.size() : 0);
if (adviceSaveList != null && !adviceSaveList.isEmpty()) {
@@ -611,38 +587,27 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
}
}
// 按后端 ItemType 枚举标准分类:
// MEDICINE=1药品、DEVICE=2耗材、ACTIVITY=3诊疗、SURGERY=6手术
// 药品分类adviceType == 1
// 药品前端adviceType=1
List<AdviceSaveDto> medicineList = adviceSaveList.stream()
.filter(e -> e.getAdviceType() != null && e.getAdviceType() == ItemType.MEDICINE.getValue())
.collect(Collectors.toList());
// 耗材分类adviceType == 2
.filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())
|| e.getAdviceType() == 1).collect(Collectors.toList());
// 耗材前端adviceType=4后端ItemType.DEVICE=2
List<AdviceSaveDto> deviceList = adviceSaveList.stream()
.filter(e -> e.getAdviceType() != null && e.getAdviceType() == ItemType.DEVICE.getValue())
.collect(Collectors.toList());
// 诊疗分类adviceType == 3
List<AdviceSaveDto> activityList = adviceSaveList.stream()
.filter(e -> e.getAdviceType() != null
&& (e.getAdviceType() == ItemType.ACTIVITY.getValue()
|| e.getAdviceType() == ItemType.SURGERY.getValue())) // 手术(6)也走诊疗流程
.filter(e -> ItemType.DEVICE.getValue().equals(e.getAdviceType())
|| e.getAdviceType() == 4) // 前端耗材类型值为4
.collect(Collectors.toList());
// 🔍 Debug日志日志: 记录分类结果
log.info("BugFix#219: 医嘱分类完成 - 药品:{}, 耗材:{}, 诊疗:{}",
// 诊疗活动前端adviceType=3诊疗、adviceType=5会诊、adviceType=6手术
List<AdviceSaveDto> activityList = adviceSaveList.stream()
.filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())
|| e.getAdviceType() == 3 // 前端诊疗类型值为3
|| e.getAdviceType() == 5 // 前端会诊类型值为5
|| ItemType.SURGERY.getValue().equals(e.getAdviceType())) // 🔧 BugFix#318: 手术类型值为6
.collect(Collectors.toList());
// 🔍 Debug日志: 记录分类结果
log.info("BugFix#219: 医嘱分类完成 - 药品:{}, 耗材:{}, 诊疗:{}",
medicineList.size(), deviceList.size(), activityList.size());
// 🔍 Debug日志: 打印所有医嘱的adviceType
for (AdviceSaveDto dto : adviceSaveList) {
log.info("BugFix#219: 医嘱详情 - adviceType:{}, requestId:{}, adviceName:{}, dbOpType:{}",
dto.getAdviceType(), dto.getRequestId(),
dto.getContentJson() != null && dto.getContentJson().contains("adviceName")
? dto.getContentJson().substring(0, Math.min(100, dto.getContentJson().length()))
: "N/A",
dto.getDbOpType());
}
// 统计各类删除操作
long medDeleteCount = medicineList.stream().filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).count();
@@ -666,18 +631,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
iDeviceDispenseService.deleteDeviceDispense(adviceSaveDto.getRequestId());
}
// 🔧 Bug Fix: 跳过库存校验(临时医嘱已计费,不需要重复校验库存)
// List<AdviceSaveDto> needCheckList = adviceSaveList.stream()
// .filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType())
// && !ItemType.ACTIVITY.getValue().equals(e.getAdviceType())
// && !ItemType.DEVICE.getValue().equals(e.getAdviceType())
// && !ItemType.SURGERY.getValue().equals(e.getAdviceType()))
// .collect(Collectors.toList());
// // 校验库存
// String tipRes = adviceUtils.checkInventory(needCheckList);
// if (tipRes != null) {
// return R.fail(null, tipRes);
// }
// 🔧 Bug Fix: 跳过耗材、诊疗、手术的库存校验
List<AdviceSaveDto> needCheckList = adviceSaveList.stream()
.filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType())
&& !ItemType.ACTIVITY.getValue().equals(e.getAdviceType())
&& !ItemType.DEVICE.getValue().equals(e.getAdviceType())
&& !ItemType.SURGERY.getValue().equals(e.getAdviceType())) // 🔧 BugFix#318: 排除手术类型
.collect(Collectors.toList());
// 校验库存
String tipRes = adviceUtils.checkInventory(needCheckList);
if (tipRes != null) {
return R.fail(null, tipRes);
}
}
// 当前时间
Date curDate = new Date();
@@ -702,173 +667,19 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 签发时,把草稿状态的账单更新为待收费
if (AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType) && !adviceSaveList.isEmpty()) {
// 签发的医嘱id集合 - 收集所有需要签发的医嘱ID
// 签发的医嘱id集合
List<Long> requestIds = adviceSaveList.stream()
.filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null)
.collect(Collectors.toList()).stream().map(AdviceSaveDto::getRequestId)
.collect(Collectors.toList());
// 🔧 BugFix: 批量更新药品请求状态为已签发(ACTIVE=2)
if (!requestIds.isEmpty() && !medicineList.isEmpty()) {
List<Long> medicineIds = medicineList.stream()
.filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null)
.map(AdviceSaveDto::getRequestId)
.collect(Collectors.toList());
if (!medicineIds.isEmpty()) {
log.info("BugFix: 准备批量更新药品医嘱状态medicineIds={}", medicineIds);
UpdateWrapper<MedicationRequest> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("id", medicineIds);
updateWrapper.set("status_enum", RequestStatus.ACTIVE.getValue());
boolean updateResult = iMedicationRequestService.update(null, updateWrapper);
log.info("BugFix: 批量更新药品医嘱状态为已签发count={}, result={}", medicineIds.size(), updateResult);
// 🔧 BugFix: 如果批量更新失败,尝试逐个更新
if (!updateResult) {
log.warn("BugFix: 批量更新药品医嘱状态失败,尝试逐个更新");
for (Long medicineId : medicineIds) {
try {
MedicationRequest updateReq = new MedicationRequest();
updateReq.setId(medicineId);
updateReq.setStatusEnum(RequestStatus.ACTIVE.getValue());
boolean singleResult = iMedicationRequestService.updateById(updateReq);
log.info("BugFix: 逐个更新药品医嘱状态id={}, result={}", medicineId, singleResult);
} catch (Exception e) {
log.error("BugFix: 逐个更新药品医嘱状态失败id={}", medicineId, e);
}
}
}
}
}
// 🔧 BugFix: 批量更新耗材请求状态为已签发(ACTIVE=2)
if (!requestIds.isEmpty() && !deviceList.isEmpty()) {
List<Long> deviceIds = deviceList.stream()
.filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null)
.map(AdviceSaveDto::getRequestId)
.collect(Collectors.toList());
if (!deviceIds.isEmpty()) {
log.info("BugFix: 准备批量更新耗材医嘱状态deviceIds={}", deviceIds);
UpdateWrapper<DeviceRequest> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("id", deviceIds);
updateWrapper.set("status_enum", RequestStatus.ACTIVE.getValue());
boolean updateResult = iDeviceRequestService.update(null, updateWrapper);
log.info("BugFix: 批量更新耗材医嘱状态为已签发count={}, result={}", deviceIds.size(), updateResult);
// 🔧 BugFix: 如果批量更新失败,尝试逐个更新
if (!updateResult) {
log.warn("BugFix: 批量更新耗材医嘱状态失败,尝试逐个更新");
for (Long deviceId : deviceIds) {
try {
DeviceRequest updateReq = new DeviceRequest();
updateReq.setId(deviceId);
updateReq.setStatusEnum(RequestStatus.ACTIVE.getValue());
boolean singleResult = iDeviceRequestService.updateById(updateReq);
log.info("BugFix: 逐个更新耗材医嘱状态id={}, result={}", deviceId, singleResult);
} catch (Exception e) {
log.error("BugFix: 逐个更新耗材医嘱状态失败id={}", deviceId, e);
}
}
}
}
}
// 🔧 BugFix: 批量更新诊疗请求状态为已签发(ACTIVE=2)
if (!requestIds.isEmpty() && !activityList.isEmpty()) {
List<Long> activityIds = activityList.stream()
.filter(e -> !DbOpType.DELETE.getCode().equals(e.getDbOpType()) && e.getRequestId() != null)
.map(AdviceSaveDto::getRequestId)
.collect(Collectors.toList());
if (!activityIds.isEmpty()) {
log.info("BugFix: 准备批量更新诊疗医嘱状态activityIds={}", activityIds);
UpdateWrapper<ServiceRequest> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("id", activityIds);
updateWrapper.set("status_enum", RequestStatus.ACTIVE.getValue());
boolean updateResult = iServiceRequestService.update(null, updateWrapper);
log.info("BugFix: 批量更新诊疗医嘱状态为已签发count={}, result={}", activityIds.size(), updateResult);
// 🔧 BugFix: 如果批量更新失败,尝试逐个更新
if (!updateResult) {
log.warn("BugFix: 批量更新诊疗医嘱状态失败,尝试逐个更新");
for (Long activityId : activityIds) {
try {
ServiceRequest updateReq = new ServiceRequest();
updateReq.setId(activityId);
updateReq.setStatusEnum(RequestStatus.ACTIVE.getValue());
boolean singleResult = iServiceRequestService.updateById(updateReq);
log.info("BugFix: 逐个更新诊疗医嘱状态id={}, result={}", activityId, singleResult);
} catch (Exception e) {
log.error("BugFix: 逐个更新诊疗医嘱状态失败id={}", activityId, e);
}
}
}
}
}
// 就诊id
Long encounterId = adviceSaveList.get(0).getEncounterId();
// 🔧 BugFix#385: 签发时更新诊疗医嘱关联的费用项诊断信息
// 检查申请创建的费用项没有诊断关联,需要在签发时补充
if (!activityList.isEmpty()) {
// 先从就诊中获取主诊断,用于补充没有诊断关联的费用项
List<EncounterDiagnosis> encounterDiagList = iEncounterDiagnosisService.getDiagnosisList(encounterId);
EncounterDiagnosis mainDiagnosis = iEncounterDiagnosisService.getMainDiagnosis(encounterDiagList);
Long mainConditionId = mainDiagnosis != null ? mainDiagnosis.getConditionId() : null;
Long mainEncounterDiagId = mainDiagnosis != null ? mainDiagnosis.getId() : null;
log.info("BugFix#385: 签发时获取就诊主诊断, encounterId={}, mainConditionId={}, mainEncounterDiagId={}",
encounterId, mainConditionId, mainEncounterDiagId);
for (AdviceSaveDto adviceDto : activityList) {
if (adviceDto.getRequestId() != null) {
// 查询诊疗医嘱关联的费用项
List<ChargeItem> chargeItems = iChargeItemService.getChargeItemInfoByReqId(
Arrays.asList(adviceDto.getRequestId()));
if (chargeItems != null && !chargeItems.isEmpty()) {
// 过滤只保留诊疗类型的费用项
ChargeItem chargeItem = chargeItems.stream()
.filter(ci -> CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(ci.getServiceTable()))
.findFirst().orElse(null);
if (chargeItem != null) {
// 🔧 BugFix#385: 如果费用项没有诊断关联,使用主诊断补充
Long conditionId = adviceDto.getConditionId();
Long encounterDiagId = adviceDto.getEncounterDiagnosisId();
// 如果传入的诊断为空,使用主诊断
if (conditionId == null) {
conditionId = mainConditionId;
}
if (encounterDiagId == null) {
encounterDiagId = mainEncounterDiagId;
}
// 更新诊断关联
if (conditionId != null || encounterDiagId != null) {
chargeItem.setConditionId(conditionId);
chargeItem.setEncounterDiagnosisId(encounterDiagId);
iChargeItemService.updateById(chargeItem);
log.info("BugFix#385: 签发时更新诊疗费用项诊断关联, chargeItemId={}, conditionId={}, encounterDiagnosisId={}",
chargeItem.getId(), conditionId, encounterDiagId);
}
}
}
}
}
}
// 🔧 BugFix#385: 使用安全的更新方法,避免并发冲突 - 更新费用项状态
// 需要处理两种情况:
// 1. 从 DRAFT (0) → PLANNED (1):新创建的收费项目
// 2. 从 BILLABLE (2) → PLANNED (1):保存时已设为待结算的项目
// 使用安全的更新方法,避免并发冲突
iChargeItemService.updateChargeStatusByConditionSafe(
encounterId,
ChargeItemStatus.DRAFT.getValue(),
ChargeItemStatus.PLANNED.getValue(),
requestIds);
// 🔧 BugFix#385: 同时处理 BILLABLE 状态的收费项目
iChargeItemService.updateChargeStatusByConditionSafe(
encounterId,
ChargeItemStatus.BILLABLE.getValue(),
ChargeItemStatus.PLANNED.getValue(),
encounterId,
ChargeItemStatus.DRAFT.getValue(),
ChargeItemStatus.PLANNED.getValue(),
requestIds);
}
@@ -911,14 +722,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 声明费用项
ChargeItem chargeItem;
// 新增 + 修改
// 🔧 BugFix: 如果 requestId 不为空说明是已存在的医嘱,需要更新,即使 dbOpType 不匹配也应该包含进来
List<AdviceSaveDto> insertOrUpdateList = medicineList.stream()
.filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType())
|| e.getRequestId() != null))
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
.collect(Collectors.toList());
// 删除
// 🔧 BugFix: 如果 dbOpType 不匹配但 requestId 存在,仍然允许删除(增加健壮性)
List<AdviceSaveDto> deleteList = medicineList.stream()
.filter(e -> DbOpType.DELETE.getCode().equals(e.getDbOpType())).collect(Collectors.toList());
// 校验删除的医嘱是否已经收费
@@ -958,71 +766,18 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
}
// 签发时
if (is_sign) {
// 🔧 Bug Fix #328: 只对药品类型的医嘱生成处方号
// 检验申请单生成的医嘱是诊疗项目(adviceType=3),不需要处方号
List<AdviceSaveDto> medicineListForPrescription = insertOrUpdateList.stream()
.filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType()))
.collect(Collectors.toList());
if (!medicineListForPrescription.isEmpty()) {
prescriptionUtils.generatePrescriptionNumbers(medicineListForPrescription);
}
// 生成处方号
prescriptionUtils.generatePrescriptionNumbers(insertOrUpdateList);
}
List<String> medRequestIdList = new ArrayList<>();
// 🔧 防重复保存:对新增医嘱进行去重
// 去重逻辑:针对同一患者、同一就诊、同一药品、同一剂量的医嘱,只保存一条
Set<String> uniqueKeySet = new HashSet<>();
List<AdviceSaveDto> uniqueInsertOrUpdateList = new ArrayList<>();
for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
// 构建唯一标识键患者ID + 就诊ID + 药品ID + 剂量 + 用法 + 频次
String uniqueKey = adviceSaveDto.getPatientId() + "_" +
adviceSaveDto.getEncounterId() + "_" +
adviceSaveDto.getAdviceDefinitionId() + "_" +
adviceSaveDto.getDose() + "_" +
adviceSaveDto.getMethodCode() + "_" +
adviceSaveDto.getRateCode();
// 如果是新增操作且唯一标识已存在,则跳过
if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) &&
uniqueKeySet.contains(uniqueKey)) {
log.warn("防重复保存:检测到重复医嘱,跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
continue;
}
// 添加到去重集合和列表
uniqueKeySet.add(uniqueKey);
uniqueInsertOrUpdateList.add(adviceSaveDto);
}
// 使用去重后的列表进行保存
log.info("防重复保存:去重前{}条,去重后{}条", insertOrUpdateList.size(), uniqueInsertOrUpdateList.size());
insertOrUpdateList = uniqueInsertOrUpdateList;
for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
// 🔧 Bug Fix: 确保accountId有效不为null且账户存在
boolean needNewAccount = false;
// 🔧 Bug Fix: 确保accountId不为null与handleBoundDevices保持一致
if (adviceSaveDto.getAccountId() == null) {
needNewAccount = true;
} else {
// 验证账户是否存在且有效(未被删除,租户匹配)
Account existingAccount = iAccountService.getById(adviceSaveDto.getAccountId());
if (existingAccount == null) {
log.warn("handMedication - 前端传入的accountId无效账户不存在accountId={},将重新获取或创建账户",
adviceSaveDto.getAccountId());
needNewAccount = true;
}
}
if (needNewAccount) {
// 尝试从患者就诊中获取默认账户ID自费账户
Account selfAccount = iAccountService.getSelfAccount(adviceSaveDto.getEncounterId());
if (selfAccount != null) {
adviceSaveDto.setAccountId(selfAccount.getId());
log.info("handMedication - 使用现有自费账户accountId={}", selfAccount.getId());
} else {
// 自动创建自费账户
Account newAccount = new Account();
@@ -1036,7 +791,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
newAccount.setName(AccountType.PERSONAL_CASH_ACCOUNT.getInfo());
Long newAccountId = iAccountService.saveAccountByRegister(newAccount);
adviceSaveDto.setAccountId(newAccountId);
log.info("handMedication - 自动创建自费账户newAccountId={}", newAccountId);
}
}
@@ -1113,19 +867,14 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 保存药品费用项
chargeItem = new ChargeItem();
chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
chargeItem.setStatusEnum(2); // 已生成医嘱
chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo()));
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
// 🔧 Bug Fix: 如果definitionId为空,使用adviceDefinitionId作为后备
Long definitionId = adviceSaveDto.getDefinitionId();
if (definitionId == null) {
definitionId = adviceSaveDto.getAdviceDefinitionId();
}
chargeItem.setDefinitionId(definitionId); // 费用定价ID
chargeItem.setDefinitionId(adviceSaveDto.getDefinitionId()); // 费用定价ID
chargeItem.setDefDetailId(adviceSaveDto.getDefinitionDetailId()); // 定价子表主键
chargeItem.setEntererId(adviceSaveDto.getPractitionerId());// 开立人ID
chargeItem.setRequestingOrgId(orgId); // 开立科室
@@ -1144,12 +893,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
// #415 价格非负验证
BigDecimal unitPrice = adviceSaveDto.getUnitPrice();
if (unitPrice != null && unitPrice.compareTo(BigDecimal.ZERO) < 0) {
unitPrice = unitPrice.abs(); // 负数取绝对值
}
chargeItem.setUnitPrice(unitPrice); // 单价
chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
// 显式设置tenantId、createBy和createTime字段防止自动填充机制失效
@@ -1159,15 +903,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
iChargeItemService.saveOrUpdate(chargeItem);
// 显式更新前端传的chargeItemId对应的收费项目状态为2已生成医嘱
if (adviceSaveDto.getChargeItemId() != null) {
LambdaUpdateWrapper<ChargeItem> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(ChargeItem::getId, adviceSaveDto.getChargeItemId())
.set(ChargeItem::getStatusEnum, 2);
iChargeItemService.update(updateWrapper);
log.info("已更新药品收费项目状态为已生成医嘱chargeItemId{}", adviceSaveDto.getChargeItemId());
}
// 🔧 Bug Fix #145: 处理用法绑定的耗材
if (StringUtils.isNotBlank(adviceSaveDto.getMethodCode())) {
handleBoundDevices(adviceSaveDto, medicationRequest, chargeItem, curDate, orgId, tenantId,
@@ -1357,11 +1092,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 声明费用项
ChargeItem chargeItem;
// 新增 + 修改
// 🔧 BugFix: 如果 requestId 不为空说明是已存在的医嘱,需要更新,即使 dbOpType 不匹配也应该包含进来
List<AdviceSaveDto> insertOrUpdateList = deviceList.stream()
.filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType())
|| e.getRequestId() != null))
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
.collect(Collectors.toList());
// 删除
List<AdviceSaveDto> deleteList = deviceList.stream()
@@ -1432,26 +1165,12 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
log.info("BugFix#219: ========== handDevice END ==========");
for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
// 🔧 Bug Fix: 确保accountId有效(不为null且账户存在)
boolean needNewAccount = false;
// 🔧 Bug Fix: 确保accountId不为null
if (adviceSaveDto.getAccountId() == null) {
needNewAccount = true;
} else {
// 验证账户是否存在且有效(未被删除,租户匹配)
Account existingAccount = iAccountService.getById(adviceSaveDto.getAccountId());
if (existingAccount == null) {
log.warn("handDevice - 前端传入的accountId无效账户不存在accountId={},将重新获取或创建账户",
adviceSaveDto.getAccountId());
needNewAccount = true;
}
}
if (needNewAccount) {
// 尝试从患者就诊中获取默认账户ID自费账户
Account selfAccount = iAccountService.getSelfAccount(adviceSaveDto.getEncounterId());
if (selfAccount != null) {
adviceSaveDto.setAccountId(selfAccount.getId());
log.info("handDevice - 使用现有自费账户accountId={}", selfAccount.getId());
} else {
// 自动创建自费账户
Account newAccount = new Account();
@@ -1465,10 +1184,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
newAccount.setName(AccountType.PERSONAL_CASH_ACCOUNT.getInfo());
Long newAccountId = iAccountService.saveAccountByRegister(newAccount);
adviceSaveDto.setAccountId(newAccountId);
log.info("handDevice - 自动创建自费账户newAccountId={}", newAccountId);
}
}
// 🔧 Bug Fix: 确保practitionerId不为null
if (adviceSaveDto.getPractitionerId() == null) {
adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
@@ -1530,18 +1248,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItem.setTenantId(tenantId); // 补全租户 ID
chargeItem.setCreateBy(currentUsername); // 补全创建人
chargeItem.setCreateTime(curDate); // 补全创建时间
chargeItem.setStatusEnum(2); // 已生成医嘱
chargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue()); // 收费状态
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
// 🔧 Bug Fix: 如果definitionId为空,使用adviceDefinitionId作为后备
Long defId = adviceSaveDto.getDefinitionId();
if (defId == null) {
defId = adviceSaveDto.getAdviceDefinitionId();
}
chargeItem.setDefinitionId(defId); // 费用定价ID
chargeItem.setDefinitionId(adviceSaveDto.getDefinitionId()); // 费用定价ID
chargeItem.setDefDetailId(adviceSaveDto.getDefinitionDetailId()); // 定价子表主键
chargeItem.setEntererId(adviceSaveDto.getPractitionerId());// 开立人ID
chargeItem.setRequestingOrgId(orgId); // 开立科室
@@ -1556,7 +1269,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
log.warn("耗材的 definitionId 或 definitionDetailId 为 null尝试从定价信息中获取: deviceDefId={}",
adviceSaveDto.getAdviceDefinitionId());
// 查询耗材定价信息
log.warn("查询耗材定价信息: orgId={}, deviceDefId={}", orgId, adviceSaveDto.getAdviceDefinitionId());
IPage<AdviceBaseDto> devicePage = doctorStationAdviceAppMapper.getAdviceBaseInfo(
new Page<>(1, 1),
PublicationStatus.ACTIVE.getValue(),
@@ -1586,10 +1298,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
}
}
// 如果definitionId为null使用前端传入的价格信息
// 🔧 Bug Fix: 确保定义ID不为null
if (chargeItem.getDefinitionId() == null) {
log.warn("无法获取耗材的 definitionId,使用前端传入的价格: deviceDefId={}", adviceSaveDto.getAdviceDefinitionId());
// 不抛异常使用前端传入的unitPrice和totalPrice
log.error("无法获取耗材的 definitionId: deviceDefId={}", adviceSaveDto.getAdviceDefinitionId());
throw new ServiceException("无法获取耗材的定价信息,请联系管理员");
}
// 🔧 Bug Fix: 如果accountId为null从就诊中获取账户ID如果没有则自动创建
@@ -1621,12 +1333,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
// #415 价格非负验证
BigDecimal unitPrice = adviceSaveDto.getUnitPrice();
if (unitPrice != null && unitPrice.compareTo(BigDecimal.ZERO) < 0) {
unitPrice = unitPrice.abs(); // 负数取绝对值
}
chargeItem.setUnitPrice(unitPrice); // 单价
chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
// 显式设置审计字段,防止自动填充机制失效
@@ -1635,15 +1342,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItem.setCreateTime(new Date());
iChargeItemService.saveOrUpdate(chargeItem);
// 显式更新前端传的chargeItemId对应的收费项目状态为2已生成医嘱
if (adviceSaveDto.getChargeItemId() != null) {
LambdaUpdateWrapper<ChargeItem> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(ChargeItem::getId, adviceSaveDto.getChargeItemId())
.set(ChargeItem::getStatusEnum, 2);
iChargeItemService.update(updateWrapper);
log.info("已更新耗材收费项目状态为已生成医嘱chargeItemId{}", adviceSaveDto.getChargeItemId());
}
}
}
}
@@ -1667,11 +1365,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 声明费用项
ChargeItem chargeItem;
// 新增 + 修改
// 🔧 BugFix: 如果 requestId 不为空说明是已存在的医嘱,需要更新,即使 dbOpType 不匹配也应该包含进来
List<AdviceSaveDto> insertOrUpdateList = activityList.stream()
.filter(e -> (DbOpType.INSERT.getCode().equals(e.getDbOpType())
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType())
|| e.getRequestId() != null))
|| DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
.collect(Collectors.toList());
// 删除
List<AdviceSaveDto> deleteList = activityList.stream()
@@ -1708,26 +1404,12 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
}
for (AdviceSaveDto adviceSaveDto : insertOrUpdateList) {
// 🔧 Bug Fix: 确保accountId有效(不为null且账户存在)
boolean needNewAccount = false;
// 🔧 Bug Fix: 确保accountId不为null
if (adviceSaveDto.getAccountId() == null) {
needNewAccount = true;
} else {
// 验证账户是否存在且有效(未被删除,租户匹配)
Account existingAccount = iAccountService.getById(adviceSaveDto.getAccountId());
if (existingAccount == null) {
log.warn("handService - 前端传入的accountId无效账户不存在accountId={},将重新获取或创建账户",
adviceSaveDto.getAccountId());
needNewAccount = true;
}
}
if (needNewAccount) {
// 尝试从患者就诊中获取默认账户ID自费账户
Account selfAccount = iAccountService.getSelfAccount(adviceSaveDto.getEncounterId());
if (selfAccount != null) {
adviceSaveDto.setAccountId(selfAccount.getId());
log.info("handService - 使用现有自费账户accountId={}", selfAccount.getId());
} else {
// 自动创建自费账户
Account newAccount = new Account();
@@ -1741,10 +1423,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
newAccount.setName(AccountType.PERSONAL_CASH_ACCOUNT.getInfo());
Long newAccountId = iAccountService.saveAccountByRegister(newAccount);
adviceSaveDto.setAccountId(newAccountId);
log.info("handService - 自动创建自费账户newAccountId={}", newAccountId);
}
}
// 🔧 Bug Fix: 确保practitionerId不为null
if (adviceSaveDto.getPractitionerId() == null) {
adviceSaveDto.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId());
@@ -1793,14 +1474,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 普通诊疗医嘱
serviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum());
}
// 🔧 BugFix#385: 检查类型(adviceType=2)不走定价体系activityId设置为0L占位
// 与ExamApplyController保持一致数据库有NOT NULL约束
if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 2) {
serviceRequest.setActivityId(0L);
} else {
serviceRequest.setActivityId(adviceSaveDto.getAdviceDefinitionId());// 诊疗定义id
}
serviceRequest.setActivityId(adviceSaveDto.getAdviceDefinitionId());// 诊疗定义id
serviceRequest.setPatientId(adviceSaveDto.getPatientId()); // 患者
serviceRequest.setRequesterId(adviceSaveDto.getPractitionerId()); // 开方医生
serviceRequest.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
@@ -1827,18 +1502,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItem.setTenantId(tenantId); // 补全租户ID
chargeItem.setCreateBy(currentUsername); // 补全创建人
chargeItem.setCreateTime(curDate); // 补全创建时间
chargeItem.setStatusEnum(2); // 已生成医嘱
chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
// 🔧 Bug Fix: 如果definitionId为空,使用adviceDefinitionId作为后备
Long defId3 = adviceSaveDto.getDefinitionId();
if (defId3 == null) {
defId3 = adviceSaveDto.getAdviceDefinitionId();
}
chargeItem.setDefinitionId(defId3); // 费用定价ID
chargeItem.setDefinitionId(adviceSaveDto.getDefinitionId()); // 费用定价ID
chargeItem.setDefDetailId(adviceSaveDto.getDefinitionDetailId()); // 定价子表主键
chargeItem.setEntererId(adviceSaveDto.getPractitionerId());// 开立人ID
chargeItem.setEnteredDate(curDate); // 开立时间
@@ -1852,32 +1522,15 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
chargeItem.setEncounterDiagnosisId(adviceSaveDto.getEncounterDiagnosisId()); // 就诊诊断id
chargeItem.setQuantityValue(adviceSaveDto.getQuantity()); // 数量
chargeItem.setQuantityUnit(adviceSaveDto.getUnitCode()); // 单位
// #415 价格非负验证
BigDecimal unitPrice = adviceSaveDto.getUnitPrice();
if (unitPrice != null && unitPrice.compareTo(BigDecimal.ZERO) < 0) {
unitPrice = unitPrice.abs(); // 负数取绝对值
}
chargeItem.setUnitPrice(unitPrice); // 单价
chargeItem.setUnitPrice(adviceSaveDto.getUnitPrice()); // 单价
chargeItem.setTotalPrice(adviceSaveDto.getTotalPrice()); // 总价
iChargeItemService.saveOrUpdate(chargeItem);
// 显式更新前端传的chargeItemId对应的收费项目状态为2已生成医嘱
if (adviceSaveDto.getChargeItemId() != null) {
LambdaUpdateWrapper<ChargeItem> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(ChargeItem::getId, adviceSaveDto.getChargeItemId())
.set(ChargeItem::getStatusEnum, 2);
iChargeItemService.update(updateWrapper);
log.info("已更新诊疗收费项目状态为已生成医嘱chargeItemId{}", adviceSaveDto.getChargeItemId());
}
// 第一次保存时,处理诊疗套餐的子项信息
if (adviceSaveDto.getRequestId() == null) {
ActivityDefinition activityDefinition
= iActivityDefinitionService.getById(adviceSaveDto.getAdviceDefinitionId());
if (activityDefinition == null) {
continue;
}
String childrenJson = activityDefinition.getChildrenJson();
if (childrenJson != null) {
// 诊疗子项参数类
@@ -1916,38 +1569,14 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// }
// log.error(e.getMessage(), e);
// }
// 🔧 BugFix#328: 签发时将收费项目状态从草稿改为待收费
// 修复检验申请单生成的医嘱签发失败问题
// 签发时将收费项目状态从草稿改为待收费
Long chargeItemId = adviceSaveDto.getChargeItemId();
ChargeItem existingChargeItem = null;
// 方式1通过chargeItemId直接查询
if (chargeItemId != null) {
existingChargeItem = iChargeItemService.getById(chargeItemId);
}
// 方式2如果chargeItemId为null通过requestIdserviceId查询费用项
// 检验申请单创建的医嘱可能没有传递chargeItemId需要通过serviceId查找
if (existingChargeItem == null && adviceSaveDto.getRequestId() != null) {
existingChargeItem = iChargeItemService.getOne(
new LambdaQueryWrapper<ChargeItem>()
.eq(ChargeItem::getServiceId, adviceSaveDto.getRequestId())
.eq(ChargeItem::getServiceTable, CommonConstants.TableName.WOR_SERVICE_REQUEST)
.eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode())
);
log.info("BugFix#328: 通过requestId查询费用项requestId={}, chargeItem={}",
adviceSaveDto.getRequestId(), existingChargeItem != null ? existingChargeItem.getId() : "null");
}
// 更新费用项状态
if (existingChargeItem != null) {
existingChargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());
iChargeItemService.updateById(existingChargeItem);
log.info("BugFix#328: 更新费用项状态为待收费chargeItemId={}, status={}",
existingChargeItem.getId(), ChargeItemStatus.PLANNED.getValue());
} else {
log.warn("BugFix#328: 未找到对应的费用项无法更新状态requestId={}, chargeItemId={}",
adviceSaveDto.getRequestId(), chargeItemId);
ChargeItem existingChargeItem = iChargeItemService.getById(chargeItemId);
if (existingChargeItem != null) {
existingChargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());
iChargeItemService.updateById(existingChargeItem);
}
}
}
}
@@ -2281,23 +1910,4 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
return searchKey.matches("[a-zA-Z]+");
}
/**
* 获取当前科室已配置的药品类别列表
*
* @param organizationId 科室id
* @return 已配置的药品类别编码列表
*/
@Override
public R<?> getConfiguredCategories(Long organizationId) {
// 查询取药科室配置
List<AdviceInventoryDto> medLocationConfig = doctorStationAdviceAppMapper.getMedLocationConfig(organizationId);
// 提取不重复的 categoryCode
List<String> categoryCodes = medLocationConfig.stream()
.map(AdviceInventoryDto::getCategoryCode)
.filter(code -> code != null && !code.isEmpty())
.distinct()
.collect(Collectors.toList());
return R.ok(categoryCodes);
}
}

Some files were not shown because too many files have changed in this diff Show More