Fix Bug #517: [库房管理-领用管理] 业务逻辑校验缺失：允许保存并提交领用数量大于库存数量（零库存领用）的单据

在 RequisitionIssueAppServiceImpl.addOrEditIssueReceipt() 中新增库存校验逻辑，
批量保存时校验领用数量是否超过源仓库实际库存，不足时抛出 ServiceException 阻断保存。

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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java

@@ -96,4 +96,9 @@ public class DiagnosisQueryDto {
      */
     private String diagnosisDoctor;
 
+    /**
+     * 是否已有传染病报卡（0-无，1-有）
+     */
+    private Integer hasInfectiousReport;
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java

@@ -3,29 +3,38 @@
  */
 package com.openhis.web.inventorymanage.appservice.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
+import com.openhis.administration.domain.DeviceDefinition;
 import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IDeviceDefinitionService;
 import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.domain.MedicationDefinition;
+import com.openhis.medication.service.IMedicationDefinitionService;
 import com.openhis.web.common.dto.UnitDto;
 import com.openhis.web.inventorymanage.appservice.IRequisitionIssueAppService;
 import com.openhis.web.inventorymanage.dto.*;
 import com.openhis.web.inventorymanage.mapper.RequisitionIssueMapper;
+import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.IInventoryItemService;
 import com.openhis.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -48,6 +57,15 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
     @Autowired
     private IPractitionerService practitionerService;
 
+    @Autowired
+    private IInventoryItemService inventoryItemService;
+
+    @Autowired
+    private IMedicationDefinitionService medicationDefinitionService;
+
+    @Autowired
+    private IDeviceDefinitionService deviceDefinitionService;
+
     @Autowired
     private AssignSeqUtil assignSeqUtil;
 
@@ -167,6 +185,10 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
 
         // 单据号取得
         List<String> busNoList = requisitionIssueDtoList.stream().map(IssueDto::getBusNo).collect(Collectors.toList());
+
+        // 库存校验：领用数量不能超过源仓库实际库存
+        this.validateRequisitionStock(requisitionIssueDtoList);
+
         // 请求数据取得
         List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
         if (!requestList.isEmpty()) {
@@ -328,4 +350,73 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
             }
         }
     }
+
+    /**
+     * 校验领用数量是否超过源仓库实际库存
+     *
+     * @param requisitionIssueDtoList 领用出库单据列表
+     */
+    private void validateRequisitionStock(List<IssueDto> requisitionIssueDtoList) {
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        for (IssueDto issueDto : requisitionIssueDtoList) {
+            Long itemId = issueDto.getItemId();
+            String lotNumber = issueDto.getLotNumber();
+            Long sourceLocationId = issueDto.getSourceLocationId();
+            BigDecimal reqQuantity = issueDto.getItemQuantity();
+            String itemUnit = issueDto.getUnitCode();
+            String itemTable = issueDto.getItemTable();
+
+            // 根据物品类型查询定义信息（拆零比、常规单位、最小单位）
+            BigDecimal partPercent = BigDecimal.ONE;
+            String unitCode = itemUnit;
+            String minUnitCode = itemUnit;
+
+            if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(itemTable)) {
+                MedicationDefinition medDef = medicationDefinitionService.getById(itemId);
+                if (medDef != null) {
+                    unitCode = medDef.getUnitCode();
+                    minUnitCode = medDef.getMinUnitCode();
+                    if (medDef.getPartPercent() != null) {
+                        partPercent = medDef.getPartPercent();
+                    }
+                }
+            } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(itemTable)) {
+                DeviceDefinition devDef = deviceDefinitionService.getById(itemId);
+                if (devDef != null) {
+                    unitCode = devDef.getUnitCode();
+                    minUnitCode = devDef.getMinUnitCode();
+                    if (devDef.getPartPercent() != null) {
+                        partPercent = devDef.getPartPercent();
+                    }
+                }
+            }
+
+            // 计算领用数量折合最小单位的值
+            BigDecimal reqQuantityInMinUnit;
+            if (itemUnit.equals(unitCode)) {
+                // 领用单位 = 包装单位，需乘以拆零比
+                reqQuantityInMinUnit = reqQuantity.multiply(partPercent);
+            } else {
+                // 领用单位 = 最小单位，无需换算
+                reqQuantityInMinUnit = reqQuantity;
+            }
+
+            // 查询源仓库实际库存（按物品编号、批号、仓库匹配）
+            List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    itemId, lotNumber, sourceLocationId, tenantId);
+
+            // 累加匹配批号的总库存（库存表quantity字段为最小单位）
+            BigDecimal totalStock = BigDecimal.ZERO;
+            for (InventoryItem inventoryItem : inventoryItemList) {
+                if (inventoryItem.getLocationId().equals(sourceLocationId)) {
+                    totalStock = totalStock.add(inventoryItem.getQuantity());
+                }
+            }
+
+            // 比较领用数量与库存
+            if (reqQuantityInMinUnit.compareTo(totalStock) > 0) {
+                throw new ServiceException("操作失败，库存数量不足");
+            }
+        }
+    }
 }

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml

