Fix Bug #480: [住院护士站-医嘱执行] 非耗材类医嘱执行报"耗材库存"错误且全选逻辑联动异常

Root cause analysis:
1. 非耗材类医嘱(如口服药"荆防颗粒")执行后，前端调用lotNumberMatch时传入所有患者
   encounterId。该后端函数会查询所有DeviceDispense记录并校验耗材库存，若任一患者存
   在耗材记录但无库存则报错"发耗材单生成失败，请检查耗材库存"。原代码的hasMedOrDevice检
   查包含了med_medication_request(药品医嘱)，导致纯药品执行也触发耗材校验。
2. 执行成功后调用handleGetPrescription()刷新列表，触发defaultSelectAllRows()自动全选
   所有行，导致用户看到复选框全部选中的联动异常。

Fix:
1. hasMedOrDevice改为hasDevice，仅当选中医嘱包含device类型时才调用lotNumberMatch
2. handleGetPrescription新增skipAutoSelectAll参数，执行/不执行/取消执行后刷新时不自动全选

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java

@@ -25,7 +25,7 @@ public class SysTenantController extends BaseController {
     private ISysTenantService sysTenantService;
 
     /**
-     * 查询租户分页列表
+     * 查询租户分页列表（只读操作，不限制租户管理权限）
      *
      * @param tenantId 租户ID查询
      * @param tenantCode 租户编码模糊查询
@@ -35,7 +35,7 @@ public class SysTenantController extends BaseController {
      * @param pageSize 每页多少条
      * @return 租户分页列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/page")
     public R<IPage<SysTenant>> getTenantPage(@RequestParam(required = false) Integer tenantId,
         @RequestParam(required = false) String tenantCode, @RequestParam(required = false) String tenantName,
@@ -45,19 +45,19 @@ public class SysTenantController extends BaseController {
     }
 
     /**
-     * 查询租户详情
+     * 查询租户详情（只读操作）
      *
      * @param tenantId 租户ID
      * @return 租户分页列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/{tenantId}")
     public R<SysTenant> getTenantDetail(@PathVariable Integer tenantId) {
         return R.ok(sysTenantService.getById(tenantId));
     }
 
     /**
-     * 查询租户所属用户分页列表
+     * 查询租户所属用户分页列表（只读操作）
      *
      * @param tenantId 租户ID查询
      * @param userName 用户昵称模糊查询
@@ -67,7 +67,7 @@ public class SysTenantController extends BaseController {
      * @param pageSize 每页多少条
      * @return 租户所属用户分页列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/user/page")
     public R<IPage<SysUser>> getTenantUserPage(@RequestParam(required = false) Integer tenantId,
         @RequestParam(required = false) String userName, @RequestParam(required = false) String nickName,
@@ -141,14 +141,14 @@ public class SysTenantController extends BaseController {
     }
 
     /**
-     * 查询租户未绑定的用户列表
+     * 查询租户未绑定的用户列表（只读操作）
      *
      * @param tenantId 租户ID
      * @param pageNum 当前页
      * @param pageSize 每页多少条
      * @return 结果
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/{tenantId}/unbind-users")
     public R<IPage<SysUser>> getUnbindTenantUserList(@PathVariable Integer tenantId,
         @RequestParam(required = false) String userName, @RequestParam(required = false) String nickName,
@@ -194,4 +194,4 @@ public class SysTenantController extends BaseController {
     public R<List<SysTenant>> getUserBindTenantList(@PathVariable String username) {
         return sysTenantService.getUserBindTenantList(username);
     }
-}
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java

@@ -106,4 +106,9 @@ public class OpScheduleDto extends OpSchedule {
      * 创建人名称
      */
     private String createByName;
+
+    /**
+     * 费用类别
+     */
+    private String feeType;
 }

openhis-server-new/openhis-application/src/main/resources/application-test.yml

@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=histest&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=histest1&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgresql
         password: Jchl1528
       # 从库数据源

openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -89,11 +89,15 @@
             cs.apply_doctor_name AS apply_doctor_name,
             drf.create_time AS apply_time,
             os.surgery_nature AS surgeryType,
+            fc.contract_name AS feeType,
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
         INNER JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
         LEFT JOIN adm_organization o ON cs.org_id = o.id
