Merge remote-tracking branch 'origin/develop' into guanyu

healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V66__bug723_fix_duplicate_menu_doctor_enhanced.sql

@@ -0,0 +1,10 @@
+-- V66: 修复 Bug#723 — 删除 sys_menu 中重复的"住院医生增强"菜单条目
+-- 根因：sys_menu 表中存在两条 menu_name = '住院医生增强' 且 parent_id 相同的记录
+-- 修复：保留 menu_id 最小的一条（20171），删除其余重复记录
+DELETE FROM sys_menu
+WHERE menu_name = '住院医生增强'
+  AND menu_id NOT IN (
+      SELECT MIN(menu_id)
+      FROM sys_menu
+      WHERE menu_name = '住院医生增强'
+  );

healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue

@@ -1160,13 +1160,20 @@ function handleNodeClick(data) {
   form.value.diagnosisList.push({
     ybNo: data.ybNo,
     name: data.name,
+    showPopover: false,
+    diagnosisSystem: '西医',
+    tcmSyndromeCode: '',
+    tcmSyndromeName: '',
+    syndromeDefinitionId: '',
+    syndromeGroupNo: '',
     verificationStatusEnum: 4,
     medTypeCode: undefined,
     diagSrtNo: form.value.diagnosisList.length + 1,
     definitionId: data.definitionId,
+    iptDiseTypeCode: 2,
+    diagnosisDesc: '',
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
     diagnosisTime: new Date().toLocaleString('zh-CN'),
-    // 添加 patientId
     patientId: props.patientInfo.patientId
   });
   if (form.value.diagnosisList.length == 1) {
@@ -1202,12 +1209,4 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
   align-items: center;
   gap: 4px;
 }
-</style>
-
-
-            :disabled="hasUnsavedDiagnosis || isAdding"
-const isAdding = ref(false);
-  if (isAdding.value) return;
-  isAdding.value = true;
-      isAdding.value = false;
-    isAdding.value = false;
+</style>

healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/index.vue

@@ -348,6 +348,12 @@ function getCurrentDate() {
 }
 
 function addNewDiagnosis() {
+  // Bug #783: 存在未保存的新诊断时，不允许继续新增
+  const hasUnsavedRow = diagnoseData.value.some(item => item.isNew && !item.conditionId)
+  if (hasUnsavedRow) {
+    ElMessage.warning('请先保存已新增的诊断，再添加新诊断')
+    return
+  }
   const maxSortNo = diagnoseData.value.length > 0
     ? Math.max(...diagnoseData.value.map(item => item.sortNo || 0))
     : 0
@@ -374,6 +380,12 @@ function addNewDiagnosis() {
 }
 
 function addNewChinese() {
+  // Bug #783: 存在未保存的新诊断时，不允许继续新增
+  const hasUnsavedRow = diagnoseData.value.some(item => item.isNew && !item.conditionId)
+  if (hasUnsavedRow) {
+    ElMessage.warning('请先保存已新增的诊断，再添加新诊断')
+    return
+  }
   chineseMedicineDialogVisible.value = true
 }
 

healthlink-his-ui/src/views/inpatientNurse/medicineReturn/index.vue

@@ -1,31 +1,10 @@
 <!--
- * @Author: sjjh
- * @Date: 2025-09-09 13:49:40
- * @Description: 
+ * @Description: 护士工作站 - 退药管理（复用住院退药组件）
 -->
 <template>
-  <div class="container" />
+  <ReturnDrug />
 </template>
-<script setup>
-import {getCurrentInstance, onBeforeMount, onMounted, reactive} from 'vue'
 
-const { proxy } = getCurrentInstance();
-const emits = defineEmits([])
-const props = defineProps({
- 
-})
-const state = reactive({
- 
-})
-onBeforeMount(() => {
- 
-})
-onMounted(() => {
- 
-})
-defineExpose({ state })
- 
-</script> 
-<style lang="scss" scoped>
- 
-</style>
+<script setup>
+import ReturnDrug from '@/views/drug/inpatientMedicationDispensing/components/ReturnDrug.vue';
+</script>