Fix Bug #448 : 门诊划价模块-项目分类过滤失效，选择"耗材"类型时仍能检索出药品

根因: adviceBaseList.vue 中 adviceQueryParams 的 watch 在 popoverVisible=false 时直接 return，未将参数同步到 queryParams。当 handleFocus 同时修改 adviceQueryParams 和 showPopover 时，Vue 的 watch 触发顺序不确定： - 若 adviceQueryParams watch 先触发(popoverVisible 仍为 false)，则 queryParams 保持旧值 - 随后 popoverVisible watch 触发时虽然会同步参数，但存在时序竞态导致查询参数不正确修复: 将参数同步逻辑移至 early return 之前，确保 queryParams 始终与 adviceQueryParams 保持一致，API 请求仍在 popoverVisible=true 时才触发。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #442 : 手术计费：点击"删除"待签发耗材时异常报错，导致操作失败
2026-05-12 23:20:33 +08:00 · 2026-05-12 23:20:33 +08:00 · 2026-05-12 23:20:33 +08:00 · 2026-05-12 23:20:33 +08:00 · 2026-05-12 22:15:11 +08:00 · 2026-05-12 22:05:04 +08:00
16 changed files with 40 additions and 202 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
@@ -7,7 +7,6 @@ import com.core.common.utils.MessageUtils;
 import com.openhis.administration.domain.Location;
 import com.openhis.administration.domain.Organization;
 import com.openhis.administration.domain.OrganizationLocation;
-import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.administration.mapper.OrganizationLocationMapper;
 import com.openhis.administration.service.ILocationService;
 import com.openhis.administration.service.IOrganizationLocationService;
@@ -71,7 +70,6 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
        // 获取科室下拉选列表
        List<Organization> organizationList = organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null);
        List<OrgLocInitDto.departmentOption> organizationOptions = organizationList.stream()
-            .filter(organization -> organization != null && organization.getName() != null)
            .map(organization -> new OrgLocInitDto.departmentOption(organization.getId(), organization.getName()))
            .collect(Collectors.toList());
        initDto.setLocationFormOptions(chargeItemStatusOptions).setDepartmentOptions(organizationOptions);
@@ -133,18 +131,12 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
    @Override
    public R<?> addOrEditOrgLoc(OrgLocQueryDto orgLocQueryDto) {

-        // Validate required fields before processing
-        if (orgLocQueryDto.getOrganizationId() == null) {
-            return R.fail("请选择执行科室");
-        }
-
        OrganizationLocation orgLoc = new OrganizationLocation();
        BeanUtils.copyProperties(orgLocQueryDto, orgLoc);

        Long activityDefinitionId = orgLoc.getActivityDefinitionId();
-        ActivityDefinition activityDef = activityDefinitionId != null
-            ? activityDefinitionMapper.selectById(activityDefinitionId) : null;
-        String activityName = activityDef != null ? activityDef.getName() : "";
+        String activityName = activityDefinitionId != null
+            ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : "";

        List<OrganizationLocation> organizationLocationList =
            organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId());
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java
@@ -43,19 +43,6 @@ public interface IRequestFormManageAppService {
     */
    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate);