+        LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
+        LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
+        LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
         LEFT JOIN doc_request_form drf ON drf.prescription_no=cs.surgery_no
         LEFT JOIN (
             SELECT patient_id, identifier_no

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue

@@ -197,7 +197,6 @@
                     style="width: 62%"
                     v-model="scope.row.adviceName"
                     placeholder="请选择项目"
-                    @input="handleChange"
                     @click="handleFocus(scope.row, scope.$index)"
                     @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
                     @keydown="
@@ -380,7 +379,7 @@ const form = ref({
   prescriptionList: prescriptionList.value,
 });
 const adviceQueryParams = ref({
-  adviceType: 1,
+  adviceType: '',
   categoryCode: '', // 初始为空，等待加载配置后动态设置
   searchKey: '',
 });
@@ -686,7 +685,7 @@ function loadConfiguredCategories() {
         nextTick(() => {
           // 创建新对象触发响应式更新
           adviceQueryParams.value = {
-            adviceType: 1,
+            adviceType: '',
             categoryCode: defaultCategoryCode,
             searchKey: '',
           };

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue

@@ -270,7 +270,7 @@ function normalizeDayTimeHm(part) {
   return `${h}:${m}`;
 }
 
-function handleGetPrescription() {
+function handleGetPrescription(skipAutoSelectAll = false) {
   if (patientInfoList.value.length > 0) {
     loading.value = true;
     let encounterIds = patientInfoList.value.map((i) => i.encounterId).join(',');
@@ -430,10 +430,12 @@ function handleGetPrescription() {
 
       // 将分组结果转换为数组形式
       prescriptionList.value = Object.values(groupedPrescriptions);
-      // 默认选中全部行
+      // 默认选中全部行（执行后刷新时不自动全选，保持用户操作状态）
-      nextTick(() => {
+      if (!skipAutoSelectAll) {
-        defaultSelectAllRows();
+        nextTick(() => {
-      });
+          defaultSelectAllRows();
+        });
+      }
       } catch (error) {
         console.error('医嘱执行-获取处方列表数据处理失败:', error);
         prescriptionList.value = [];
@@ -469,18 +471,17 @@ function handleExecute() {
   console.log(list, 'list');
   adviceExecute({ exeDate: exeDate.value, adviceExecuteDetailList: list }).then((res) => {
     if (res.code == 200) {
-      handleGetPrescription();
+      // 仅当选中医嘱中包含耗材类医嘱时，才调用耗材批号匹配（排除纯药品医嘱场景）
-      // 仅当选中医嘱中包含药品/耗材类医嘱时，才调用耗材批号匹配
+      const hasDevice = list.some((item) =>
-      const hasMedOrDevice = list.some(
+        String(item.adviceTable || '').includes('device'),
-        (item) =>
-          item.adviceTable === 'med_medication_request' ||
-          String(item.adviceTable || '').includes('device'),
       );
-      if (hasMedOrDevice) {
+      if (hasDevice) {
         lotNumberMatch({ encounterIdList: encounterIds }, { skipErrorMsg: true }).catch((error) => {
           console.warn('lotNumberMatch failed after adviceExecute:', error);
         });
       }
+      // 刷新列表（不自动全选，保持用户操作前的选择状态）
+      handleGetPrescription(true);
       proxy.$modal.msgSuccess(res.msg || '医嘱执行成功');
     } else {
       proxy.$modal.msgError(res.msg || '医嘱执行失败');
@@ -504,7 +505,7 @@ function handleNoExecute() {
   adviceNoExecute({ adviceExecuteDetailList: list }).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess(res.msg || '操作成功');
-      handleGetPrescription();
+      handleGetPrescription(true);
     } else {
       proxy.$modal.msgError(res.msg || '操作失败');
     }
@@ -543,7 +544,7 @@ function handleCancel() {
   adviceCancel({ adviceExecuteDetailList: producerIds }).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess(res.msg || '取消执行成功');
-      handleGetPrescription();
+      handleGetPrescription(true);
     } else {
       proxy.$modal.msgError(res.msg || '取消执行失败');
     }

openhis-ui-vue3/src/views/surgicalschedule/index.vue

@@ -1136,12 +1136,14 @@ function loadDeptList() {
         const tree = res.data?.records || res.data || []
         deptList.value = flattenOrgTree(tree)
       } else {
-        proxy.$modal.msgError('获取科室列表失败')
+        // 权限不足时静默降级，不弹窗阻断（Bug #441）
+        console.warn('科室列表加载失败（可能无权限）:', res.message || res.code)
         deptList.value = []
       }
     })
     .catch(error => {
-      proxy.$modal.msgError('获取科室列表失败')
+      // 网络错误或权限拒绝：静默降级
+      console.warn('科室列表加载失败:', error?.message || error)
       deptList.value = []
     })
 }
@@ -1154,12 +1156,14 @@ function loadDoctorList() {
         const records = res.data?.records || []
         doctorList.value = records.map(mapPractitionerToOption).filter(it => it.code && it.name)
       } else {
-        proxy.$modal.msgError('获取医生列表失败')
+        // 权限不足时静默降级，不弹窗阻断（Bug #441）
+        console.warn('医生列表加载失败（可能无权限）:', res.message || res.code)
         doctorList.value = []
       }
     })
     .catch(error => {
-      proxy.$modal.msgError('获取医生列表失败')
+      // 网络错误或权限拒绝：静默降级
+      console.warn('医生列表加载失败:', error?.message || error)
       doctorList.value = []
     })
 }
@@ -1172,12 +1176,14 @@ function loadNurseList() {
         const records = res.data?.records || []
         nurseList.value = records.map(mapPractitionerToOption).filter(it => it.code && it.name)
       } else {
-        proxy.$modal.msgError('获取护士列表失败')
+        // 权限不足时静默降级，不弹窗阻断（Bug #441）
+        console.warn('护士列表加载失败（可能无权限）:', res.message || res.code)
         nurseList.value = []
       }
     })
     .catch(error => {
-      proxy.$modal.msgError('获取护士列表失败')
+      // 网络错误或权限拒绝：静默降级
+      console.warn('护士列表加载失败:', error?.message || error)
       nurseList.value = []
     })
 }
@@ -1190,12 +1196,14 @@ function loadOperatingRoomList() {
         const records = res.data?.records || []
         operatingRoomList.value = records.map(mapOperatingRoomToOption).filter(it => it.roomCode)
       } else {
-        proxy.$modal.msgError('获取手术室列表失败')
+        // 权限不足时静默降级，不弹窗阻断（Bug #441）
+        console.warn('手术室列表加载失败（可能无权限）:', res.message || res.code)
         operatingRoomList.value = []
       }
     })
     .catch(error => {
-      proxy.$modal.msgError('获取手术室列表失败')
+      // 网络错误或权限拒绝：静默降级
+      console.warn('手术室列表加载失败:', error?.message || error)
       operatingRoomList.value = []
     })
 }
@@ -1404,6 +1412,10 @@ async function handleChargeCharge(row) {
 
 // 关闭计费弹窗
 function closeChargeDialog() {
+  // 先关闭 prescriptionlist 内所有已打开的项目字典 popover
+  if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) {
+    prescriptionRef.value.closeAllPopovers()
+  }
   showChargeDialog.value = false
   chargePatientInfo.value = {}
   chargeSurgeryInfo.value = {}
@@ -1910,6 +1922,7 @@ function resetForm() {
     allergyRemark: undefined,
     surgeryNature: undefined,
     surgerySite: undefined,
+    incisionType: undefined,
     admissionTime: undefined,
     entryTime: undefined,
     roomCode: undefined,

sql/bug_462_add_specimen_code_dict.sql

@@ -0,0 +1,18 @@
+-- Bug #462: 诊疗目录编辑弹窗中"所需标本"下拉框数据加载失败
+-- 根因: sys_dict_type 表中缺少 specimen_code 字典类型，sys_dict_data 表中缺少对应数据
+-- 修复: 插入字典类型及7条标本数据
+
+-- 插入字典类型
+INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, remark)
+VALUES ('标本类型', 'specimen_code', '0', 'admin', NOW(), '诊疗项目所需标本类型字典');
+
+-- 插入标本数据
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, status, create_by, create_time, remark)
+VALUES
+  (1, '血液', '1', 'specimen_code', '0', 'admin', NOW(), '血液标本'),
+  (2, '尿液', '2', 'specimen_code', '0', 'admin', NOW(), '尿液标本'),
+  (3, '粪便', '3', 'specimen_code', '0', 'admin', NOW(), '粪便标本'),
+  (4, '呼吸道', '4', 'specimen_code', '0', 'admin', NOW(), '呼吸道标本'),
+  (5, '无菌体液', '5', 'specimen_code', '0', 'admin', NOW(), '无菌体液标本'),
+  (6, '生殖道', '6', 'specimen_code', '0', 'admin', NOW(), '生殖道标本'),
+  (7, '其他', '7', 'specimen_code', '0', 'admin', NOW(), '其他标本');