Fix Bug #493 : 【住院医生工作站-临床医嘱-检验申请】项目未维护执行科室时，医生手动选择发往科室后仍报错且数据被清空

根因：projectWithDepartment 函数定义时遗漏了 type 参数，导致函数体内引用 type 变量时报 ReferenceError（未定义），type === 2 的判断永远无法正确执行。用户在提交时手动选择的发往科室被清空且无法提交。修复：在函数签名中添加 type 参数，与 working 版本 medicalExaminations.vue 保持一致。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #491 : 【执行科室配置】保存配置时系统报错 - 修复Organization.getName()空指针异常
2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00
15 changed files with 320 additions and 34 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,6 +7,7 @@ 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;
@@ -70,6 +71,7 @@ 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);
@@ -131,12 +133,18 @@ 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();
-        String activityName = activityDefinitionId != null
-            ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : "";
+        ActivityDefinition activityDef = activityDefinitionId != null
+            ? activityDefinitionMapper.selectById(activityDefinitionId) : null;
+        String activityName = activityDef != null ? activityDef.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,6 +43,19 @@ 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/RequestFormManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
@@ -428,12 +428,28 @@ 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,null,null);
+        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, keyword);
        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,6 +98,7 @@ public class RequestFormManageController {
     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
     * @param status 单据状态（可选）
+     * @param keyword 关键字（可选，申请单号/检验项目模糊匹配）
     * @return 检验申请单
     */
    @GetMapping(value = "/get-inspection")
@@ -105,11 +106,12 @@ public class RequestFormManageController {
            @RequestParam(required = false) Long encounterId,
            @RequestParam(required = false) String startDate,
            @RequestParam(required = false) String endDate,
-            @RequestParam(required = false) String status) {
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) String keyword) {
        if (encounterId == null) {
            return R.fail("就诊ID不能为空");
        }
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate, status, keyword));
    }

    /**
--- 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,6 +100,7 @@
                   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"
@@ -225,6 +226,7 @@
                          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/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -541,9 +541,9 @@
        CI.service_id AS request_id,
        CI.service_id || '-ci-dev' AS unique_key,
        '' AS prescription_no,
-        CI.enterer_id AS requester_id,
+        COALESCE(DR.requester_id, CI.enterer_id) AS requester_id,
        CI.entered_date AS request_time,
-        CASE WHEN CI.enterer_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
+        CASE WHEN COALESCE(DR.requester_id, CI.enterer_id) = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
        DR.content_json AS content_json,
        NULL AS skin_test_flag,
        NULL AS inject_flag,
--- 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,12 +12,24 @@
               drf.desc_json,
               drf.requester_id,
               drf.create_time,
-               ap.NAME AS patient_name
+               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
        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}
@@ -27,6 +39,33 @@
          <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,8 +475,13 @@ function calculateTotalPrice() {
    });
    totalPrice.value = sum.toFixed(2);
    // Bug #464: 零售价与诊疗子项合计总价实时同步
-    if (treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId !== '') {
+    const hasValidItem = treatmentItems.value.some(
+      (item) => item.adviceDefinitionId && item.adviceDefinitionId !== ''
+    );
+    if (hasValidItem) {
      form.value.retailPrice = parseFloat(totalPrice.value);
+    } else {
+      form.value.retailPrice = undefined;
    }
  } catch (error) {
    totalPrice.value = '0.00';
@@ -486,7 +491,7 @@ function calculateTotalPrice() {

 // 添加表单项
 function addItem() {
-  treatmentItems.value.push({ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 });
+  treatmentItems.value.push({ adviceDefinitionId: '', childrenRequestNum: 1, name: '', retailPrice: 0 });
  // 使用nextTick确保DOM更新后再计算
  nextTick(() => {
    calculateTotalPrice();
@@ -647,12 +652,15 @@ 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.length > 0 && treatmentItems.value[0].adviceDefinitionId != ''
+    treatmentItems.value.some((item) => item.adviceDefinitionId != '' && item.adviceDefinitionId)
      ? JSON.stringify(treatmentItems.value)
      : undefined;
  // Bug #464 修复：零售价自动与诊疗子项合计总价同步
  // 当有子项时，零售价自动设置为子项合计总价
-  if (treatmentItems.value.length > 0 && treatmentItems.value[0].adviceDefinitionId != '') {
+  const hasValidItem = treatmentItems.value.some(
+    (item) => item.adviceDefinitionId && item.adviceDefinitionId !== ''
+  );
+  if (hasValidItem) {
    form.value.retailPrice = parseFloat(totalPrice.value) || 0;
  }
  proxy.$refs['diagnosisTreatmentRef'].validate(async (valid) => {
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
@@ -69,13 +69,14 @@ const throttledGetList = throttle(
  watch(
  () => props.adviceQueryParams,
  (newValue) => {
-    // 只有在弹窗打开时才响应 adviceQueryParams 的变化，避免选择项目后弹窗关闭时触发不必要的请求
-    if (!props.popoverVisible) {
-      return;
-    }
+    // 始终同步参数到 queryParams，避免弹窗打开时使用旧参数
    queryParams.value.searchKey = newValue?.searchKey;
    queryParams.value.adviceType = newValue?.adviceType;
    queryParams.value.categoryCode = newValue?.categoryCode;
+    // 只有在弹窗打开时才触发 API 请求
+    if (!props.popoverVisible) {
+      return;
+    }
    throttledGetList();
  },
  { deep: true }
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -316,6 +316,7 @@
                    <span class="cat-title">{{ cat.categoryName }}</span>
                    <span v-if="categoryLoadingSet.has(cat.typeId)" class="loading-dot"></span>
                  </template>
+                  <!-- 检查项目（部位/项目列表） -->
                  <div
                    v-for="item in cat.items"
                    :key="item.id"
@@ -333,6 +334,27 @@
                  <div v-if="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
                    加载中...
                  </div>
+                  <!-- Bug #428修复: 渲染分类联动加载的检查方法列表 -->
+                  <div
+                    v-if="cat.methods && cat.methods.length > 0"
+                    class="method-section"
+                  >
+                    <div class="method-section-title">检查方法</div>
+                    <div
+                      v-for="method in cat.methods"
+                      :key="method.id"
+                      class="method-row"
+                    >
+                      <el-checkbox
+                        :model-value="isMethodSelected(method, cat)"
+                        @change="(val) => handleMethodSelect(val, method, cat)"
+                        class="method-checkbox"
+                      >
+                        {{ method.name }}
+                      </el-checkbox>
+                      <span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
+                    </div>
+                  </div>
                </el-collapse-item>
              </el-collapse>
            </div>
@@ -1047,6 +1069,78 @@ function handleDelete(row) {
  });
 }

+// Bug #428修复: 判断某个检查方法是否已被选中（任意项目关联了该方法）
+function isMethodSelected(method, cat) {
+  return selectedItems.value.some(item =>
+    item.selectedMethod?.id === method.id && item.checkType === cat.typeName
+  );
+}
+
+// Bug #428修复: 勾选检查方法
+async function handleMethodSelect(checked, method, cat) {
+  if (checked) {
+    // 找到该方法所属的第一个检查项目
+    const targetItem = cat.items[0];
+    if (!targetItem) {
+      // 如果分类下没有项目，尝试从其他分类找同名项目或创建
+      console.warn('分类下没有检查项目，无法关联方法');
+      return;
+    }
+
+    // 如果该项目已存在，只更新 selectedMethod
+    const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
+    if (existingItem) {
+      existingItem.selectedMethod = method;
+      updateMethodDisplay();
+      return;
+    }
+
+    // 如果该项目不存在，创建一个并关联方法
+    if (selectedItems.value.length > 0) {
+      const currentCategory = selectedItems.value[0].checkType;
+      const newCategory = cat.typeCode || '';
+      if (currentCategory !== newCategory) {
+        ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
+        return;
+      }
+    }
+
+    selectedItems.value.push({
+      id: targetItem.id, name: targetItem.name,
+      price: targetItem.price, quantity: 1,
+      serviceFee: targetItem.serviceFee || 0,
+      unit: targetItem.unit || '次',
+      applyPart: targetItem.name,
+      checkType: cat.typeName,
+      nationalCode: targetItem.nationalCode || '',
+      checked: true,
+      methods: [method],
+      selectedMethod: method,
+      expanded: false,
+      isPackage: !!targetItem.packageName,
+      packageId: targetItem.packageId || null
+    });
+
+    // 自动回填执行科室
+    if (selectedItems.value.length === 1 && cat?.performDeptName) {
+      form.performDeptCode = cat.performDeptName;
+    }
+
+    // 同时勾选左侧项目的 checkbox
+    targetItem.checked = true;
+
+  } else {
+    // 取消选择方法：将 selectedItems 中关联该方法的项的 selectedMethod 清空
+    const itemsWithMethod = selectedItems.value.filter(
+      item => item.selectedMethod?.id === method.id
+    );
+    for (const item of itemsWithMethod) {
+      item.selectedMethod = null;
+    }
+  }
+  updateMethodDisplay();
+}
+
 // ====== 勾选逻辑 ======
 async function handleItemSelect(checked, item, cat) {
  if (checked) {
@@ -1367,6 +1461,53 @@ defineExpose({ getList });
  margin-left: 6px;
 }

+/* Bug #428修复: 分类下检查方法区域样式 */
+.method-section {
+  padding: 6px 8px;
+  background: #f0f7ff;
+  border-radius: 4px;
+  margin-top: 6px;
+}
+
+.method-section-title {
+  font-size: 12px;
+  font-weight: 600;
+  color: #409eff;
+  margin-bottom: 4px;
+  padding-bottom: 3px;
+  border-bottom: 1px dashed #d9ecff;
+}
+
+.method-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 3px 4px;
+  border-radius: 3px;
+}
+
+.method-row:hover {
+  background: #e8f4ff;
+}
+
+.method-checkbox {
+  flex: 1;
+  overflow: hidden;
+}
+
+.method-checkbox :deep(.el-checkbox__label) {
+  font-size: 12px;
+  color: #303133;
+}
+
+.method-price-tag {
+  font-size: 11px;
+  color: #e6a23c;
+  font-weight: 500;
+  flex-shrink: 0;
+  margin-left: 6px;
+}
+
 /* 已选择 tags */
 .selected-panel {
  width: 140px;  /* Bug #384修复: 加宽以适应展开内容 */
@@ -1438,6 +1579,41 @@ defineExpose({ getList });
  transform: rotate(180deg);
 }

