From 4c1222f0f4752ae04161ec8f958b6c1d2c02cdd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= <huatuo@gentronhealth.com>
Date: Sat, 30 May 2026 09:45:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(#631):=20=E8=AF=B7=E4=BF=AE=E5=A4=8D=20Bug?=
 =?UTF-8?q?=20#631=EF=BC=9A[=E4=BD=8F=E9=99=A2=E5=8C=BB=E7=94=9F=E7=AB=99-?=
 =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E5=8C=BB=E5=98=B1]=20=E8=AF=8A=E7=96=97?=
 =?UTF-8?q?=E7=B1=BB=E5=8C=BB=E5=98=B1=EF=BC=88=E5=A6=82=E8=82=8C=E8=82=89?=
 =?UTF-8?q?=E6=B3=A8=E5=B0=84=EF=BC=89=E5=BD=95=E5=85=A5=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=90=8E=EF=BC=8C=E5=8C=BB=E5=98=B1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E2=80=9C=E8=8D=AF=E6=88=BF/=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E2=80=9D=E5=88=97=E6=9C=AA=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因：
- Bug #请修复 Bug #631 存在的问题

修复：
- 文件：`openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java`
- 第 630 行：`getPositionId()` → `getEffectiveOrgId()`
- 第 681 行：`getPositionId()` → `getEffectiveOrgId()`
- `getEffectiveOrgId()` 方法优先取 `orgId`，fallback 到 `positionId`，已在 `AdviceSaveDto` 中定义
- 验证**：`mvn compile -pl openhis-application -am -q` ✅
---
 .../appservice/impl/AdviceManageAppServiceImpl.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
index 202870833..df05c98dc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
@@ -627,7 +627,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 longServiceRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
                 longServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
                 longServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
-                longServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
+                longServiceRequest.setOrgId(regAdviceSaveDto.getEffectiveOrgId()); // 执行科室
                 longServiceRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
                 longServiceRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
                 longServiceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id
@@ -678,7 +678,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 tempServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
                 tempServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
                 tempServiceRequest.setAuthoredTime(curDate); // 请求签发时间
-                tempServiceRequest.setOrgId(regAdviceSaveDto.getPositionId()); // 执行科室
+                tempServiceRequest.setOrgId(regAdviceSaveDto.getEffectiveOrgId()); // 执行科室
                 tempServiceRequest.setContentJson(regAdviceSaveDto.getContentJson()); // 请求内容json
                 tempServiceRequest.setYbClassEnum(regAdviceSaveDto.getYbClassEnum());// 类别医保编码
                 tempServiceRequest.setConditionId(regAdviceSaveDto.getConditionId()); // 诊断id