Merge remote-tracking branch 'origin/赵云' into 赵云 - resolve conflicts

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #509 : [门诊医生站-手术申请] 提交申请后列表未实时刷新展示数据，且提示语需优化
2026-05-11 11:05:31 +08:00 · 2026-05-11 11:05:00 +08:00 · 2026-05-11 10:00:15 +08:00 · 2026-05-11 09:53:02 +08:00 · 2026-05-11 09:44:08 +08:00 · 2026-05-11 09:31:02 +08:00
9 changed files with 148 additions and 155 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
@@ -175,10 +175,10 @@ public class AdviceUtils {
        // 预减库存
        List<AdviceInventoryDto> adviceInventory
                = this.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
-        // 提示信息集合
+        // 生命提示信息集合
        List<String> tipsList = new ArrayList<>();
        for (MedicationRequestUseExe medicationRequestUseExe : medUseExeList) {
-            // 汇总同一地点该药品的所有批次库存总量
+            // 聚合同一位置所有批次的库存总量
            List<AdviceInventoryDto> matchedInventories = adviceInventory.stream()
                    .filter(inventoryDto -> medicationRequestUseExe.getMedicationId().equals(inventoryDto.getItemId())
                    && CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(inventoryDto.getItemTable())
@@ -189,17 +189,15 @@ public class AdviceUtils {
                    .collect(Collectors.toList());
            // 匹配到库存信息
            if (!matchedInventories.isEmpty()) {
-                // 计算总可用库存
-                BigDecimal totalAvailableQuantity = matchedInventories.stream()
-                        .map(AdviceInventoryDto::getQuantity)
+                // 聚合所有批次的可用库存
+                BigDecimal totalQuantity = matchedInventories.stream()
+                        .map(dto -> dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO)
                        .reduce(BigDecimal.ZERO, BigDecimal::add);
-                BigDecimal totalRequiredQuantity = medicationRequestUseExe.getExecuteTimesNum()
+                BigDecimal requestQuantity = medicationRequestUseExe.getExecuteTimesNum()
                        .multiply(medicationRequestUseExe.getMinUnitQuantity());
-                if (totalRequiredQuantity.compareTo(totalAvailableQuantity) > 0) {
-                    // 取第一个匹配的位置名称用于提示
-                    String locationName = matchedInventories.get(0).getLocationName();
+                if (requestQuantity.compareTo(totalQuantity) > 0) {
                    tipsList
-                            .add("【" + medicationRequestUseExe.getBusNo() + "】在" + locationName + "库存不足");
+                            .add("【" + medicationRequestUseExe.getBusNo() + "】在" + matchedInventories.get(0).getLocationName() + "库存不足");
                }
            } else {
                tipsList.add("【" + medicationRequestUseExe.getBusNo() + "】未匹配到库存信息");
--- a/openhis-ui-vue3/src/api/operatingroom.js
+++ b/openhis-ui-vue3/src/api/operatingroom.js
@@ -38,7 +38,6 @@ export function listAdviceTypes(query) {
    params: query
  })
 }
-```

 /**
 * 查询手术室详细
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -41,7 +41,9 @@
          </el-col>
        </el-row>

-
+        <!-- 工作单位（学校） -->
+        <el-row :gutter="16" class="form-row">
+          <el-col :span="12" class="form-item">
            <span class="form-label">工作单位（学校）</span>
            <el-input v-model="form.workplace" class="underline-input" />
          </el-col>
--- a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
@@ -55,138 +55,7 @@
      
      <!-- 手术等级 -->
      <el-table-column label="手术等级" align="center" prop="surgeryLevel_dictText" width="100" />
-      
-      <!-- 手术室确认时间 -->
-      <el-table-column label="手术室确认时间" align="center" prop="confirmTime" width="180">
-        <template #default="scope">
-          {{ scope.row.confirmTime ? parseTime(scope.row.confirmTime, '{y}-{m}-{d} {h}:{i}:{s}') : '-' }}
-        </template>
-      </el-table-column>
-      
-      <!-- 操作列 -->
-      <el-table-column label="操作" align="center" width="150" fixed="right">
-        <template #default="scope">
-          <el-button 
-            type="primary" 
-            link 
-            size="small" 
-            @click="handleView(scope.row)"
-          >
-            查看
-          </el-button>
-          <el-button 
-            type="primary" 
-            link 
-            size="small" 
-            @click="handleEdit(scope.row)"
-            :disabled="scope.row.status !== '0'"
-          >
-            修改
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>

-<script setup>
-import { ref, onMounted } from 'vue'
-import { getSurgeryApplicationList, addSurgeryApplication, updateSurgeryApplication } from '@/api/doctorstation/surgery'
-import { ElMessage, ElMessageBox } from 'element-plus'
-
-const loading = ref(true)
-const surgeryList = ref([])
-
-// 查询手术申请列表
-const getList = async () => {
-  try {
-    loading.value = true
-    const response = await getSurgeryApplicationList()
-    surgeryList.value = response.data || []
-  } catch (error) {
-    console.warn('获取手术申请列表失败', error)
-    surgeryList.value = []
-  } finally {
-    loading.value = false
-  }
-}
-
-// 新增手术申请
-const handleAdd = () => {
-  // 跳转到新增页面或打开新增弹窗
-  // 这里需要根据实际路由配置调整
-  openSurgeryDialog()
-}
-
-// 编辑手术申请
-const handleEdit = (row) => {
-  if(row.status !== '0') {
-    ElMessage.warning('该申请已提交，无法修改')
-    return
-  }
-  openSurgeryDialog(row)
-}
-
-// 查看手术申请详情
-const handleView = (row) => {
-  openSurgeryDialog(row, true)
-}
-
-// 刷新列表
-const handleRefresh = () => {
-  getList()
-}
-
-// 打开手术申请对话框
-const openSurgeryDialog = (row, isView = false) => {
-  // 这里需要引入具体的对话框组件或跳转到详情页
-  // 示例代码，具体实现需要根据项目实际情况调整
-  console.log('打开手术申请对话框', row, isView)
-}
-
-// 获取行样式
-const getRowClassName = ({ row }) => {
-  if (row.status === '1') {
-    return 'success-row'
-  } else if (row.status === '2') {
-    return 'warning-row'
-  }
-  return ''
-}
-
-onMounted(() => {
-  getList()
-})
-
-// 暴露方法给父组件调用，用于提交后刷新列表
-defineExpose({
-  refreshList: getList
-})
-</script>
-
-<style scoped>
-.surgery-application-container {
-  padding: 20px;
-}
-
-.top-operation-bar {
-  margin-bottom: 16px;
-}
-
-.add-button,
-.refresh-button {
-  margin-bottom: 10px;
-}
-
-/* 表格行状态样式 */
-::v-deep(.success-row) {
-  background-color: #f0f9ff;
-}
-
-::v-deep(.warning-row) {
-  background-color: #fff7e6;
-}
-</style>
      <el-table-column label="手术室确认时间" align="center" prop="operatingRoomConfirmTime" width="180">
        <template #default="scope">
          {{ scope.row.operatingRoomConfirmTime ? parseTime(scope.row.operatingRoomConfirmTime, '{y}-{m}-{d} {h}:{i}:{s}') : '-' }}
@@ -1258,11 +1127,14 @@ function submitForm() {
        // 新增手术
        addSurgery(form.value).then((res) => {
          if (res.code === 200) {
-            proxy.$modal.msgSuccess(res.msg || '新增成功')
+            proxy.$modal.msgSuccess('手术申请提交成功！')
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
-            getList()
+            // 延迟刷新列表，确保后端数据已提交
+            setTimeout(() => {
+              getList()
+            }, 300)
            emit('saved') // 🔧 触发保存事件，通知父组件刷新医嘱列表
          } else {
            proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
@@ -1275,11 +1147,14 @@ function submitForm() {
        // 修改手术
        updateSurgery(form.value).then((res) => {
          if (res.code === 200) {
-            proxy.$modal.msgSuccess(res.msg || '修改成功')
+            proxy.$modal.msgSuccess('手术申请修改成功！')
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
-            getList()
+            // 延迟刷新列表，确保后端数据已提交
+            setTimeout(() => {
+              getList()
+            }, 300)
            emit('saved') // 🔧 触发保存事件，通知父组件刷新医嘱列表
          } else {
            proxy.$modal.msgError(res.msg || '更新手术失败，请检查表单信息')
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
@@ -227,6 +227,47 @@
          <el-form-item label="申请单名称">
            <el-input v-model="editForm.name" />
          </el-form-item>
+          <el-form-item label="发往科室">
+            <el-tree-select
+              clearable
+              style="width: 100%"
+              v-model="editForm.targetDepartment"
+              filterable
+              :data="orgOptions"
+              :props="{
+                value: 'id',
+                label: 'name',
+                children: 'children',
+              }"
+              value-key="id"
+              check-strictly
+              placeholder="请选择科室"
+            />
+          </el-form-item>
+          <el-form-item label="紧急程度">
+            <el-select v-model="editForm.urgencyLevel" placeholder="请选择紧急程度" clearable style="width: 100%">
+              <el-option label="普通" value="routine" />
+              <el-option label="急诊" value="emergency" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="过敏史">
+            <el-input v-model="editForm.allergyHistory" type="textarea" :rows="2" />
+          </el-form-item>
+          <el-form-item label="检查目的">
+            <el-input v-model="editForm.examinationPurpose" type="textarea" :rows="2" />
+          </el-form-item>
+          <el-form-item label="病史摘要">
+            <el-input v-model="editForm.medicalHistorySummary" type="textarea" :rows="2" />
+          </el-form-item>
+          <el-form-item label="期望检查时间">
+            <el-date-picker
+              v-model="editForm.expectedExaminationTime"
+              type="datetime"
+              placeholder="请选择期望检查时间"
+              style="width: 100%"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </el-form-item>
          <el-form-item label="临床诊断">
            <el-input v-model="editForm.clinicalDiagnosis" type="textarea" :rows="2" />
          </el-form-item>
@@ -428,6 +469,11 @@ const buildItemNames = (row) => {
 const labelMap = {
  categoryType: '项目类别',
  targetDepartment: '发往科室',
+  urgencyLevel: '紧急程度',
+  allergyHistory: '过敏史',
+  examinationPurpose: '检查目的',
+  medicalHistorySummary: '病史摘要',
+  expectedExaminationTime: '期望检查时间',
  symptom: '症状',
  sign: '体征',
  clinicalDiagnosis: '临床诊断',
@@ -493,6 +539,11 @@ const handleViewDetail = (row) => {
        const deptName = recursionFun(obj.targetDepartment);
        obj.targetDepartment = deptName || obj.targetDepartment;
      }
+      // 紧急程度转换为显示文本
+      const urgencyMap = { routine: '普通', emergency: '急诊' };
+      if (obj.urgencyLevel) {
+        obj.urgencyLevel = urgencyMap[obj.urgencyLevel] || obj.urgencyLevel;
+      }
      descJsonData.value = obj;
    } catch (e) {
      console.error('解析 descJson 失败:', e);
@@ -514,6 +565,12 @@ const handleEdit = (row) => {
  if (row.descJson) {
    try {
      const desc = JSON.parse(row.descJson);
+      form.targetDepartment = desc.targetDepartment || '';
+      form.urgencyLevel = desc.urgencyLevel || '';
+      form.allergyHistory = desc.allergyHistory || '';
+      form.examinationPurpose = desc.examinationPurpose || '';
+      form.medicalHistorySummary = desc.medicalHistorySummary || '';
+      form.expectedExaminationTime = desc.expectedExaminationTime || '';
      form.clinicalDiagnosis = desc.clinicalDiagnosis || '';
      form.attention = desc.attention || '';
      form.symptom = desc.symptom || '';
@@ -544,6 +601,12 @@ const handleSaveEdit = async () => {
      name: editForm.value.name,
      organizationId: editDetail.value.inHospitalOrgId || patientInfo.value?.inHospitalOrgId,
      descJson: JSON.stringify({
+        targetDepartment: editForm.value.targetDepartment,
+        urgencyLevel: editForm.value.urgencyLevel,
+        allergyHistory: editForm.value.allergyHistory,
+        examinationPurpose: editForm.value.examinationPurpose,
+        medicalHistorySummary: editForm.value.medicalHistorySummary,
+        expectedExaminationTime: editForm.value.expectedExaminationTime,
        clinicalDiagnosis: editForm.value.clinicalDiagnosis,
        attention: editForm.value.attention,
        symptom: editForm.value.symptom,
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/summaryDrugApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/summaryDrugApplication.vue
@@ -0,0 +1,20 @@
+<!--
+ * 住院医生站 — 汇总发药申请：复用药房「发药汇总单」能力
+ -->
+<template>
+  <div class="summary-drug-application">
+    <MedicationSummary />
+  </div>
+</template>
+
+<script setup>
+import MedicationSummary from '@/views/drug/inpatientMedicationDispensing/components/MedicationSummary.vue';
+</script>
+
+<style scoped>
+.summary-drug-application {
+  height: 100%;
+  min-height: 400px;
+  overflow: auto;
+}
+</style>
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
@@ -42,6 +42,40 @@
              />
            </el-form-item>
          </el-col>
+          <el-col :span="12">
+            <el-form-item label="紧急程度" prop="urgencyLevel" style="width: 100%">
+              <el-select v-model="form.urgencyLevel" placeholder="请选择紧急程度" clearable style="width: 100%">
+                <el-option label="普通" value="routine" />
+                <el-option label="急诊" value="emergency" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="过敏史" prop="allergyHistory" style="width: 100%">
+              <el-input v-model="form.allergyHistory" autocomplete="off" type="textarea" placeholder="如：造影剂过敏史等" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检查目的" prop="examinationPurpose" style="width: 100%">
+              <el-input v-model="form.examinationPurpose" autocomplete="off" type="textarea" placeholder="请说明检查目的" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="病史摘要" prop="medicalHistorySummary" style="width: 100%">
+              <el-input v-model="form.medicalHistorySummary" autocomplete="off" type="textarea" placeholder="请简要描述患者病史" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="期望检查时间" prop="expectedExaminationTime" style="width: 100%">
+              <el-date-picker
+                v-model="form.expectedExaminationTime"
+                type="datetime"
+                placeholder="请选择期望检查时间"
+                style="width: 100%"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              />
+            </el-form-item>
+          </el-col>
          <el-col :span="12">
            <el-form-item label="症状" prop="symptom" style="width: 100%">
              <el-input v-model="form.symptom" autocomplete="off" type="textarea" />
@@ -145,6 +179,11 @@ const transferValue = ref([]);
 const form = reactive({
  // categoryType: '', // 项目类别
  targetDepartment: '', // 发往科室
+  urgencyLevel: '', // 紧急程度
+  allergyHistory: '', // 过敏史
+  examinationPurpose: '', // 检查目的
+  medicalHistorySummary: '', // 病史摘要
+  expectedExaminationTime: '', // 期望检查时间
  symptom: '', // 症状
  sign: '', // 体征
  clinicalDiagnosis: '', // 临床诊断
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
@@ -16,7 +16,7 @@
              <Advice ref="adviceRef" />
            </el-tab-pane>
            <!-- <el-tab-pane label="医技报告" name="fourth">Task</el-tab-pane> -->
-<el-tab-pane label="检验申请" name="test">
+            <el-tab-pane label="检验申请" name="test">
              <TestApplication ref="testApplicationRef" :show-status-column="false" />
            </el-tab-pane>
            <el-tab-pane label="检查申请" name="examine">
@@ -44,14 +44,11 @@
  </div>
 </template>
 <script setup>
-import {computed, onBeforeMount, onMounted, provide, reactive, ref, watch,} from 'vue';
-
-import Emr from './emr/index.vue';
-import inPatientBarDoctorFold from '@/component
-```
+import { computed, onBeforeMount, onMounted, provide, reactive, ref, watch } from 'vue';

 import Emr from './emr/index.vue';
 import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
+import SummaryDrugApplication from './components/applicationShow/summaryDrugApplication.vue';
 import PatientList from '@/components/PatientList/patient-list.vue';
 import {localPatientInfo, updateLocalPatientInfo} from './store/localPatient';
 import {patientInfo, updatePatientInfo} from './store/patient';
@@ -86,6 +83,7 @@ const currentPatientInfo = ref({});
 const testApplicationRef = ref();
 const examineApplicationRef = ref();
 const surgeryApplicationRef = ref();
+const summaryDrugApplicationRef = ref();
 const bloodTtransfusionAapplicationRef = ref();

 // 患者列表相关逻辑
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue
@@ -67,8 +67,7 @@
        </el-button>
      </div>
    </div>
-  </div>
-  <div
+    <div
      style="padding: 10px; background-color: #eef9fd; height: 100%; overflow-y: auto"
      v-loading="loading"
    >
Author	SHA1	Message	Date
赵云	88a13370cb	Merge remote-tracking branch 'origin/赵云' into 赵云 - resolve conflicts Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 11:05:31 +08:00
赵云	ff22b4a30b	Fix Bug #509 : [门诊医生站-手术申请] 提交申请后列表未实时刷新展示数据，且提示语需优化 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 11:05:00 +08:00
yangkexiang	a68ffbfec4	去除多余的字符，修复语法问题	2026-05-11 10:00:15 +08:00
yangkexiang	14f8a8b0a3	import 去掉多余逗号并略作格式整理	2026-05-11 09:53:02 +08:00
yangkexiang	0f1e57227b	修复标签语法错误	2026-05-11 09:44:08 +08:00
赵云	98a370f3a2	fix: 修复 surgeryApplication.vue 多余的 </template> 标签	2026-05-11 09:31:02 +08:00
chenqi	b2ce368749	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue	2026-05-11 09:25:32 +08:00
chenqi	c691f82958	feat(diagnosis): 添加传染病报告对话框中的工作单位字段 - 在传染病报告对话框中新增工作单位输入框 - 添加了相应的工作单位表单项布局结构 - 集成了工作单位数据绑定功能	2026-05-11 09:24:59 +08:00
赵云	d2bfde7230	fix: 修复 Bug #412 引入的 Vue template 语法错误（缺少 el-row/el-col 标签）	2026-05-11 09:18:13 +08:00
赵云	62a09a8b94	Fix Bug #412 : 门诊医生站：传染病报告卡保存失败，提示报错根因：infectiousDiseaseReportDialog.vue 的 show() 函数将 cardNo 初始化为空字符串，而后端 DTO 的 cardNo 字段有 @NotBlank 校验，导致保存时后端拒绝请求。同仓库的 infectiousReport/index.vue 已有此修复（调用 getNextCardNo API），但诊断流程使用的 infectiousDiseaseReportDialog.vue 漏掉了此修复。修复：在 show() 函数中调用 getNextCardNo API 获取卡片编号， API 失败时降级为 TEMP_ 前缀的临时卡号，与 infectiousReport/index.vue 保持一致。	2026-05-11 09:03:38 +08:00
关羽	10b2c58a3e	Fix Bug #476 : 住院医生工作-检查申请单界面缺失核心临床字段（紧急程度、过敏史、检查目的等）在检查申请单开立界面新增5个核心临床字段（依次放在发往科室之后）： 1. 紧急程度：el-select下拉选择（普通/急诊），区分急诊和普通检查 2. 过敏史：textarea输入，提示造影剂过敏风险 3. 检查目的：textarea输入，让执行科室医生了解临床背景 4. 病史摘要：textarea输入，补充患者病史信息 5. 期望检查时间：datetime选择器，实现精准调度同步更新： - medicalExaminations.vue: 表单模板 + form reactive对象新增字段 - examineApplication.vue: labelMap映射 + 详情弹窗紧急程度转换 + 修改弹窗新增字段 + 编辑/保存逻辑覆盖新字段	2026-05-11 08:45:13 +08:00
赵云	abc995523b	Fix Bug #492 : 【门诊手术安排】关闭"手术计费"主弹窗后，项目字典选择列表依然残留悬浮在界面上在 prescriptionlist 组件中新增 closeAllPopovers 方法，关闭手术计费弹窗时先关闭所有行悬浮的项目字典下拉弹窗，避免主弹窗关闭后残留 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 08:45:05 +08:00
赵云	c0438c0288	Fix Bug #496 : 【住院医生工作站-检查申请】检查申请列表字段命名不规范及单号生成规则不符合医疗行业标准将检查申请列表及详情中的"处方号"统一修改为"申请单号"，涉及列表表头、详情弹窗和打印内容三处 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 08:44:25 +08:00
关羽	13731c2373	Fix Bug #475 : 【住院医生工作站】开立检查申请单报错"请先配置当前时间段的执行科室"后，系统仍生成申请记录将执行科室配置校验提前到数据库写入操作之前，避免校验失败时已写入RequestForm记录 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 00:24:08 +08:00
关羽	d63b00fd33	Fix Bug #481 : [住院护士站-医嘱执行] 药品"注射用头孢哌酮钠舒巴坦钠"库存充足，但执行医嘱时提示库存不足在 checkExeMedInventory 方法中，原代码使用 findFirst() 只取第一个批次的库存进行校验，导致同一库房多个批次的库存总量未被聚合计算。改为 collect(Collectors.toList()) 收集所有匹配批次，然后用 Stream reduce 聚合总可用库存后再与需求量比较。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 00:22:42 +08:00
赵云	c60cd6878e	Fix Bug #413 : 医生个人报卡管理核心缺陷：医生个人报卡编辑/查看界面与门诊医生站登记报卡界面设计不统一	2026-05-11 00:21:29 +08:00
赵云	cf50f8968a	Fix Bug #478 : 【住院医生工作站-检验申请】点击"详情"查看检验单时，"发往科室"字段回显异常（显示为"-"） Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 00:09:19 +08:00
赵云	94fac8e257	Fix Bug #495 : 【医嘱闭环】已校对医嘱无法流转至"医嘱执行"界面，导致费用无法提交执行医嘱执行模块 prescriptionList.vue 中 try-catch 被注释掉，导致数据处理异常时静默失败且 loading 状态无法重置，页面显示空数据无报错。 - 恢复 try-catch 错误处理，捕获 res.data.records 空值及数据处理异常 - 添加 .catch() 处理 API 接口级别失败，重置 loading 并清空列表 - 修复无患者时 loading 状态未重置的问题 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 00:02:18 +08:00
赵云	f162134156	Fix Bug #411 : 智能分诊排队：底部操作控制区"过滤栏"功能实现与PRD需求不符（误设为科室过滤）将底部过滤栏从"就诊科室快速过滤栏"改为"诊室快速过滤栏"： - UI文案：过滤栏标题、下拉框placeholder均改为诊室相关 - 数据源：移除 getLocationTree() 科室树API调用，改为从队列/候选池数据中动态提取诊室列表 - 过滤逻辑：改为按诊室名称（room字段）过滤，支持本科室下不同诊室快速切换 - 后端API调用不再依赖过滤栏选择，改用队列数据自身的organizationId Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-11 00:00:24 +08:00
关羽	d866d898df	Fix Bug #506 : 门诊挂号：门诊诊前退号后，数据库多表状态值变更与 PRD 定义不符在 syncAppointmentReturnStatus 方法中： 1. 退号时同步将 order_main.pay_status 设为 0（未支付），修复退费后 pay_status 仍为 1 的问题 2. cancel_reason 固定使用标准化值"门诊退号"，确保与 PRD 定义一致 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 23:58:40 +08:00
关羽	6725cef643	Fix Bug #477 : 住院医生工作站-住院检查申请详情弹窗中"发往科室"字段显示为短横线（-），未正常获取数据修复 examineApplication.vue 中 recursionFun 函数的空指针异常： 1. 增加 orgOptions.value 数组有效性校验，防止接口未返回数据时崩溃 2. 增加 obj.children 的 Array.isArray 检查，原代码直接访问 children.length 在 children 为 undefined 时抛 TypeError 3. 匹配成功后增加 break 提前退出循环 4. handleViewDetail 增加 targetDepartment 存在性检查，递归查找失败时回退显示原始 ID 值	2026-05-10 23:56:39 +08:00
赵云	7790a64eab	Fix Bug #479 : [住院护士站-三测单] 体征录入模块缺少"录入日期"字段，导致无法补录历史体征数据 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 23:53:18 +08:00
赵云	49fa1c9b90	Fix Bug #493 : 【住院医生工作站-临床医嘱-检验申请】项目未维护执行科室时，医生手动选择发往科室后仍报错且数据被清空	2026-05-10 23:50:43 +08:00
关羽	e0a035204e	Fix Bug #487 : 【临床医嘱】诊疗类医嘱签发后，列表状态未实时刷新为"已签发" 诊疗类医嘱(handService)签发时仅依赖saveOrUpdate更新statusEnum，但该方式对已有记录可能未正确将statusEnum更新为ACTIVE(2)。修复：在handService方法末尾使用LambdaUpdateWrapper批量显式更新所有已处理ServiceRequest的statusEnum为ACTIVE(签发)/DRAFT(保存)，与ServiceRequestServiceImpl中activeStatusEnum/updateDraftStatusBatch 等方法的实现模式保持一致。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 17:20:43 +08:00
关羽	349b0453c8	Fix Bug #480 : [住院护士站-医嘱执行] 非耗材类医嘱执行报"耗材库存"错误且全选逻辑联动异常 1. 修复模板结构错误：删除premature的</template>和多余的</div>标签，确保el-table正确渲染 2. 新增selectedRowIds独立维护选中行ID集合，不再依赖el-table内部selection状态，避免执行选中时联动触发全选 3. 更新所有选择事件处理器同步维护selectedRowIds 4. 补充index.vue缺失的ref/nextTick/provide导入 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 17:14:00 +08:00
关羽	3ddd74d679	Fix Bug #494 : 住院医生工作站-检查申请："申请单名称"字段显示为通用名称，未展示具体检查项目名称 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 17:06:16 +08:00
关羽	9829843b3e	Fix Bug #273 : 门诊医生站-》医嘱TAB页面：修改用药天数字段的值，总量字段的值未自动通过公式换算 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 17:05:37 +08:00
关羽	0d95cc1341	Fix Bug #389 : 住院护士站-》医嘱校对：界面筛选条件失效：勾选"临时"医嘱仍显示"长期"医嘱数据前端therapyEnum参数在type.value为undefined时会被序列化为字符串"undefined"传递给后端，导致后端无法正确解析而跳过过滤条件。修复为条件展开语法：仅在type.value有值时才传递therapyEnum参数，确保"全部"筛选时不传该字段以获取全部医嘱。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 16:07:17 +08:00
关羽	1dfceeaf46	Fix Bug #389 : 住院护士站-》医嘱校对：界面筛选条件失效：勾选"临时"医嘱仍显示"长期"医嘱数据根因：therapyEnum 参数映射逻辑完全颠倒。原代码：type.value === 1 ? undefined : type.value === 2 ? 1 : 2 - 选择"长期"(1)时传 undefined（不传，无过滤） - 选择"临时"(2)时传 1（长期值） - 选择"全部"时传 2（临时值）修复：直接传 type.value，与后端 therapyEnum 枚举一致： - undefined → 全部 / 1 → 长期 / 2 → 临时 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 16:06:21 +08:00
关羽	1b79df4f93	Fix Bug #488 : 【临床医嘱】双击编辑待签发医嘱，医嘱类型回显为数字且点击确认报接口错误 - 修复 handleSaveSign 中 getBindDevice 调用时 itemNo 可能为 undefined 导致的后端报错 "Required request parameter 'itemNo' for method parameter type String is not present"：增加 itemNo 空值检查，为空时 console.warn 跳过调用而非发送无效请求 - 移除模板中两处调试残留：console.log 表达式渲染到页面（类型列和频次/用法列） - 修复签发失败处理中截断的 conso; 语法错误	2026-05-10 16:05:42 +08:00
关羽	f62a280dfc	Fix Bug #390 : 住院护士站-医嘱执行：通过住院号检索无法定位/筛选患者原 handleSearch 调用 reloadAllPatients 仅尝试刷新已展开的病区节点，对懒加载树不可靠。改为递增 treeKey 强制树组件完全重新渲染，触发 loadNode/loadPatientList 重新从后端拉取数据并传入 searchKey 过滤。	2026-05-10 16:05:17 +08:00
关羽	e5d949a740	Fix Bug #486 : [住院医生工作站-临床医嘱] 医嘱检索框不支持全局模糊搜索，未选"医嘱类型"时检索结果为空 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-10 16:02:35 +08:00