+/* Bug #428修复: 套餐明细列表样式 */
+.package-details-list {
+  padding: 6px 10px;
+  background: #fffbe6;
+  border-top: 1px solid #ffe58f;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.detail-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 2px 6px;
+  border-radius: 3px;
+  font-size: 11px;
+  background: #fff;
+}
+
+.detail-row:hover {
+  background: #fff9e6;
+}
+
+.detail-name {
+  color: #303133;
+  font-weight: 500;
+}
+
+.detail-info {
+  color: #909399;
+  font-size: 10px;
+  white-space: nowrap;
+}
+
 /* Bug #384修复: 检查方法勾选框列表 */
 .method-list {
  padding: 6px 10px;
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1013,15 +1013,29 @@ 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);
-  return found ? found.label : '';
+  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 '';
 };

 // 西药处方管理相关变量
--- 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 {getOrgList} from '@/views/doctorstation/components/api.js';
+import {getDepartmentList} from '@/api/public.js';

 const { proxy } = getCurrentInstance();

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

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

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

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

  currentDetail.value = row;
@@ -324,6 +326,15 @@ const handleViewDetail = (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,8 +41,6 @@
              <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>
@@ -298,8 +296,6 @@ 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) => {
+const projectWithDepartment = (selectProjectIds, type) => {
  //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
  let isRelease = true;
  // 选中项目的数组
--- 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,8 +801,8 @@ function clickRowDb(row, column, event) {
    return;
  }
  row.showPopover = false;
-  // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
-  if (row.statusEnum == 1 && !row.requestId) {
+  // 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
+  if (row.statusEnum == 1) {
    // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
    row.therapyEnum = String(row.therapyEnum ?? '1');
    row.isEdit = true;
Author	SHA1	Message	Date
赵云	c7a6578094	Fix Bug #493 : 【住院医生工作站-临床医嘱-检验申请】项目未维护执行科室时，医生手动选择发往科室后仍报错且数据被清空根因：projectWithDepartment 函数定义时遗漏了 type 参数，导致函数体内引用 type 变量时报 ReferenceError（未定义），type === 2 的判断永远无法正确执行。用户在提交时手动选择的发往科室被清空且无法提交。修复：在函数签名中添加 type 参数，与 working 版本 medicalExaminations.vue 保持一致。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
刘备	a5ed6eaea9	Fix Bug #491 : 【执行科室配置】保存配置时系统报错 - 修复Organization.getName()空指针异常根因分析： 1. organizationLocationInit() 中 Organization.getName() 未做空值过滤，若数据库存在name为null的科室记录会NPE 2. addOrEditOrgLoc() 中 activityDefinitionMapper.selectById().getName() 未对selectById返回null做防护 3. addOrEditOrgLoc() 缺少organizationId前置校验，空值传入可能导致后续流程异常修复内容： - 第74行：stream中增加 .filter(organization -> organization != null && organization.getName() != null) - 第136-138行：增加organizationId为null时的校验，返回友好错误提示 - 第145-147行：将activityDefinitionMapper.selectById结果先赋值再判空，避免NPE Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
赵云	31504f3260	Fix Bug #488 : 【临床医嘱】双击编辑待签发医嘱，医嘱类型回显为数字且点击确认报接口错误修复 clickRowDb 函数中编辑条件过于严格的问题：原条件 `row.statusEnum == 1 && !row.requestId` 只允许"待保存"(无requestId)的医嘱进入编辑，导致"待签发"(有requestId)的医嘱无法编辑。改为 `row.statusEnum == 1`，允许所有待签发状态的医嘱编辑。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
张飞	8bd687581c	Fix Bug #477 : 住院医生工作站-住院检查申请详情弹窗中"发往科室"字段显示为短横线（-），未正常获取数据根因分析： 1. 前端组件使用了错误的API获取科室列表：表单使用getDepartmentList(/app-common/department-list) 保存的targetDepartment ID，但详情弹窗使用getOrgList(/base-data-manage/organization/organization) 查询，两个接口返回的数据结构和ID不同，导致recursionFun无法匹配到科室名称 2. recursionFun中obj.children可能为null/undefined，直接遍历会抛TypeError 3. getLocationInfo是异步调用，handleViewDetail可能在科室数据加载完成前被调用修复： - 统一使用getDepartmentList(@/api/public.js)获取科室数据，与表单组件保持一致 - recursionFun增加children空值保护 - handleViewDetail改为async，打开详情前确保科室数据已加载	2026-05-13 00:13:44 +08:00
刘备	2d16d6695c	Fix Bug #468 : [住院医生工作站-检验申请] 列表页缺失【单据状态】列，无法闭环管理检验医嘱执行进度前后端完整链路修复： - 后端 Mapper: LEFT JOIN wor_service_request 表，通过 CASE MIN(status_enum) 映射单据状态 - 后端 Mapper: 新增状态筛选和关键字搜索（申请单号/检验项目模糊匹配） - 后端 Service/Controller: 新增 status 和 keyword 参数传递 - 前端 Vue: 列表页添加【单据状态】列，绑定 status 字段 - 前端 Vue: 移除中间状态选项（已采集/已收样），与后端 CASE 映射保持一致 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
荀彧	d04f998ae7	Fix Bug #464 : [目录管理-诊疗目录] 新增项目时"零售价"未与"诊疗子项"合计总价自动同步根本原因: calculateTotalPrice() 中同步零售价的条件只检查了第一个子项 (treatmentItems.value[0])，当第一个子项被清空但其他子项有效时，零售价不会同步。submitForm() 中存在相同问题。修复内容: 1. calculateTotalPrice(): 使用 Array.some() 检查是否有任何有效子项，而非只检查第一个 2. 当无有效子项时，将 retailPrice 重置为 undefined 避免残留旧值 3. submitForm(): childrenJson 序列化和零售价同步同样改用 some() 检查 4. addItem(): 补充缺失的 name 字段，与初始值结构保持一致 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
荀彧	2d5d01bedc	Fix Bug #457 : 门诊收费：已签发的手术类医嘱在门诊收费列表中不显示项目名称根因分析：门诊医生站处方列表查询（DoctorStationAdviceAppMapper.xml）中，手术类医嘱（category_enum=4）的 advice_table_name 固定返回 'wor_activity_definition'，而非 'cli_surgery'。当医生通过"签发"按钮处理手术医嘱时，handService() 据此创建 ChargeItem，导致 product_table = 'wor_activity_definition'，但 product_id 实际指向 cli_surgery 表中的手术记录。门诊收费SQL查询的CASE语句仅匹配 product_table = 'cli_surgery' 的手术项，因此这些手术医嘱无法匹配，item_name 返回 NULL。修复方案：在 selectEncounterPatientPrescription 和 selectEncounterPatientPrescriptionWithPrice 的 item_name CASE 表达式中新增兜底分支： WHEN context_enum = #{activity} AND service_table = 'wor_service_request' THEN COALESCE(T9.surgery_name, wsr.content_json->>'surgeryName', wsr.content_json->>'adviceName', T2."name") 按优先级回退获取手术名称：cli_surgery表 → content_json手术名称 → content_json医嘱名称 → 诊疗定义名称 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
刘备	44fd7de754	Fix Bug #458 : 门诊医生站：诊疗类医嘱保存成功后，列表"医嘱类型"列显示为空值根因：mapAdviceTypeLabel 函数依赖 drord_doctor_type 字典数据进行类型映射，当字典中缺少 value=3（诊疗）的条目时，find() 返回 undefined，函数返回空字符串，导致保存后刷新列表时"医嘱类型"列显示为空白。修复：在 mapAdviceTypeLabel 中为诊疗/手术类医嘱（wor_activity_definition 表）添加兜底映射逻辑：type 3→诊疗, 6→手术, 4→手术, 1→检验, 2→检查, 5→其他, 确保即使字典缺失对应条目也能正确显示类型标签。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:29:30 +08:00
赵云	69b28c59f6	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:44 +08:00
华佗	4e71b861ab	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:08:08 +08:00
陈琳	7c471205a3	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:02:12 +08:00