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

Merge branch 'zhaoyun' of http://192.168.110.253:3000/wangyizhe/his into zhaoyun

Browse Source 
# Conflicts:
#	openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java
This commit is contained in:
关羽
2026-05-20 09:40:03 +08:00
parent 1767710754 ca8b547062
commit c39f0175bb
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.agentforge/analysis/556.md
View File

@@ -25,3 +25,11 @@
1. `initData()`: Add `formData.executeTime = formatDateTime(new Date())` after line 899 1. `initData()`: Add `formData.executeTime = formatDateTime(new Date())` after line 899
2. `resetForm()`: Change `executeTime: null` to `executeTime: formatDateTime(new Date())` at line 1550 2. `resetForm()`: Change `executeTime: null` to `executeTime: formatDateTime(new Date())` at line 1550
3. `loadApplicationToForm()`: Fix `isPackage` logic at line 2000 3. `loadApplicationToForm()`: Fix `isPackage` logic at line 2000
修复结果：✅ 成功，5行改动
### 修改内容
1. `initData()` (line ~898): 新增 `formData.executeTime = formatDateTime(new Date())` — 新增检验申请单时执行时间自动填充当前时间
2. `resetForm()` (line ~1552): `executeTime: null` → `executeTime: formatDateTime(new Date())` — 重置表单/新增时执行时间默认当前时间
3. `loadApplicationToForm()` (line ~2002): `isPackage` 判定从 `item.feePackageId != null || item.itemName?.includes('套餐')` 改为 `item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName` — 与 `loadCategoryItems()` 保持一致，只有真正的套餐项目才显示"套餐"标签