-    /**
-     * 查询申请单（支持筛选+状态+关键字）
-     *
-     * @param encounterId 就诊id
-     * @param typeCode 申请单类型
-     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
-     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
-     * @param status 单据状态（可选）
-     * @param keyword 关键字（可选，申请单号/项目名称模糊匹配）
-     * @return 申请单列表
-     */
-    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword);
-
    /**
     * 分页查询申请单
     *
--- 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
@@ -341,28 +341,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                .collect(Collectors.toList());

-        // 防重复保存：对新增医嘱进行去重，避免签发单条长期医嘱时产生重复记录
-        Set<String> longUniqueKeySet = new HashSet<>();
-        List<RegAdviceSaveDto> longUniqueList = new ArrayList<>();
-        for (RegAdviceSaveDto adviceSaveDto : longInsertOrUpdateList) {
-            String uniqueKey = adviceSaveDto.getPatientId() + "_"
-                    + adviceSaveDto.getEncounterId() + "_"
-                    + adviceSaveDto.getAdviceDefinitionId() + "_"
-                    + adviceSaveDto.getDose() + "_"
-                    + adviceSaveDto.getMethodCode() + "_"
-                    + adviceSaveDto.getRateCode();
-            if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) && longUniqueKeySet.contains(uniqueKey)) {
-                log.warn("防重复保存：检测到重复长期医嘱，跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
-                        adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
-                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
-                continue;
-            }
-            longUniqueKeySet.add(uniqueKey);
-            longUniqueList.add(adviceSaveDto);
-        }
-        log.info("防重复保存（长期）：去重前{}条，去重后{}条", longInsertOrUpdateList.size(), longUniqueList.size());
-        longInsertOrUpdateList = longUniqueList;
-
        for (RegAdviceSaveDto regAdviceSaveDto : longInsertOrUpdateList) {
            boolean firstTimeSave = false;// 第一次保存
            longMedicationRequest = new MedicationRequest();
@@ -428,29 +406,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                .getValue().equals(e.getTherapyEnum())
                && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                .collect(Collectors.toList());
-
-        // 防重复保存：对新增医嘱进行去重
-        Set<String> tempUniqueKeySet = new HashSet<>();
-        List<RegAdviceSaveDto> tempUniqueList = new ArrayList<>();
-        for (RegAdviceSaveDto adviceSaveDto : tempInsertOrUpdateList) {
-            String uniqueKey = adviceSaveDto.getPatientId() + "_"
-                    + adviceSaveDto.getEncounterId() + "_"
-                    + adviceSaveDto.getAdviceDefinitionId() + "_"
-                    + adviceSaveDto.getDose() + "_"
-                    + adviceSaveDto.getMethodCode() + "_"
-                    + adviceSaveDto.getRateCode();
-            if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) && tempUniqueKeySet.contains(uniqueKey)) {
-                log.warn("防重复保存：检测到重复临时医嘱，跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
-                        adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
-                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
-                continue;
-            }
-            tempUniqueKeySet.add(uniqueKey);
-            tempUniqueList.add(adviceSaveDto);
-        }
-        log.info("防重复保存（临时）：去重前{}条，去重后{}条", tempInsertOrUpdateList.size(), tempUniqueList.size());
-        tempInsertOrUpdateList = tempUniqueList;
-
        for (RegAdviceSaveDto regAdviceSaveDto : tempInsertOrUpdateList) {
            boolean firstTimeSave = false;// 第一次保存
            tempMedicationRequest = new MedicationRequest();
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
@@ -162,15 +162,11 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
            serviceRequest.setEncounterId(encounterId); // 就诊id
            serviceRequest.setAuthoredTime(curDate); // 请求签发时间

-            // 优先使用前端传来的 positionId（用户手动选择的发往科室），未传时从配置表查找
-            Long positionId = activitySaveDto.getPositionId();
+            Long positionId = activityOrganizationConfig.stream()
+                .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
+                .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
            if (positionId == null) {
-                positionId = activityOrganizationConfig.stream()
-                    .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
-                    .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
-                if (positionId == null) {
-                    throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
-                }
+                throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
            }
            serviceRequest.setOrgId(positionId); // 执行科室

@@ -432,28 +428,12 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
     */
    @Override
    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate) {
-        return getRequestForm(encounterId, typeCode, startDate, endDate, null, null);
-    }
-
-    /**
-     * 查询申请单（支持筛选+状态+关键字）
-     *
-     * @param encounterId 就诊id
-     * @param typeCode 申请单类型
-     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
-     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
-     * @param status 单据状态（可选）
-     * @param keyword 关键字（可选，申请单号/项目名称模糊匹配）
-     * @return 申请单列表
-     */
-    @Override
-    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status, String keyword) {
        // 检查参数
        if (encounterId == null) {
            return new java.util.ArrayList<>();
        }

-        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, keyword);
+        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate,null,null);
        for (RequestFormQueryDto requestFormQueryDto : requestFormList) {
            // 查询处方详情
            List<RequestFormDetailQueryDto> requestFormDetail =
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
@@ -98,7 +98,6 @@ public class RequestFormManageController {
     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
     * @param status 单据状态（可选）
-     * @param keyword 关键字（可选，申请单号/检验项目模糊匹配）
     * @return 检验申请单
     */
    @GetMapping(value = "/get-inspection")
@@ -106,12 +105,11 @@ public class RequestFormManageController {
            @RequestParam(required = false) Long encounterId,
            @RequestParam(required = false) String startDate,
            @RequestParam(required = false) String endDate,
-            @RequestParam(required = false) String status,
-            @RequestParam(required = false) String keyword) {
+            @RequestParam(required = false) String status) {
        if (encounterId == null) {
            return R.fail("就诊ID不能为空");
        }
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate, status, keyword));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate));
    }

    /**
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
@@ -100,7 +100,6 @@
                   WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
                   WHEN T1.context_enum = 6 THEN T2."name"
                   WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
-                   WHEN T1.context_enum = #{activity} AND T1.service_table = 'wor_service_request' THEN COALESCE(T9.surgery_name, wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name")
                   WHEN T1.context_enum = #{activity} THEN COALESCE(wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name")
                   WHEN T1.context_enum = #{medication} THEN T3."name"
                   WHEN T1.context_enum = #{device} THEN T4."name"
@@ -226,7 +225,6 @@
                          WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
                          WHEN T1.context_enum = 6 THEN T2."name"
                          WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
-                          WHEN T1.context_enum = #{activity} AND T1.service_table = 'wor_service_request' THEN COALESCE(T9.surgery_name, wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name")
                          WHEN T1.context_enum = #{activity} THEN COALESCE(wsr.content_json::json->>'surgeryName', wsr.content_json::json->>'adviceName', T2."name")
                          WHEN T1.context_enum = #{medication} THEN T3."name"
                          WHEN T1.context_enum = #{device} THEN T4."name"
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
@@ -231,7 +231,7 @@
               ae.priority_enum,
               ae.organization_id,
               ae.start_time                     AS in_hos_time,
-               COALESCE(bed.start_time, ae.start_time) AS start_time,
+               bed.start_time,
               bed.location_id                   AS bed_id,
               bed.location_name                 AS bed_name,
               house.location_id                 AS house_id,
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -12,24 +12,12 @@
               drf.desc_json,
               drf.requester_id,
               drf.create_time,
-               ap.NAME AS patient_name,
-               CASE MIN(wsr.status_enum)
-                   WHEN 1 THEN 0
-                   WHEN 2 THEN 1
-                   WHEN 3 THEN 4
-                   WHEN 4 THEN 4
-                   WHEN 5 THEN 5
-                   WHEN 6 THEN 5
-                   WHEN 7 THEN 5
-                   ELSE NULL
-               END AS status
+               ap.NAME AS patient_name
        FROM doc_request_form AS drf
                 LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
            AND ae.delete_flag = '0'
                 LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
            AND ap.delete_flag = '0'
-                 LEFT JOIN wor_service_request AS wsr ON wsr.prescription_no = drf.prescription_no
-            AND wsr.delete_flag = '0'
        WHERE drf.delete_flag = '0'
          AND drf.encounter_id = #{encounterId}
          AND drf.type_code = #{typeCode}
@@ -39,33 +27,6 @@
          <if test="endDate != null and endDate != ''">
              AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
          </if>
-          <if test="status != null and status != ''">
-              AND CASE MIN(wsr.status_enum)
-                      WHEN 1 THEN 0
-                      WHEN 2 THEN 1
-                      WHEN 3 THEN 4
-                      WHEN 4 THEN 4
-                      WHEN 5 THEN 5
-                      WHEN 6 THEN 5
-                      WHEN 7 THEN 5
-                      ELSE NULL
-                  END = #{status}::integer
-          </if>
-          <if test="keyword != null and keyword != ''">
-              AND (drf.prescription_no ILIKE '%' || #{keyword} || '%'
-                   OR EXISTS (
-                       SELECT 1 FROM wor_service_request wsr2
-                       WHERE wsr2.prescription_no = drf.prescription_no
-                         AND wsr2.delete_flag = '0'
-                         AND wsr2.activity_id IN (
-                             SELECT id FROM wor_activity_definition wad
-                             WHERE wad.delete_flag = '0'
-                               AND wad.name ILIKE '%' || #{keyword} || '%'
-                         )
-                   ))
-          </if>
-        GROUP BY drf.id, drf.encounter_id, drf.prescription_no, drf.name, drf.desc_json,
-                 drf.requester_id, drf.create_time, ap.name
    </select>

    <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -475,13 +475,8 @@ function calculateTotalPrice() {
    });
    totalPrice.value = sum.toFixed(2);
    // Bug #464: 零售价与诊疗子项合计总价实时同步
-    const hasValidItem = treatmentItems.value.some(
-      (item) => item.adviceDefinitionId && item.adviceDefinitionId !== ''
-    );
-    if (hasValidItem) {
+    if (treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId !== '') {
      form.value.retailPrice = parseFloat(totalPrice.value);
-    } else {
-      form.value.retailPrice = undefined;
    }
  } catch (error) {
    totalPrice.value = '0.00';
@@ -491,7 +486,7 @@ function calculateTotalPrice() {

 // 添加表单项
 function addItem() {
-  treatmentItems.value.push({ adviceDefinitionId: '', childrenRequestNum: 1, name: '', retailPrice: 0 });
+  treatmentItems.value.push({ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 });
  // 使用nextTick确保DOM更新后再计算
  nextTick(() => {
    calculateTotalPrice();
@@ -652,15 +647,12 @@ async function submitForm() {
  form.value.ybMatchFlag ? (form.value.ybMatchFlag = 1) : (form.value.ybMatchFlag = 0);
  form.value.ruleId ? (form.value.ruleId = 1) : (form.value.ruleId = 0);
  form.value.childrenJson =
-    treatmentItems.value.some((item) => item.adviceDefinitionId != '' && item.adviceDefinitionId)
+    treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != ''
      ? JSON.stringify(treatmentItems.value)
      : undefined;
  // Bug #464 修复：零售价自动与诊疗子项合计总价同步
  // 当有子项时，零售价自动设置为子项合计总价
-  const hasValidItem = treatmentItems.value.some(
-    (item) => item.adviceDefinitionId && item.adviceDefinitionId !== ''
-  );
-  if (hasValidItem) {
+  if (treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != '') {
    form.value.retailPrice = parseFloat(totalPrice.value) || 0;
  }
  proxy.$refs['diagnosisTreatmentRef'].validate(async (valid) => {
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -992,9 +992,7 @@ function handleRowClick(row) {
  selectedItems.value = [];
  activeDetailTab.value = 'applyForm';
  request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    // Axios interceptor already returns res.data (AjaxResult body: {code, data, items})
-    // Don't double-unwrap: if res has 'code', use res directly; otherwise fall back to res.data
-    const d = (res && res.code !== undefined) ? res : (res.data || res);
+    const d = res.data || res;
    if (d.data) Object.assign(form, d.data);
    if (d.items && Array.isArray(d.items)) {
      try {
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1013,29 +1013,15 @@ const mapAdviceTypeLabel = (type, adviceTableName) => {
  if (type === 2 && adviceTableName === 'adm_device_definition') {
    return '耗材';
  }
-
+  
  // 🔧 Bug Fix: 处理检查类型(adviceType=23)
  // 检查类型属于诊疗类，应该显示为"检查"
  if (type === 23) {
    return '检查';
  }
-
+  
  const found = adviceTypeList.value.find((item) => item.value === type);
-  if (found) {
-    return found.label;
-  }
-
-  // 🔧 Bug #458 Fix: 诊疗/手术类型字典缺失时的兜底，避免保存后"医嘱类型"列显示为空
-  if (adviceTableName === 'wor_activity_definition' || adviceTableName === 'wor_service_request') {
-    if (type === 6) return '手术';
-    if (type === 4) return '手术';
-    if (type === 1) return '检验';
-    if (type === 2) return '检查';
-    if (type === 5) return '其他';
-    return '诊疗';
-  }
-
-  return '';
+  return found ? found.label : '';
 };

 // 西药处方管理相关变量
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
@@ -168,7 +168,7 @@ import {computed, getCurrentInstance, ref, watch} from 'vue';
 import {Refresh, Search} from '@element-plus/icons-vue';
 import {patientInfo} from '../../store/patient.js';
 import {getCheck} from './api';
-import {getDepartmentList} from '@/api/public.js';
+import {getOrgList} from '@/views/doctorstation/components/api.js';

 const { proxy } = getCurrentInstance();

@@ -293,8 +293,8 @@ const hasMatchedFields = computed(() => {

 /** 查询科室 */
 const getLocationInfo = () => {
-  getDepartmentList().then((res) => {
-    orgOptions.value = res.data || [];
+  getOrgList().then((res) => {
+    orgOptions.value = res.data.records;
  });
 };

@@ -306,19 +306,17 @@ const recursionFun = (targetDepartment) => {
      name = obj.name;
    }
    const subObjArray = obj['children'];
-    if (subObjArray && subObjArray.length > 0) {
-      for (let index = 0; index < subObjArray.length; index++) {
-        const item = subObjArray[index];
-        if (item.id == targetDepartment) {
-          name = item.name;
-        }
+    for (let index = 0; index < subObjArray.length; index++) {
+      const item = subObjArray[index];
+      if (item.id == targetDepartment) {
+        name = item.name;
      }
    }
  }
  return name;
 };

-const handleViewDetail = async (row) => {
+const handleViewDetail = (row) => {
  console.log('targetDepartment========>', JSON.stringify(row));

  currentDetail.value = row;
@@ -326,15 +324,6 @@ const handleViewDetail = async (row) => {
  if (row.descJson) {
    try {
      const obj = JSON.parse(row.descJson);
-      // 确保科室数据已加载
-      if (!orgOptions.value || orgOptions.value.length === 0) {
-        await new Promise((resolve) => {
-          getDepartmentList().then((res) => {
-            orgOptions.value = res.data || [];
-            resolve();
-          });
-        });
-      }
      obj.targetDepartment = recursionFun(obj.targetDepartment);
      descJsonData.value = obj;
    } catch (e) {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue
@@ -41,6 +41,8 @@
              <el-option label="全部" value="" />
              <el-option label="待签发" value="0" />
              <el-option label="已签发" value="1" />
+              <el-option label="已采集" value="2" />
+              <el-option label="已收样" value="3" />
              <el-option label="报告已出" value="4" />
              <el-option label="已作废" value="5" />
            </el-select>
@@ -296,6 +298,8 @@ const parseBillStatus = (status) => {
  const statusMap = {
    '0': '待签发',
    '1': '已签发',
+    '2': '已采集',
+    '3': '已收样',
    '4': '报告已出',
    '5': '已作废',
  };
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
@@ -164,7 +164,7 @@ onMounted(() => {
 * type(1：watch监听类型 2:点击保存类型)
 * selectProjectIds(选中项目的id数组)
 * */
-const projectWithDepartment = (selectProjectIds, type) => {
+const projectWithDepartment = (selectProjectIds) => {
  //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
  let isRelease = true;
  // 选中项目的数组
@@ -225,13 +225,9 @@ const submit = () => {
  if (transferValue.value.length == 0) {
    return proxy.$message.error('请选择申请单');
  }
-  // 🔧 Bug #516: 捕获用户手动选择的发往科室，避免 projectWithDepartment 将其覆盖为默认科室
-  const savedTargetDept = form.targetDepartment;
  if (!projectWithDepartment(transferValue.value, 2)) {
    return;
  }
-  // 用户手动选择的发往科室优先于项目默认执行科室
-  const targetDept = savedTargetDept || form.targetDepartment;
  let applicationListAllFilter = applicationListAll.value.filter((item) => {
    return transferValue.value.includes(item.adviceDefinitionId);
  });
@@ -242,7 +238,7 @@ const submit = () => {
      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
      unitPrice: item.priceList[0].price /** 单价 */,
      totalPrice: item.priceList[0].price /** 总价 */,
-      positionId: targetDept || item.positionId, // 用户指定发往科室优先于项目默认执行科室
+      positionId: item.positionId || form.targetDepartment, //执行科室id，未配置时使用用户手动选择的科室
      ybClassEnum: item.ybClassEnum, //类别医保编码
      conditionId: item.conditionId, //诊断ID
      encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -801,10 +801,8 @@ function clickRowDb(row, column, event) {
    return;
  }
  row.showPopover = false;
-  // 允许所有 statusEnum==1 的医嘱进入编辑：
-  // 1. 新医嘱（无 requestId）：待保存
-  // 2. 护士退回医嘱（有 requestId）：退回后状态重置为 DRAFT(1)，需允许医生编辑修改后重新签发
-  if (row.statusEnum == 1) {
+  // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
+  if (row.statusEnum == 1 && !row.requestId) {
    // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
    row.therapyEnum = String(row.therapyEnum ?? '1');
    row.isEdit = true;
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
@@ -19,10 +19,14 @@
            <el-tab-pane label="检验申请" name="test">
              <TestApplication ref="testApplicationRef" :show-status-column="true" />
            </el-tab-pane>
+```vue
            <el-tab-pane label="检查申请" name="examine">
              <ExamineApplication ref="examineApplicationRef" />
            </el-tab-pane>
-            <!-- 汇总发药申请属于护士站职能，医生站不显示 -->
+```
+            <el-tab-pane label="汇总发药申请" name="summaryDrug">
+              <SummaryDrugApplication ref="summaryDrugApplicationRef" />
+            </el-tab-pane>
            <el-tab-pane label="手术申请" name="surgery">
              <SurgeryApplication ref="surgeryApplicationRef" />
            </el-tab-pane>
Author	SHA1	Message	Date
赵云	89d52bc73c	Fix Bug #448 : 门诊划价模块-项目分类过滤失效，选择"耗材"类型时仍能检索出药品根因: adviceBaseList.vue 中 adviceQueryParams 的 watch 在 popoverVisible=false 时直接 return，未将参数同步到 queryParams。当 handleFocus 同时修改 adviceQueryParams 和 showPopover 时，Vue 的 watch 触发顺序不确定： - 若 adviceQueryParams watch 先触发(popoverVisible 仍为 false)，则 queryParams 保持旧值 - 随后 popoverVisible watch 触发时虽然会同步参数，但存在时序竞态导致查询参数不正确修复: 将参数同步逻辑移至 early return 之前，确保 queryParams 始终与 adviceQueryParams 保持一致，API 请求仍在 popoverVisible=true 时才触发。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:20:33 +08:00
华佗	15747db8ac	Fix Bug #442 : 手术计费：点击"删除"待签发耗材时异常报错，导致操作失败根因：DoctorStationAdviceAppMapper.xml 中 getRequestBaseInfo SQL 的第二个 UNION 查询（手术计费耗材从 adm_charge_item 关联 wor_device_request）中，biz_request_flag 和 requester_id 使用了 CI.enterer_id（计费录入人），而非 DR.requester_id（设备申请创建人）。当录入人与当前操作人不一致时，biz_request_flag 为 '0'，导致删除操作被后端拒绝。修复：将 CI.enterer_id 改为 COALESCE(DR.requester_id, CI.enterer_id)，优先使用 DeviceRequest 的 requester_id，确保 biz_request_flag 基于正确的创建人计算。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:20:33 +08:00
陈琳	b6fb3b1f8b	Fix Bug #428 : 门诊医生站-检查申请：未实现分类联动检查方法及套餐明细展示与勾选逻辑根因分析: 1. handleCategoryExpand 加载了 cat.methods 但模板从未渲染，用户展开分类后看不到检查方法 2. 缺少 isMethodSelected/handleMethodSelect 函数，无法通过勾选检查方法来联动添加到已选择列表 3. 套餐明细展示缺少 CSS 样式（package-details-list/detail-row/detail-name/detail-info）修复内容: - 模板: 在分类折叠区域添加 cat.methods 的渲染（检查方法列表 + 勾选框 + 价格） - 逻辑: 新增 isMethodSelected 和 handleMethodSelect 函数，支持直接勾选检查方法添加到已选择列表 - 样式: 添加套餐明细列表样式 + 检查方法区域样式 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:20:33 +08:00
刘备	101be44cf2	Fix Bug #413 : 医生个人报卡编辑/查看界面字段映射与后端DTO不一致导致数据不显示后端 InfectiousCardDto 字段名与前端 showReport 映射不匹配: - caseClass 应从 diseaseType 映射 (后端 diseaseType=病例分类) - diseaseType 应从 diseaseSubtype 映射 (后端 diseaseSubtype=疾病分型) - correctName 应从 revisedDiseaseName 映射 - withdrawReason 应从 returnReason 映射 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:20:33 +08:00
赵云	0ccea47684	Fix Bug #509 : [门诊医生站-手术申请] 提交申请后列表未实时刷新展示数据，且提示语需优化 1. 优化提示语：将"新增成功"/"修改成功"改为"手术申请提交成功！"/"手术申请修改成功！" 2. 优化执行顺序：先emit('saved')通知父组件刷新医嘱列表，再调用getList()刷新手术申请列表，确保数据刷新时序正确 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-05-12 22:15:11 +08:00
赵云	446e7975ed	Fix Bug #470 : 住院医生工作站-手术申请单加载手术项目耗时过长，影响医生开单效率策略A-前端优化：为手术项目穿梭框添加 v-loading 加载状态指示器，解决API查询期间用户看到空白/卡住界面的问题。同时暴露 getList 方法供父组件调用（之前未暴露但已被父组件调用）。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 22:05:04 +08:00
赵云	375108fa05	Fix Bug #455 : 门诊医生站-医嘱：开立诊疗医嘱时执行科室默认获取逻辑有误且显示为原始ID 根因修复： 1. 默认科室逻辑错误：row.orgId来自wor_activity_definition.org_id(项目所属科室)，不是执行科室。改为优先使用positionId(adm_organization_location配置的执行科室)，回退到患者就诊科室。 2. 显示为原始ID：getOrgList()为异步调用但未await，导致findOrgNameById执行时organization树未加载。将setValue改为async函数并await getOrgList()，确保科室名称解析时数据已就绪。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 18:39:13 +08:00
华佗	b21bdc2043	Fix Bug #469 : [住院医生工作站-检验申请] 完善【操作】列临床业务逻辑：支持按状态动态切换修改、删除、撤回等功能根据单据状态动态显示操作按钮： - 待签发（状态0）：显示修改、删除、详情 - 已签发（状态1）：显示撤回、详情 - 其他状态：仅显示详情 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 18:39:13 +08:00
Ranyunqiao	116734f1f8	413 460 513 514	2026-05-12 18:39:13 +08:00
赵云	288f2133ca	Fix Bug #470 : 住院医生工作站-手术申请单加载手术项目耗时过长，影响医生开单效率根因：getAdviceBaseInfo 后端接口在查询手术项目时，仍会执行与手术无关的库存查询（getAdviceInventory）、全表扫描待发放记录（getAdviceDraftInventory）以及药房科室配置查询（getMedLocationConfig），其中 getAdviceDraftInventory 对 med_medication_dispense 和 wor_device_dispense 做全表扫描，无任何过滤条件，导致手术/诊疗场景下的额外数据库开销。修复：在 DoctorStationAdviceAppServiceImpl.getAdviceBaseInfo() 中增加类型判断，当 adviceTypes 不包含药品(1)或耗材(2)时跳过所有库存相关查询，因为这些查询对手术/ 诊疗(3,6)项目无意义，且下游代码仅在药品/耗材处理分支中使用这些变量。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 17:22:13 +08:00
赵云	d60eedf6a8	Fix Bug #400 : 门诊医生站点击【完诊】后，triage_queue_item 表 status 字段未按规范更新为 30 完诊API后端要求同时传递 encounterId 和 firstEnum 两个参数： 1. DoctorCallDialog.vue：已有修复只传了 encounterId，缺少 firstEnum，导致后端校验失败 2. patientList.vue：仍传递原始值而非对象，且同样缺少 firstEnum 修复：两处调用均改为传递 { encounterId, firstEnum } 对象，firstEnum 默认值为1 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 17:05:17 +08:00
赵云	15daf26f6d	Fix Bug #400 : 门诊医生站点击【完诊】后，triage_queue_item 表 status 字段未按规范更新为 30 队列弹窗【完成】按钮调用完诊API时，传递了原始 Long 值而非对象参数，导致后端 @RequestBody 反序列化时 encounterId 为 null，队列项状态无法更新。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 13:05:59 +08:00
赵云	b05dcab1e3	Fix Bug #492 : 【门诊手术安排】关闭"手术计费"主弹窗后，项目字典选择列表依然残留悬浮在界面上 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 12:31:06 +08:00