Fix Bug #518: [门诊医生工作站-诊断-传染病报卡] 报卡页面缺失"性别、出生日期、实足年龄"核心字段

根因：infectiousDiseaseReportDialog.vue 读取患者性别时使用了错误的字段名
patientInfo.sex || patientInfo.genderName，但门诊医生站API返回的字段是
genderEnum(数字:1=男,2=女)和genderEnum_enumText(文本:男/女)。
新增 normalizeSexFromPatientInfo 函数，兼容HIS系统所有可能的性别字段命名。

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,9 +96,4 @@ 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,38 +3,29 @@
  */
 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;
@@ -57,15 +48,6 @@ 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;
 
@@ -185,10 +167,6 @@ 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()) {
@@ -350,73 +328,4 @@ 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/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java

@@ -90,26 +90,18 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
 
         // 逐个校验activityList中的项目是否都配置了执行科室，并收集positionId供后续使用
         // 必须在任何数据库操作之前完成全部校验，避免部分保存后异常导致脏数据
-        // 🔧 Bug #516: 优先使用前端传入的positionId（用户手动选择的发往科室），仅在未选择时使用配置的执行科室
         List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
         // 缓存校验结果，避免主循环中重复查询和可能出现的数据不一致
         java.util.Map<Long, Long> activityIdToPositionIdMap = new java.util.HashMap<>();
         if (activityList != null && !activityList.isEmpty()) {
             for (ActivitySaveDto activitySaveDto : activityList) {
-                // 优先使用前端传入的positionId（用户手动选择的科室）
-                Long frontendPositionId = activitySaveDto.getPositionId();
-                if (frontendPositionId != null) {
-                    activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), frontendPositionId);
-                    continue;
-                }
-                // 前端未传入时，使用配置的执行科室
-                Long configPositionId = activityOrganizationConfig.stream()
+                Long positionId = activityOrganizationConfig.stream()
                     .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
                     .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
-                if (configPositionId == null) {
+                if (positionId == null) {
                     throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
                 }
-                activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), configPositionId);
+                activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), positionId);
             }
         }
 

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

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

openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue

@@ -1226,18 +1226,22 @@ function handleRowClick(row) {
   selectedItems.value = [];
   activeDetailTab.value = 'applyForm';
   request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    // 响应结构: Axios拦截器对code===200返回res.data（AjaxResult体）
-    // 结构为 { code: 200, data: examApply实体, items: [明细数组] }
-    const items = Array.isArray(res.items) ? res.items : [];
-    const dataObj = res.data || {};
+    // 响应结构判定：Axios拦截器对 code===200 返回 res.data（AjaxResult体），
+    // 但某些情况下可能返回完整 Axios 响应 {data: AjaxResult}。
+    // 用 res.code 判定是否已是 AjaxResult 体，避免二次解包导致 items 丢失。
+    const isAjaxResult = res && typeof res === 'object' && res.code !== undefined;
+    const ajaxBody = isAjaxResult ? res : (res.data || res);
 
-    // 先填充表单字段
-    if (dataObj && typeof dataObj === 'object') Object.assign(form, dataObj);
+    // items 在 AjaxResult 顶层，data 字段是 ExamApply 实体
+    const rawItems = Array.isArray(ajaxBody.items) ? ajaxBody.items : [];
+    const detailData = ajaxBody.data || {};
 
-    if (items.length > 0) {
+    if (detailData && typeof detailData === 'object') Object.assign(form, detailData);
+
+    if (rawItems.length > 0) {
       try {
         // 为每个项目加载检查方法
-        const itemsWithMethods = await Promise.all(items.map(async m => {
+        const itemsWithMethods = await Promise.all(rawItems.map(async m => {
           const item = {
             id: m.itemCode, name: m.itemName,
             price: m.itemFee || 0, quantity: 1,
@@ -1256,7 +1260,7 @@ function handleRowClick(row) {
           if (m.bodyPartCode) {
             try {
               const methodRes = await searchCheckMethod({ checkType: m.bodyPartCode });
-              // 正确解析 API 返回结构
+              // Bug #384修复: 正确解析 API 返回结构
               let methodData = methodRes?.data?.data || methodRes?.data || methodRes?.rows || methodRes;
               if (!Array.isArray(methodData) && methodRes?.data && Array.isArray(methodRes.data.data)) {
                 methodData = methodRes.data.data;
@@ -1266,15 +1270,16 @@ function handleRowClick(row) {
                   id: md.id,
                   name: md.name,
                   code: md.code,
-                  price: m.itemFee || 0,
+                  price: m.itemFee || 0,  // fallback 到已保存的价格
                   packageName: md.packageName || '',
                   packageId: md.packageId || null,
-                  packagePrice: md.packagePrice || null,
+                  packagePrice: md.packagePrice || null,  // Bug #384修复: 套餐价格
                   serviceFee: md.serviceFee || null
                 }));
-                // 回充已保存的检查方法
+                // 如果有已保存的检查方法信息，尝试匹配
                 if (m.checkMethodId) {
-                  item.selectedMethod = item.methods.find(md => String(md.id) === String(m.checkMethodId)) || null;
+                  item.selectedMethod = item.methods.find(md => md.id === m.checkMethodId) || null;
+                  // 从已保存的方法中获取套餐信息
                   if (item.selectedMethod?.packageId) {
                     item.isPackage = true;
                     item.packageId = item.selectedMethod.packageId;
@@ -1290,27 +1295,22 @@ function handleRowClick(row) {
               }
             } catch (err) {
               console.error('加载检查方法失败', err);
+              // 单个项目加载失败不影响其他项目，继续返回 item
             }
           }
           return item;
         }));
-        // Bug #408修复: 确保明细数据正确加载到selectedItems
         selectedItems.value = itemsWithMethods;
-        // 加载套餐明细（单个失败不影响其他项目和明细显示）
         for (const it of selectedItems.value) {
           if (getPackageCarrier(it)?.packageId) {
-            try {
-              await loadPackageDetailsForItem(it);
-            } catch (e) {
-              console.error('加载套餐明细失败:', it.name, e);
-            }
+            await loadPackageDetailsForItem(it);
           }
           it.expanded = !!getPackageCarrier(it)?.packageId;
         }
         syncCategoryChecked();
         // Bug #384修复: 回充后更新检查方法显示
         updateMethodDisplay();
-        // Bug #408修复: 加载申请单详情后自动切换到检查明细页签，确保已加载的明细数据可见
+        // 修复【#408】：加载申请单详情后自动切换到检查明细页签，确保已加载的明细数据可见
         activeDetailTab.value = 'applyDetail';
       } catch (err) {
         console.error('加载申请单详情失败', err);

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

@@ -325,12 +325,7 @@ const projectWithDepartment = (selectProjectIds, type) => {
       }
     }
     if (findItem && isRelease) {
-      // 提交时若用户已选「发往科室」，不得用项目默认执行科室覆盖
-      if (type === 2 && manualDept) {
-        form.targetDepartment = manualDept;
-      } else {
-        form.targetDepartment = findItem.id;
-      }
+      form.targetDepartment = findItem.id;
     }
   }
   return isRelease;
@@ -397,7 +392,7 @@ const submit = () => {
       unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
       unitPrice: item.priceList[0].price /** 单价 */,
       totalPrice: item.priceList[0].price /** 总价 */,
-      positionId: form.targetDepartment || item.positionId, // 用户指定发往科室优先于项目默认执行科室
+      positionId: item.positionId || form.targetDepartment, //执行科室id，未配置时使用用户手动选择的科室
       ybClassEnum: item.ybClassEnum, //类别医保编码
       conditionId: item.conditionId, //诊断ID
       encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id

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

@@ -1503,16 +1503,16 @@ function handleSaveBatch() {
 }
 
 function setValue(row) {
-  // 构造单位列表，确保 value 始终为 String 类型，避免 el-select 值类型不匹配
+  // 构造单位列表
   unitCodeList.value = [
-    { value: String(row.unitCode ?? ''), label: row.unitCode_dictText, type: 'unit' },
+    { value: row.unitCode, label: row.unitCode_dictText, type: 'unit' },
     {
-      value: String(row.doseUnitCode ?? ''),
+      value: row.doseUnitCode,
       label: row.doseUnitCode_dictText,
       type: 'dose',
     },
     {
-      value: String(row.minUnitCode ?? ''),
+      value: row.minUnitCode,
       label: row.minUnitCode_dictText,
       type: 'minUnit',
     },
@@ -1577,9 +1577,9 @@ function setValue(row) {
     orgName: row.adviceType != 3 ? undefined : (findOrgName(row.orgId || row.positionId || patientInfo.value?.inHospitalOrgId) || row.orgName || patientInfo.value?.inHospitalOrgName || ''),
     // dose: undefined, Removed to preserve dose value from group package
     unitCodeList: unitCodeList.value,
-    doseUnitCode: String(row.doseUnitCode ?? ''),
-    minUnitCode: String(row.minUnitCode ?? ''),
-    unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode ?? '') : String(row.unitCode ?? ''),
+    doseUnitCode: row.doseUnitCode,
+    minUnitCode: row.minUnitCode,
+    unitCode: row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode,
     categoryEnum: row.categoryCode,
     definitionId: row.chargeItemDefinitionId,
     executeNum: 1,
@@ -1595,10 +1595,6 @@ function setValue(row) {
             ? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
             : prevRow.minUnitPrice,
           positionName: selectedStock?.locationName,
-          // 🔧 Bug #523 修复：初始化 totalPrice 为 0，避免总金额列显示为横杠
-          totalPrice: row.quantity
-            ? new Decimal(row.quantity).mul(selectedStock?.price ?? 0).toFixed(6)
-            : '0',
         }
       : {
           quantity: 1,

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,6 +1087,8 @@ function confirmCharge() {
         urineVolume: '',
         stoolVolume: '',
       };
+      // 保存成功后关闭弹窗
+      closeDialog();
     }
   });
 }