@@ -134,7 +134,11 @@
                T2.yb_no,
                T1.onset_date AS onsetDate,
                T1.diagnosis_time AS diagnosisTime,
-               T1.doctor AS diagnosisDoctor
+               T1.doctor AS diagnosisDoctor,
+               CASE WHEN EXISTS (
+                   SELECT 1 FROM infectious_card T4
+                   WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1
+               ) THEN 1 ELSE 0 END AS hasInfectiousReport
         FROM adm_encounter_diagnosis AS T1
                  LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
             AND T2.delete_flag = '0' AND T2.tcm_flag = 0

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -692,6 +692,7 @@ async function handleFoodDiseasesCheck() {
 /**
  * 传染病报告卡处理
  * 通过诊断名称自动识别并勾选传染病报告卡中的疾病
+ * 修复 Bug #519：跳过已有已提交报卡的诊断
  */
 function handleInfectiousDiseaseReport() {
   // 疾病名称到报卡编码的映射（根据传染病报告卡弹窗中的疾病列表）
@@ -743,8 +744,9 @@ function handleInfectiousDiseaseReport() {
     '手足口病': '0311',
   };
 
-  // 获取所有诊断名称对应的报卡编码
+  // 获取所有诊断名称对应的报卡编码，但跳过已有已提交报卡的诊断
   const allSelectedDiseases = form.value.diagnosisList
+    .filter(d => d.name && d.hasInfectiousReport !== 1)
     .map(d => diseaseNameToCode[d.name] || null)
     .filter(code => code);
 
@@ -752,9 +754,9 @@ function handleInfectiousDiseaseReport() {
     return;
   }
 
-  // 优先使用主诊断
-  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1);
-  const firstDiagnosis = form.value.diagnosisList[0];
+  // 优先使用主诊断（同样跳过已有报卡的）
+  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1 && d.hasInfectiousReport !== 1);
+  const firstDiagnosis = form.value.diagnosisList.find(d => d.hasInfectiousReport !== 1) || form.value.diagnosisList[0];
 
   const diagnosisToShow = {
     ...(mainDiagnosis || firstDiagnosis),

openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue

@@ -1057,8 +1057,8 @@ function confirmCharge() {
   params.recordingDate = formData.value.recordingDate || moment(new Date()).format('YYYY-MM-DD');
 
   addVitalSigns(params).then(res => {
-    console.log('保存成功:', res);
     if (res.code === 200) {
+      proxy.msgSuccess('保存成功');
       // 保存成功后刷新列表
       getPatientList();
       // 清空表单
@@ -1087,8 +1087,6 @@ function confirmCharge() {
         urineVolume: '',
         stoolVolume: '',
       };
-      // 保存成功后关闭弹窗
-      closeDialog();
     }
   });
 }