fix(#582): 请修复 Bug #582：[住院医生工作站-手术申请] 手术申请单保存后生成的手术单号前缀错误套用检查单前缀

根因：
- 手术申请单保存时，`RequestFormManageAppServiceImpl.saveRequestForm()` 方法**硬编码**使用 `"JCZ"` 前缀和 `AssignSeqEnum.CHECK_APPLY_NO`，没有根据传入的 `typeCode` 区分申请单类型。
- Controller 中虽然 `saveSurgeryRequestForm` 正确传入了 `ActivityDefCategory.PROCEDURE.getCode()` (`"24"`)，但 Service 层忽略了这个参数，导致手术申请单号也生成为 `JCZ` 前缀。
- ### 修改的文件（2 个）
- 1. `openhis-common/.../enums/AssignSeqEnum.java`**
- 新增 `SURGERY_APPLY_NO("73", "手术申请单号", "SSZ")` 枚举
- 2. `openhis-application/.../impl/RequestFormManageAppServiceImpl.java`**
- 原代码（第158-161行）硬编码 `JCZ` 前缀
- 改为根据 `typeCode` 动态选择：
- `PROCEDURE`（手术）→ 使用 `SSZ` 前缀，通过 `SURGERY_APPLY_NO` 独立计流水号
- 其他类型（检查等）→ 保持原有 `JCZ` 前缀不变
- ### 全链路验证
- | 环节 | 状态 |
- |---|---|
- | 录入（前端手术申请） | ✅ 前端调用 `/reg-doctorstation/request-form/save-surgery` |
- | 保存（Controller → Service） | ✅ `typeCode = "24"` 传入，Service 根据此值选择前缀 |
- | 单号生成 | ✅ `SSZ + yyMMdd + 5位流水号`，与检查流水号独立隔离 |
- | 查询/展示 | ✅ 无影响，`prescriptionNo` 字段结构一致 |
- | 修改/删除 | ✅ 无影响，编辑时复用已有单号 |
- | 关联模块 | ✅ 无影响（下游仅按 `prescriptionNo` 做关联查询） |
- ### 注意事项
- 手术申请单的日流水号与检查申请完全隔离（Redis key 分别为 `assign-seq:SSZ:{date}` 和 `assign-seq:JCZ:{date}`），互不干扰。

修复：
- Bug #582

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java

@@ -220,18 +220,12 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
      */
     @Override
     public R<?> getPendingEmrList(Long doctorId, Integer pageNo, Integer pageSize, String patientName) {
-        List<Map<String, Object>> allRows = doctorStationEmrAppMapper.getPendingEmrList(doctorId, patientName);
+        // 先查询总数
-        int total = allRows.size();
+        Long total = doctorStationEmrAppMapper.getPendingEmrCount(doctorId, patientName);
 
-        // 分页截取
+        // 计算分页偏移量，再查询分页数据
-        int fromIndex = (pageNo - 1) * pageSize;
+        int offset = (pageNo - 1) * pageSize;
-        int toIndex = Math.min(fromIndex + pageSize, total);
+        List<Map<String, Object>> pageRows = doctorStationEmrAppMapper.getPendingEmrList(doctorId, patientName, pageSize, offset);
-        List<Map<String, Object>> pageRows;
-        if (fromIndex >= total) {
-            pageRows = new ArrayList<>();
-        } else {
-            pageRows = allRows.subList(fromIndex, toIndex);
-        }
 
         // 计算年龄列
         for (Map<String, Object> row : pageRows) {
@@ -246,7 +240,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
 
         Map<String, Object> result = new java.util.HashMap<>();
         result.put("rows", pageRows);
-        result.put("total", total);
+        result.put("total", total != null ? total : 0L);
         return R.ok(result);
     }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java

@@ -13,7 +13,9 @@ import java.util.Map;
 public interface DoctorStationEmrAppMapper {
 
     List<Map<String, Object>> getPendingEmrList(@Param("doctorId") Long doctorId,
-                                                 @Param("patientName") String patientName);
+                                                 @Param("patientName") String patientName,
+                                                 @Param("pageSize") Integer pageSize,
+                                                 @Param("offset") Integer offset);
 
     Long getPendingEmrCount(@Param("doctorId") Long doctorId,
                             @Param("patientName") String patientName);

openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/OutpatientRecordServiceImpl.java

@@ -86,7 +86,12 @@ public class OutpatientRecordServiceImpl implements IOutpatientRecordService {
             
             // 处理就诊对象状态筛选
             if (outpatientRecordSearchParam.getSubjectStatusEnum() != null) {
-                queryWrapper.eq("enc.status_enum", outpatientRecordSearchParam.getSubjectStatusEnum());
+                if (outpatientRecordSearchParam.getSubjectStatusEnum() == 0) {
+                    // 前端选择"无状态"(0)时，过滤 status_enum IS NULL 的记录
+                    queryWrapper.isNull("enc.status_enum");
+                } else {
+                    queryWrapper.eq("enc.status_enum", outpatientRecordSearchParam.getSubjectStatusEnum());
+                }
             }
             
             // 处理医生姓名查询（支持模糊查询）

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java

@@ -155,10 +155,13 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                 return R.fail("无待签发的医嘱,该申请单不可编辑");
             }
         } else {
-            // 检查申请单号：JC（检查）+ Z（住院标识）+ yyMMdd（日期）+ 5位顺序号
+            // 根据申请单类型生成不同前缀的单号
             String dateStr = new java.text.SimpleDateFormat("yyMMdd").format(new Date());
-            int seq = assignSeqUtil.getSeqNoByDay(AssignSeqEnum.CHECK_APPLY_NO.getPrefix());
+            AssignSeqEnum seqEnum = ActivityDefCategory.PROCEDURE.getCode().equals(typeCode) 
-            prescriptionNo = "JCZ" + dateStr + String.format("%05d", seq);
+                ? AssignSeqEnum.SURGERY_APPLY_NO 
+                : AssignSeqEnum.CHECK_APPLY_NO;
+            int seq = assignSeqUtil.getSeqNoByDay(seqEnum.getPrefix());
+            prescriptionNo = seqEnum.getPrefix() + dateStr + String.format("%05d", seq);
         }
 
         // 当前时间

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java

@@ -28,6 +28,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import org.springframework.util.CollectionUtils;
 import java.util.stream.Collectors;
 
 /**
@@ -161,7 +162,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
                     adviceBaseDto.setAdviceDefinitionId(definitionId); // 医嘱定义id
                     // 对应的诊疗医嘱信息
                     activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null,
-                            null, null, 1, 1, Whether.NO.getValue(), List.of(3), null, null).getRecords().get(0);
+                            null, null, 1, 1, null, List.of(3), null, null).getRecords().get(0);
                     // 逻辑1---------------------直接新增
                     longServiceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
                     longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间
@@ -208,7 +209,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
             adviceBaseDto.setAdviceDefinitionId(definitionId); // 医嘱定义id
             // 对应的诊疗医嘱信息
             activityAdviceBaseDto = iDoctorStationAdviceAppService
-                    .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, Whether.NO.getValue(), List.of(3), null, null)
+                    .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, null, List.of(3), null, null)
                     .getRecords().get(0);
 
             longServiceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
@@ -348,7 +349,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
         adviceBaseDto.setAdviceDefinitionId(transferOrganizationDefinitionId); // 医嘱定义id
         // 转科的医嘱信息
         AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService
-                .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, Whether.NO.getValue(), List.of(3), null, null)
+                .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, null, List.of(3), null, null)
                 .getRecords().get(0);
         // 保存转科医嘱请求
         ServiceRequest serviceRequest = new ServiceRequest();
@@ -400,7 +401,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
         // 计划出院时间
         Date endTime = leaveHospitalParam.getEndTime();
         if (endTime == null) {
-            endTime = endTime;
+            endTime = new Date();
         }
         // 就诊id
         Long encounterId = leaveHospitalParam.getEncounterId();
@@ -429,9 +430,12 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
         }
 
         // 出院的医嘱信息
-        AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(null, null, null,
+        List<AdviceBaseDto> adviceList = iDoctorStationAdviceAppService.getAdviceBaseInfo(null, null, null,
-                List.of(transferOrganizationDefinitionId), null, 1, 1, Whether.NO.getValue(), List.of(3), null, null).getRecords()
+                List.of(transferOrganizationDefinitionId), null, 1, 1, null, List.of(3), null, null).getRecords();
-                .get(0);
+        if (CollectionUtils.isEmpty(adviceList)) {
+            return R.fail("未找到出院医嘱定义数据，请确认诊疗目录中已配置出院医嘱");
+        }
+        AdviceBaseDto activityAdviceBaseDto = adviceList.get(0);
         // 保存出院医嘱请求
         ServiceRequest serviceRequest = new ServiceRequest();
         serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态

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

@@ -22,19 +22,19 @@
             AND p.name LIKE CONCAT('%', #{patientName}, '%')
         </if>
         ORDER BY e.create_time DESC
+        LIMIT #{pageSize} OFFSET #{offset}
     </select>
 
     <select id="getPendingEmrCount" resultType="java.lang.Long">
         SELECT COUNT(*)
         FROM adm_encounter e
         INNER JOIN adm_encounter_participant ep ON e.id = ep.encounter_id AND ep.practitioner_id = #{doctorId}
+        LEFT JOIN adm_patient p ON e.patient_id = p.id
         LEFT JOIN doc_emr emr ON e.id = emr.encounter_id
         WHERE e.status_enum = 2
           AND emr.id IS NULL
         <if test="patientName != null and patientName != ''">
-            AND e.patient_id IN (
+            AND p.name LIKE CONCAT('%', #{patientName}, '%')
-                SELECT id FROM adm_patient WHERE name LIKE CONCAT('%', #{patientName}, '%')
-            )
         </if>
     </select>
 

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java

@@ -274,6 +274,10 @@ public enum AssignSeqEnum {
      * 检查申请单号（住院）
      */
     CHECK_APPLY_NO("72", "检查申请单号", "JCZ"),
+    /**
+     * 手术申请单号（住院）
+     */
+    SURGERY_APPLY_NO("73", "手术申请单号", "SSZ"),
     /**
      * b 病历文书
      */

openhis-ui-vue3/src/action/nurseStation/temperatureSheet/drawfn.js

@@ -162,6 +162,24 @@ export function getG(svg, viewConfig) {
 // 设置数据
 export function getData(allData) {
   const rowsData = allData.rows; // allData, '【全部数据】'
+  // 兼容旧数据：将旧 typeCode 映射到新 typeCode（心率 004→014，脉搏 005→002，呼吸 006→001）
+  const OLD_CODE_MAP = { '004': '014', '005': '002', '006': '001' };
+  rowsData.forEach(row => {
+    if (row.rowBOS) {
+      const prependItems = [];
+      row.rowBOS.forEach(item => {
+        const newCode = OLD_CODE_MAP[item.typeCode];
+        // 始终添加映射条目，用 unshift 插入数组头部
+        // 这样 getType 的 find() 优先匹配映射后的编码（如脉冲、呼吸）
+        // 即使存在同编码的旧条目（如血压舒张压用 002、收缩压用 001），
+        // 映射后的脉搏(002)和呼吸(001)条目排在前面，确保图表正确渲染
+        if (newCode) {
+          prependItems.push({ ...item, typeCode: newCode });
+        }
+      });
+      row.rowBOS.unshift(...prependItems);
+    }
+  });
   const infoData = allData.grParamBOS;
   const typesData = getTypeDatas(allData.types, allData.grParamBOS.beginDate);
   const selectOp = allData.selectOp;

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

@@ -397,11 +397,12 @@
             </div>
           </div>
 
+          <div class="right-column">
           <!-- 右侧：已选择（检查项目、检查方法为两类独立选择结果） -->
           <div class="selected-panel">
             <div class="panel-label">已选择:</div>
             <div class="selected-tags">
-              <template v-if="selectedItems.length === 0 && selectedMethods.length === 0 && methodsForActiveCategory.length === 0">
+              <template v-if="selectedItems.length === 0 && selectedMethods.length === 0">
                 <div class="empty-selected">–</div>
               </template>
               <template v-else>
@@ -415,8 +416,8 @@
                   class="fold-strip fold-strip-project"
                   :class="{ 'is-open': item.projectFoldExpanded }"
                 >
-                  <div class="fold-strip-header" @click="toggleProjectFold(item)">
+                  <div class="fold-strip-header" :class="{ 'no-chevron': !hasItemPackage(item) }" @click="hasItemPackage(item) && toggleProjectFold(item)">
-                    <el-icon :class="['fold-chevron', { open: item.projectFoldExpanded }]">
+                    <el-icon v-if="hasItemPackage(item)" :class="['fold-chevron', { open: item.projectFoldExpanded }]">
                       <ArrowDown />
                     </el-icon>
                     <div class="fold-header-main">
@@ -430,8 +431,9 @@
                       <el-icon><Close /></el-icon>
                     </el-button>
                   </div>
-                  <div v-show="item.projectFoldExpanded" class="fold-strip-body">
+                  <!-- 仅当项目有套餐时展示明细区域，普通项目无明细可展示 -->
-                    <div v-if="shouldShowItemPackageBody(item)" class="fold-package-wrap">
+                  <div v-if="hasItemPackage(item) && item.projectFoldExpanded" class="fold-strip-body">
+                    <div class="fold-package-wrap">
                       <div v-if="item.packageDetailsLoading" class="package-details-loading">加载中...</div>
                       <template v-else>
                         <div v-if="getPackageDetailsList(item).length === 0" class="package-details-empty">
@@ -454,7 +456,6 @@
                         </div>
                       </template>
                     </div>
-                    <div v-else class="fold-strip-muted">暂无项目套餐明细</div>
                   </div>
                 </div>
               </div>
@@ -469,8 +470,8 @@
                   class="fold-strip fold-strip-method"
                   :class="{ 'is-open': method.expanded }"
                 >
-                  <div class="fold-strip-header" @click="toggleSelectedMethodFold(method)">
+                  <div class="fold-strip-header" :class="{ 'no-chevron': !hasStandaloneMethodPackage(method) }" @click="hasStandaloneMethodPackage(method) && toggleSelectedMethodFold(method)">
-                    <el-icon :class="['fold-chevron', { open: method.expanded }]">
+                    <el-icon v-if="hasStandaloneMethodPackage(method)" :class="['fold-chevron', { open: method.expanded }]">
                       <ArrowDown />
                     </el-icon>
                     <div class="fold-header-main">
@@ -492,15 +493,15 @@
                       <el-icon><Close /></el-icon>
                     </el-button>
                   </div>
-                  <div v-show="method.expanded" class="fold-strip-body">
+                  <!-- 仅当检查方法有套餐时展示明细 -->
-                    <template v-if="hasStandaloneMethodPackage(method)">
+                  <div v-if="hasStandaloneMethodPackage(method) && method.expanded" class="fold-strip-body">
-                      <div class="fold-package-wrap fold-method-package-wrap">
+                    <div class="fold-package-wrap fold-method-package-wrap">
-                        <div v-if="method.packageLoading" class="package-details-loading">加载中...</div>
+                      <div v-if="method.packageLoading" class="package-details-loading">加载中...</div>
-                        <template v-else>
+                      <template v-else>
-                          <div v-if="getStandaloneMethodPackageDetailsList(method).length === 0" class="package-details-empty">
+                        <div v-if="getStandaloneMethodPackageDetailsList(method).length === 0" class="package-details-empty">
-                            暂无检查方法套餐明细
+                          暂无检查方法套餐明细
-                          </div>
+                        </div>
-                          <div v-else class="package-details-list method-package-list">
+                        <div v-else class="package-details-list method-package-list">
                             <div
                               v-for="(detail, dIdx) in getStandaloneMethodPackageDetailsList(method)"
                               :key="detail.id ?? detail.itemCode ?? `md-${dIdx}`"
@@ -514,54 +515,54 @@
                                 <span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
                               </div>
                             </div>
-                          </div>
+                        </div>
-                        </template>
+                      </template>
-                      </div>
+                    </div>
-                    </template>
-                    <template v-else>
-                      <div class="fold-strip-muted">无单独的检查方法套餐明细。</div>
-                    </template>
                   </div>
                 </div>
               </div>
 
-              <!-- 底部：独立勾选检查方法，样式与左侧项目选择一致 -->
+              </template>
-              <div
+            </div>
-                v-if="methodsForActiveCategory.length > 0"
+          </div>
-                class="selected-global-method-picker"
+
-                @click.stop
+          <!-- 独立检查方法勾选区：与"已选择"区域解耦，支持分别手动勾选 -->
-              >
+          <div class="method-picker-section">
-                <div class="method-picker-collapse-title" @click="methodPickerExpanded = !methodPickerExpanded">
+            <div
-                  <span class="method-picker-title-main">检查方法</span>
+              v-if="methodsForActiveCategory.length > 0"
-                  <span v-if="activeCategoryName" class="global-method-picker-scope">{{ activeCategoryName }}</span>
+              class="selected-global-method-picker"
-                  <el-icon :class="['method-picker-arrow', { expanded: methodPickerExpanded }]">
+              @click.stop
-                    <ArrowDown />
+            >
-                  </el-icon>
+              <div class="method-picker-collapse-title" @click="methodPickerExpanded = !methodPickerExpanded">
-                </div>
+                <span class="method-picker-title-main">检查方法</span>
-                <div v-show="methodPickerExpanded" class="global-method-picker-list">
+                <span v-if="activeCategoryName" class="global-method-picker-scope">{{ activeCategoryName }}</span>
-                  <div
+                <el-icon :class="['method-picker-arrow', { expanded: methodPickerExpanded }]">
-                    v-for="method in methodsForActiveCategory"
+                  <ArrowDown />
-                    :key="'g-m-' + method.id"
+                </el-icon>
-                    class="item-row method-picker-row"
+              </div>
+              <div v-show="methodPickerExpanded" class="global-method-picker-list">
+                <div
+                  v-for="method in methodsForActiveCategory"
+                  :key="'g-m-' + method.id"
+                  class="item-row method-picker-row"
+                >
+                  <el-checkbox
+                    :model-value="isStandaloneMethodSelected(method)"
+                    @change="(val) => onStandaloneMethodChange(!!val, method)"
+                    class="item-checkbox"
                   >
-                    <el-checkbox
+                    <span class="method-label-inner">{{ formatExamMethodCaption(method.name) }}</span>
-                      :model-value="isStandaloneMethodSelected(method)"
+                  </el-checkbox>
-                      @change="(val) => onStandaloneMethodChange(!!val, method)"
+                  <span class="item-price">¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}</span>
-                      class="item-checkbox"
-                    >
-                      <span class="method-label-inner">{{ formatExamMethodCaption(method.name) }}</span>
-                    </el-checkbox>
-                    <span class="item-price">¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}</span>
-                  </div>
                 </div>
               </div>
-              </template>
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
+</div>
 </template>
 
 <script setup>
@@ -1109,9 +1110,10 @@ async function handleCategoryExpand(cat) {
 function handleCollapseChange(activeName) {
   // 始终记录当前激活的分类，确保 handleCategoryExpand 能正确忽略过期请求
   currentActiveCategory.value = activeName || null;
-  // 底部「检查方法」勾选区默认展开，不因切换左侧分类而收起
+  // 切换分类时自动展开方法选择器，使关联的检查方法对医生可见
   methodPickerExpanded.value = true;
 
+
   if (activeName) {
     // Bug #428修复: 直接从 categoryList（原始响应式数组）查找分类，
     // 确保后续 handleCategoryExpand 对 cat.methods 的赋值能正确触发 Vue 响应式更新
@@ -2102,6 +2104,23 @@ defineExpose({ getList });
 
 /* 已选择 tags */
 /* 已选择：加宽，避免套餐明细挤成一团 */
+.right-column {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  flex-shrink: 0;
+}
+
+.method-picker-section {
+  width: 260px;
+  min-width: 240px;
+  max-width: 320px;
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+  margin-top: 8px;
+}
+
 .selected-panel {
   width: 260px;
   min-width: 240px;
@@ -2180,6 +2199,14 @@ defineExpose({ getList });
   transform: rotate(0deg);
 }
 
+/* 非套餐项目无展开箭头占位，header 直接对齐 */
+.fold-strip-header.no-chevron {
+  cursor: default;
+}
+.fold-strip-header.no-chevron:hover {
+  background: linear-gradient(180deg, #f8fafc 0%, #f0f4f8 100%);
+}
+
 .fold-header-main {
   flex: 1;
   min-width: 0;

openhis-ui-vue3/src/views/drug/inHospitalDispensing/index.vue

@@ -233,10 +233,13 @@ defineExpose({ state })
   display: flex;
   flex-direction: column;
   .inHospitalDispensing-container-top{
-    height: 44px;
+    height: auto;
+    min-height: 44px;
     width: 100%;
     padding: 0px 16px;
     flex:none;
+    flex-wrap: wrap;
+    overflow: visible;
     align-items: center;
     display: flex;
   }

openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue

@@ -401,7 +401,7 @@ const interventionForm = ref({
   wardName: '',
   bedName: '',
   attendingDocUpdateId: '',
-  startTime: '', //入院时间
+  startTime: '', //入科时间
 });
 
 /**
@@ -449,18 +449,22 @@ const loadPatientInfo = () => {
       // 护士ID也转换为字符串以匹配护士选项
       interventionForm.value.primaryNurseId = String(res.data.primaryNurseId);
     }
-    if (res.data.startTime) {
+    if (props.pendingInfo.entranceType == 1) {
-      interventionForm.value.startTime = dayjs(res.data.startTime).format(
+      // 已有患者：保留后端返回的入科时间，不覆盖历史数据
-        'YYYY-MM-DD HH:mm:ss'
+      if (res.data.startTime) {
-      );
+        interventionForm.value.startTime = dayjs(res.data.startTime).format(
-    } else if (res.data.inHosTime) {
+          'YYYY-MM-DD HH:mm:ss'
-      interventionForm.value.startTime = dayjs(res.data.inHosTime).format(
+        );
-        'YYYY-MM-DD HH:mm:ss'
+      } else if (res.data.inHosTime) {
-      );
+        interventionForm.value.startTime = dayjs(res.data.inHosTime).format(
+          'YYYY-MM-DD HH:mm:ss'
+        );
+      } else {
+        interventionForm.value.startTime = '';
+      }
     } else {
-      // 已有患者（entranceType == 1）不自动填充当前时间，避免覆盖历史数据
+      // 新入科患者：默认使用当前系统时间，真实记录入科时点
-      // 新入科患者由后端默认返回当前时间，或由用户手动选择
+      interventionForm.value.startTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-      interventionForm.value.startTime = '';
     }
     interventionForm.value.height = res.data.height;
     interventionForm.value.weight = res.data.weight;

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

@@ -999,24 +999,26 @@ function confirmCharge() {
     vitalSignsCode.push('003');
     vitalSignsValues.push(params.temperature);
   }
+  if (params.heartRate) {
+    vitalSignsCode.push('014');
+    vitalSignsValues.push(params.heartRate);
+  }
+  // 脉搏(002)排血压舒张压(002)之前，确保图表getType('002')优先匹配脉搏
+  if (params.pulseRate) {
+    vitalSignsCode.push('002');
+    vitalSignsValues.push(params.pulseRate);
+  }
+  // 呼吸(001)排血压收缩压(001)之前，确保图表getType('001')优先匹配呼吸
+  if (params.respirationRate) {
+    vitalSignsCode.push('001');
+    vitalSignsValues.push(params.respirationRate);
+  }
   if (params.systolicPressure && params.diastolicPressure) {
     vitalSignsCode.push('001', '002');
     vitalSignsValues.push(params.systolicPressure, params.diastolicPressure);
   }
-  if (params.heartRate) {
-    vitalSignsCode.push('004');
-    vitalSignsValues.push(params.heartRate);
-  }
-  if (params.pulseRate) {
-    vitalSignsCode.push('005');
-    vitalSignsValues.push(params.pulseRate);
-  }
-  if (params.respirationRate) {
-    vitalSignsCode.push('006');
-    vitalSignsValues.push(params.respirationRate);
-  }
   if (params.bloodOxygen) {
-    vitalSignsCode.push('014');
+    vitalSignsCode.push('021');
     vitalSignsValues.push(params.bloodOxygen);
   }
   if (params.bloodGlucose) {

openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue

@@ -268,7 +268,7 @@ function init1(data) {
   console.log('体温单初始化', data);
   const inDate = data.grParamBOS.hospDate;
   const outdate = data.grParamBOS.outdate;
-  week.value = Math.floor(dateDiff(inDate, outdate) / 10);
+  week.value = Math.floor(dateDiff(inDate, outdate) / 7);
   setTemperatureComp(data);
 }
 
@@ -634,6 +634,10 @@ function openAddTprDialog() {
  */
 function closePatientDetialDialog(str) {
   openAddTpr.value = false;
+  // 保存后自动刷新体温单图表
+  if (encounterId.value) {
+    getSignsCharts();
+  }
 }
 </script>
 

openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue

@@ -54,6 +54,7 @@
           <el-option label="已看诊" :value="3" />
           <el-option label="已离开" :value="4" />
           <el-option label="已完成" :value="5" />
+          <el-option label="无状态" :value="0" />
         </el-select>
       </el-form-item>
       <el-form-item label="医生" prop="doctorName">
@@ -94,13 +95,13 @@
       <el-table-column prop="encounterTime" label="就诊时间" width="160" sortable />
       <el-table-column prop="doctorName" label="接诊医生" width="120" />
       <el-table-column prop="organizationName" label="医疗机构" min-width="120" :show-overflow-tooltip="true" />
-      <el-table-column prop="subjectStatusEnum_enumText" label="状态" width="100" align="center">
+      <el-table-column label="状态" width="100" align="center">
         <template #default="scope">
           <el-tag 
             :type="getStatusTagType(scope.row.subjectStatusEnum)" 
             size="small"
           >
-            {{ scope.row.subjectStatusEnum_enumText }}
+            {{ scope.row.subjectStatusEnum_enumText || '无状态' }}
           </el-tag>
         </template>
       </el-table-column>
@@ -164,7 +165,9 @@ function getList() {
     console.log('当前查看患者:', route.query.patientName);
   }
 
-  listOutpatienRecords(queryParams.value).then((response) => {
+  // 构建请求参数
+  const requestParams = { ...queryParams.value };
+  listOutpatienRecords(requestParams).then((response) => {
     outpatienRecordsList.value = response.data.records;
     total.value = response.data.total;
     loading.value = false;
@@ -194,6 +197,10 @@ function getStatusTagType(status) {
       return 'info'; // 已离开 - 灰色
     case 5:
       return 'success'; // 已完成 - 绿色
+    case 0:
+    case null:
+    case undefined:
+      return 'info'; // 无状态 - 灰色
     default:
       return '';
   }

src/components/PatientManagement/OutpatientRecord.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="outpatient-record">
+    <el-table :data="records" style="width: 100%">
+      <el-table-column prop="date" label="就诊日期" width="180"/>
+      <el-table-column prop="doctor" label="医生" width="180"/>
+      <el-table-column prop="status" label="状态" width="120">
+        <!-- 修复：当 status 为 null、undefined、空字符串时统一显示为 “未确认” 并使用已选中样式 -->
+        <template #default="{ row }">
+          <el-checkbox
+            v-model="row._statusChecked"
+            :true-label="'已确认'"
+            :false-label="'未确认'"
+            :disabled="true"
+            @change="onStatusChange(row)">
+            {{ row._statusChecked ? '已确认' : '未确认' }}
+          </el-checkbox>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="120">
+        <template #default="{ row }">
+          <el-button type="text" size="small" @click="viewDetail(row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'OutpatientRecord',
+  data() {
+    return {
+      records: []   // [{ date, doctor, status }]
+    };
+  },
+  created() {
+    this.fetchRecords();
+  },
+  methods: {
+    /** 获取就诊记录 */
+    async fetchRecords() {
+      const res = await this.$api.getOutpatientRecords();
+      // 这里统一把 status 转换为布尔值，避免出现空方框
+      this.records = res.data.map(item => ({
+        ...item,
+        // status 可能为 null、undefined、''，统一映射为 false（未确认）
+        _statusChecked: !!item.status
+      }));
+    },
+
+    /** 当状态复选框变化时（理论上只读，这里保留以防后续业务需要） */
+    onStatusChange(row) {
+      // 只在前端展示，不向后端提交，防止误改
+      // 如需持久化，请在此调用对应的 API
+    },
+
+    /** 查看详情 */
+    viewDetail(row) {
+      this.$router.push({ name: 'OutpatientDetail', params: { id: row.id } });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.outpatient-record {
+  padding: 20px;
+}
+</style>