vue2-client 1.14.42 → 1.14.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.42",
+  "version": "1.14.44",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XReport/XReport.vue

@@ -808,7 +808,7 @@ export default {
         this.config = res
         if (this.config.designMode === 'json') {
           if (this.configData !== undefined) {
-            this.config.data = Object.assign({},this.config.data, this.configData)
+            this.config.data = Object.assign({}, this.config.data, this.configData)
           }
           this.jsonConfigInit()
         } else {

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -25,7 +25,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse','x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select' ,'x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -63,7 +63,7 @@
           </template>
           <template v-else-if="cell.type === 'slot'">
             <template
-              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule'].includes(cell.slotType)">
+              v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list', 'x-cardSet', 'x-collapse', 'x-h-descriptions', 'x-sidebar', 'x-list','x-input','x-time-line', 'x-radio','x-calendar', 'x-time-select','x-checkbox', 'x-title', 'x-select', 'x-tree-rows', 'x-three-test-orders', 'x-shift-schedule','x-charge'].includes(cell.slotType)">
               <component
                 :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                 :key="cellIndex"
@@ -125,7 +125,8 @@ export default {
     XSelect: () => import('@vue2-client/base-client/components/his/XSelect/XSelect.vue'),
     XTreeRows: () => import('@vue2-client/base-client/components/his/XTreeRows/XTreeRows.vue'),
     XThreeTestOrders: () => import('@vue2-client/base-client/components/his/threeTestOrders/threeTestOrders.vue'),
-    XShiftSchedule: () => import('@vue2-client/base-client/components/his/XShiftSchedule/XShiftSchedule.vue')
+    XShiftSchedule: () => import('@vue2-client/base-client/components/his/XShiftSchedule/XShiftSchedule.vue'),
+    XCharge: () => import('@vue2-client/base-client/components/his/XCharge/XCharge.vue')
   },
   props: {
     // 每一行的配置

package/src/base-client/components/his/XCharge/XCharge.vue

@@ -0,0 +1,226 @@
+<template>
+  <div class="xcharge-wrapper">
+    <!-- 顶部金额信息区（表单行风格，宽度固定，每行4个） -->
+    <a-row :gutter="0" class="amount-info">
+      <a-col v-for="item in config.amountFields" :key="item.field" :span="6" class="form-row">
+        <label class="form-label">{{ item.label }}</label>
+        <a-input
+          :value="data[item.field]"
+          disabled
+          class="form-input"
+        />
+      </a-col>
+    </a-row>
+
+    <a-divider/>
+
+    <!-- 支付方式选择区 -->
+    <div class="payment-methods">
+      <a-button
+        v-for="method in config.paymentMethods"
+        :key="method.key"
+        :class="['payment-btn', { active: selectedMethod === method.key }]"
+        @click="selectMethod(method.key)"
+      >
+        <div>
+          <div class="pay-label">{{ method.label }}</div>
+        </div>
+      </a-button>
+    </div>
+
+    <a-divider/>
+
+    <!-- 底部金额和操作区（表单行风格，宽度固定） -->
+    <a-row :gutter="0" class="bottom-info">
+      <a-col v-for="item in config.bottomFields" :key="item.field" :span="8" class="form-row">
+        <label class="form-label">{{ item.label }}</label>
+        <a-input
+          v-model="data[item.field]"
+          :disabled="item.disabled"
+          class="form-input"
+        />
+      </a-col>
+    </a-row>
+    <a-row class="actions-row" justify="center">
+      <a-button
+        v-for="btn in config.actionButtons"
+        :key="btn.key"
+        @click="handleAction(btn.key)"
+        :icon="btn.icon"
+        style="margin: 0 8px"
+      >
+        {{ btn.label }}
+      </a-button>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@/services/api/common'
+
+export default {
+  name: 'XCharge',
+  props: {
+    configName: {
+      type: String,
+      default: '收费组件Config'
+    },
+    parameter: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data () {
+    return {
+      config: {
+        amountFields: [],
+        paymentMethods: [],
+        bottomFields: [],
+        actionButtons: []
+      },
+      data: {},
+      selectedMethod: '',
+    }
+  },
+  created () {
+    this.getConfig(this.configName, {})
+  },
+  methods: {
+    getConfig (configName, param) {
+      getConfigByName(configName, 'af-his', res => {
+        this.config = res
+        this.selectedMethod = res.paymentMethods?.[0]?.key || ''
+        // 初始化数据
+        runLogic(res.dataSourceConfig, param, 'af-his').then(resData => {
+          this.data = { ...resData }
+        })
+      })
+    },
+    refreshList (param) {
+      this.getConfig(this.configName, param)
+    },
+    handleAction (key) {
+      console.warn('选择的的方法 ====》' + key)
+      console.warn('页面数据 ====》' + JSON.stringify(this.data))
+      console.warn('选择的支付方式 ====》' + this.selectedMethod)
+      this.$emit('action', { key, data: this.data, method: this.selectedMethod })
+    }
+  },
+  watch: {
+    configName (val) {
+      this.getConfig()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.xcharge-wrapper {
+  background: #fff;
+  padding: 24px;
+  border-radius: 8px;
+}
+
+.amount-info {
+  margin-bottom: 20px;
+  display: flex;
+  flex-wrap: wrap;
+  row-gap: 16px;
+}
+
+.form-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30px;
+}
+
+.form-label {
+  width: 100px;
+  font-size: 18px;
+  color: #333;
+  font-weight: bold;
+  text-align: left;
+  letter-spacing: 1px;
+  flex-shrink: 0;
+}
+
+.form-input {
+  width: 180px;
+  height: 40px;
+  font-size: 18px;
+  border-radius: 8px;
+  border: 1.5px solid #dcdfe6;
+  background: #fff;
+  color: #333;
+  padding-left: 12px;
+}
+
+.form-input[disabled] {
+  color: #999;
+  background: #f5f5f5;
+}
+
+.payment-methods {
+  display: flex;
+  justify-content: space-around;
+  margin: 32px 0;
+}
+
+.payment-btn {
+  width: 180px;
+  height: 120px;
+  margin: 0 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #f7f8fa;
+  border: 1.5px solid #e4e7ed;
+  color: #333;
+  font-weight: bold;
+  font-size: 24px;
+  transition: all 0.2s;
+  box-shadow: none;
+  border-radius: 12px;
+}
+
+.payment-btn.active {
+  background: #409eff;
+  border-color: #409eff;
+  color: #fff;
+}
+
+.pay-label {
+  font-size: 24px;
+  font-weight: bold;
+}
+
+.pay-shortcut {
+  font-size: 16px;
+  color: #888;
+}
+
+.bottom-info {
+  margin-top: 24px;
+  display: flex;
+  flex-wrap: wrap;
+  row-gap: 16px;
+}
+
+.actions-row {
+  margin-top: 32px;
+  display: flex;
+  justify-content: center;
+}
+
+.actions-row .ant-btn {
+  margin: 0 8px;
+  background: #444;
+  color: #fff;
+  border-radius: 6px;
+  border: none;
+  font-size: 16px;
+  font-weight: 500;
+  height: 38px;
+  min-width: 90px;
+}
+</style>

package/src/base-client/components/his/XList/XList.vue

@@ -58,9 +58,6 @@ export default {
     this.getData(this.queryParamsName, this.fixedQueryForm)
   },
   methods: {
-    click11 (val) {
-      Object.assign(this.fixedQueryForm, { condition: val })
-    },
     async getData (config, param) {
       const that = this
       getConfigByName(config, 'af-his', res => {

package/src/base-client/components/his/XShiftSchedule/XShiftSchedule.vue

@@ -5,44 +5,44 @@
     :rowSelection="rowSelection"
     :scroll="{ y: '75vh' }">
     <span slot="time" class="time-title">
-      <span v-for="(item, index) in configData.timePeriod" :key=index>{{item}}</span>
+      <span v-for="(item, index) in configData.timePeriod" :key="index">{{ item }}</span>
     </span>
     <template slot="Monday" slot-scope="text, record">
       <div class="time-title">
-        <a-button v-for="(item, index) in record.Monday" :key="index" @click="handleShiftChange('Monday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+        <a-button v-for="(item, index) in record.Monday" :key="index" @click="handleShiftChange('Monday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
     <template slot="Tuesday" slot-scope="text, record">
       <div class="time-title">
-        <a-button v-for="(item, index) in record.Tuesday" :key="index" @click="handleShiftChange('Tuesday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+        <a-button v-for="(item, index) in record.Tuesday" :key="index" @click="handleShiftChange('Tuesday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
     <template slot="Wednesday" slot-scope="text, record">
       <div class="time-title">
-        <a-button v-for="(item, index) in record.Wednesday" :key="index" @click="handleShiftChange('Wednesday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+        <a-button v-for="(item, index) in record.Wednesday" :key="index" @click="handleShiftChange('Wednesday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
     <template slot="Thursday" slot-scope="text, record">
       <div class="time-title">
-        <a-button v-for="(item, index) in record.Thursday" :key="index" @click="handleShiftChange('Thursday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+        <a-button v-for="(item, index) in record.Thursday" :key="index" @click="handleShiftChange('Thursday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
     <template slot="Friday" slot-scope="text, record">
       <div class="time-title">
-        <a-button v-for="(item, index) in record.Friday" :key="index" @click="handleShiftChange('Friday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+        <a-button v-for="(item, index) in record.Friday" :key="index" @click="handleShiftChange('Friday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
     <template slot="Saturday" slot-scope="text, record">
       <div class="time-title">
-        <a-button v-for="(item, index) in record.Saturday" :key="index" @click="handleShiftChange('Saturday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+        <a-button v-for="(item, index) in record.Saturday" :key="index" @click="handleShiftChange('Saturday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
     <template slot="Sunday" slot-scope="text, record">
       <div class="time-title">
-        <a-button v-for="(item, index) in record.Sunday" :key="index" @click="handleShiftChange('Sunday', index, record)">{{item === 1 || item === '1' ? '坐诊' : '休息'}}</a-button>
+        <a-button v-for="(item, index) in record.Sunday" :key="index" @click="handleShiftChange('Sunday', index, record)">{{ item === 1 || item === '1' ? '坐诊' : '休息' }}</a-button>
       </div>
     </template>
-    <template slot="sk_limit"  slot-scope="text, record">
+    <template slot="sk_limit" slot-scope="text, record">
       <a-input-number id="inputNumber" v-model="record.sk_limit" :min="configData.sk_limitMin" :max="configData.sk_limitMax" />
     </template>
   </a-table>

package/src/base-client/components/his/XTitle/XTitle.vue

@@ -59,7 +59,7 @@ const handleClick = () => {
 const parseConfig = (data) => {
   if (!data) return
 
-  const parts = data.includes('-') ? data.split('-') : [data]
+  const parts = data.includes('-') ? data.split('-') : data === 'line' ? ['', 'title', 'line'] : [data]
 
   // 基本设置 - 标签和类型
   config.value.label = parts[0] || ''
@@ -76,16 +76,12 @@ const parseConfig = (data) => {
     config.value.line = parts[2] || ''
     config.value.color = parts[3] || ''
     config.value.lineLength = parts[4] || ''
-    config.value.clickName = '' // 标题类型不需要点击事件
   } else if (config.value.type === 'button') {
     // 按钮类型格式: aa-button-cc
     // parts[0]: 标签
     // parts[1]: button
     // parts[2]: 点击事件名称
     config.value.clickName = parts[2] || ''
-    config.value.line = ''
-    config.value.color = ''
-    config.value.lineLength = ''
   }
 }
 

package/src/base-client/components/his/threeTestOrders/textBox.vue

@@ -13,7 +13,7 @@ const props = defineProps({
   modalType: {
     type: String,
     default: 'create',
-    validator: (value) => ['create', 'update', 'baby'].includes(value)
+    validator: (value) => ['create', 'update'].includes(value)
   },
   editorReady: {
     type: Boolean,
@@ -27,8 +27,7 @@ const emit = defineEmits(['update:visible', 'submit', 'cancel'])
 // 常量
 const modalTitles = {
   create: '创建体温单',
-  update: '更新体温单',
-  baby: '新生儿体温单'
+  update: '更新体温单'
 }
 
 // 响应式状态
@@ -118,9 +117,9 @@ const resetForm = () => {
   formData.heart = ''
   formData.tempType = ''
   formData.temperature = ''
-  formData.physicalcool = ''
-  formData.breath = ''
-  formData.sphygmus = ''
+  formData.pulse = ''
+  formData.breathing = ''
+  formData.bloodPressure = ''
   formData.labels = ''
   formData.data1 = ''
   formData.data2 = ''
@@ -222,7 +221,6 @@ const closeModal = () => {
 
 // 验证表单
 const validateForm = () => {
-  const isBaby = props.modalType === 'baby'
   const errors = {}
   let hasError = false
   // 通用字段验证
@@ -247,23 +245,15 @@ const validateForm = () => {
     { key: 'data5', label: '小便次数' }
   ]
   // 成人特有字段
-  if (!isBaby) {
-    requiredFields.push(
-      { key: 'diag', label: '诊断' },
-      { key: 'operateDate', label: '手术日期' },
-      { key: 'sphygmus', label: '脉搏' },
-      { key: 'data6', label: '身高' },
-      { key: 'data7', label: '体重' },
-      { key: 'data8', label: '过敏药' },
-      { key: 'data9', label: '其他数据' }
-    )
-  } else {
-    // 婴儿特有字段
-    requiredFields.push(
-      { key: 'weight', label: '体重' },
-      { key: 'physicalcool', label: '物理降温' }
-    )
-  }
+  requiredFields.push(
+    { key: 'diag', label: '诊断' },
+    { key: 'operateDate', label: '手术日期' },
+    { key: 'sphygmus', label: '脉搏' },
+    { key: 'data6', label: '身高' },
+    { key: 'data7', label: '体重' },
+    { key: 'data8', label: '过敏药' },
+    { key: 'data9', label: '其他数据' }
+  )
   // 检查每个必填字段
   requiredFields.forEach(field => {
     // 首先检查字段是否存在
@@ -290,9 +280,8 @@ const validateForm = () => {
 
 // 获取表单数据
 const getFormData = () => {
-  const isBaby = props.modalType === 'baby'
   const commonData = {
-    id: formData.id || `${isBaby ? 'BY' : 'VS'}${Date.now()}`,
+    id: formData.id || `VS${Date.now()}`,
     name: formData.name,
     inDate: formData.inDate,
     dept: formData.dept,
@@ -310,26 +299,18 @@ const getFormData = () => {
     data3: formData.data3,
     data4: formData.data4,
     data5: formData.data5,
-    pain: formData.pain
-  }
-  if (isBaby) {
-    return {
-      ...commonData,
-      type: 'baby',
-      sex: formData.sex,
-      weight: formData.weight,
-      physicalcool: formData.physicalcool
-    }
-  }
-  return {
-    ...commonData,
-    diag: formData.diag,
-    operateDate: formData.operateDate,
-    sphygmus: formData.sphygmus,
     data6: formData.data6,
     data7: formData.data7,
     data8: formData.data8,
-    data9: formData.data9
+    data9: formData.data9,
+    pain: formData.pain,
+    diag: formData.diag,
+    operateDate: formData.operateDate,
+    sphygmus: formData.sphygmus
+  }
+  return {
+    ...commonData,
+    type: 'normal'
   }
 }
 
@@ -368,7 +349,7 @@ const submitForm = async () => {
     <a-form :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
       <!-- 通用基础信息字段 -->
       <a-form-item label="ID" :validateStatus="formErrors.id ? 'error' : ''" :help="formErrors.id">
-        <a-input v-model="formData.id" :placeholder="`请输入ID，如：${modalType === 'baby' ? 'BY' : 'AD'}20230001`" />
+        <a-input v-model="formData.id" :placeholder="`请输入ID，如：AD20230001`" />
       </a-form-item>
       <a-form-item label="姓名" :validateStatus="formErrors.name ? 'error' : ''" :help="formErrors.name">
         <a-input v-model="formData.name" placeholder="请输入姓名，如：张三" />
@@ -376,24 +357,12 @@ const submitForm = async () => {
       <a-form-item label="入院日期" :validateStatus="formErrors.inDate ? 'error' : ''" :help="formErrors.inDate">
         <a-input v-model="formData.inDate" placeholder="请输入日期，如：2023-08-01" />
       </a-form-item>
-      <!-- 新生儿特有字段 -->
-      <template v-if="modalType === 'baby'">
-        <a-form-item label="性别">
-          <a-radio-group v-model="formData.sex">
-            <a-radio value="男">男</a-radio>
-            <a-radio value="女">女</a-radio>
-          </a-radio-group>
-        </a-form-item>
-      </template>
-      <!-- 成人特有字段 -->
-      <template v-else>
         <a-form-item label="诊断" :validateStatus="formErrors.diag ? 'error' : ''" :help="formErrors.diag">
           <a-input v-model="formData.diag" placeholder="请输入诊断，如：新型冠状病毒肺炎" />
         </a-form-item>
-      </template>
       <!-- 通用字段 -->
       <a-form-item label="科室" :validateStatus="formErrors.dept ? 'error' : ''" :help="formErrors.dept">
-        <a-input v-model="formData.dept" :placeholder="`请输入科室，如：${modalType === 'baby' ? '妇产科' : '呼吸内科'}`" />
+        <a-input v-model="formData.dept" :placeholder="`请输入科室，如：呼吸内科`" />
       </a-form-item>
       <a-form-item label="床位" :validateStatus="formErrors.bed ? 'error' : ''" :help="formErrors.bed">
         <a-input v-model="formData.bed" placeholder="请输入床位，如：801" />
@@ -404,30 +373,19 @@ const submitForm = async () => {
       <a-form-item label="开始日期" :validateStatus="formErrors.begin ? 'error' : ''" :help="formErrors.begin">
         <a-input v-model="formData.begin" placeholder="请输入日期，如：2023-08-01" />
       </a-form-item>
-      <!-- 成人特有字段 -->
-      <template v-if="modalType !== 'baby'">
-        <a-form-item label="手术日期" :validateStatus="formErrors.operateDate ? 'error' : ''" :help="formErrors.operateDate">
-          <a-input v-model="formData.operateDate" placeholder="请输入日期，如：2023-08-03" />
-        </a-form-item>
-      </template>
+      <a-form-item label="手术日期" :validateStatus="formErrors.operateDate ? 'error' : ''" :help="formErrors.operateDate">
+        <a-input v-model="formData.operateDate" placeholder="请输入日期，如：2023-08-03" />
+      </a-form-item>
       <!-- 备注字段 -->
       <a-form-item label="备注" :validateStatus="formErrors.notes ? 'error' : ''" :help="formErrors.notes">
         <a-input v-model="formData.notes" :placeholder="`请输入备注，如：${modalType === 'baby' ? '出生-十时二十分' : '入院-十时二十分,,转入ICU,,,,,,,手术'}`" />
         <div class="input-tip">格式：多个值用逗号分隔，对应不同日期</div>
       </a-form-item>
       <!-- 根据表单类型显示不同的数据字段 -->
-      <template v-if="modalType !== 'baby'">
-        <a-form-item label="脉搏" :validateStatus="formErrors.sphygmus ? 'error' : ''" :help="formErrors.sphygmus">
-          <a-input v-model="formData.sphygmus" placeholder="脉搏数据，如：112,110,109,103,108,85" />
-          <div class="input-tip">格式：多个值用逗号分隔</div>
-        </a-form-item>
-      </template>
-      <template v-else>
-        <a-form-item label="体重" :validateStatus="formErrors.weight ? 'error' : ''" :help="formErrors.weight">
-          <a-input v-model="formData.weight" placeholder="体重数据，多个值用逗号分隔，如：3200,,,,3300,,,,3400" />
-          <div class="input-tip">格式：多个值用逗号分隔，每组数据对应一天</div>
-        </a-form-item>
-      </template>
+      <a-form-item label="脉搏" :validateStatus="formErrors.sphygmus ? 'error' : ''" :help="formErrors.sphygmus">
+        <a-input v-model="formData.sphygmus" placeholder="脉搏数据，如：112,110,109,103,108,85" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
       <!-- 生命体征数据字段 -->
       <a-form-item label="心率" :validateStatus="formErrors.heart ? 'error' : ''" :help="formErrors.heart">
         <a-input v-model="formData.heart" placeholder="心率数据，多个值用逗号分隔，如：112,120,118,111" />
@@ -438,16 +396,9 @@ const submitForm = async () => {
         <div class="input-tip">格式：多个值用逗号分隔，0-3表示不同类型</div>
       </a-form-item>
       <a-form-item label="体温" :validateStatus="formErrors.temperature ? 'error' : ''" :help="formErrors.temperature">
-        <a-input v-model="formData.temperature" :placeholder="`体温数据，如：${modalType === 'baby' ? '37.7,37.9,38.5,37.1' : '38.7,38.9,38.5,39.1,38.5,38.5|37.1'}`" />
+        <a-input v-model="formData.temperature" :placeholder="`体温数据，如：38.7,38.9,38.5,39.1,38.5,38.5|37.1`" />
         <div class="input-tip">格式：多个值用逗号分隔<template v-if="modalType !== 'baby'">，|表示新一行数据</template></div>
       </a-form-item>
-      <!-- 新生儿特有字段 -->
-      <template v-if="modalType === 'baby'">
-        <a-form-item label="物理降温" :validateStatus="formErrors.physicalcool ? 'error' : ''" :help="formErrors.physicalcool">
-          <a-input v-model="formData.physicalcool" placeholder="物理降温数据，如：,,,37.6,,,,,,,,37.5" />
-          <div class="input-tip">格式：多个值用逗号分隔，空值用逗号表示</div>
-        </a-form-item>
-      </template>
       <!-- 通用数据字段 -->
       <a-form-item label="呼吸" :validateStatus="formErrors.breath ? 'error' : ''" :help="formErrors.breath">
         <a-input v-model="formData.breath" placeholder="呼吸数据，如：30,30,R,,35,35" />
@@ -478,25 +429,22 @@ const submitForm = async () => {
         <a-input v-model="formData.data5" placeholder="小便次数数据，如：2,4,5,3,3,3,2,,2" />
         <div class="input-tip">格式：多个值用逗号分隔</div>
       </a-form-item>
-      <!-- 成人特有字段 -->
-      <template v-if="modalType !== 'baby'">
-        <a-form-item label="身高" :validateStatus="formErrors.data6 ? 'error' : ''" :help="formErrors.data6">
-          <a-input v-model="formData.data6" placeholder="身高数据，如：167cm,,,,,,,,,164cm" />
-          <div class="input-tip">格式：多个值用逗号分隔</div>
-        </a-form-item>
-        <a-form-item label="体重" :validateStatus="formErrors.data7 ? 'error' : ''" :help="formErrors.data7">
-          <a-input v-model="formData.data7" placeholder="体重数据，如：95kg,,,,,90kg" />
-          <div class="input-tip">格式：多个值用逗号分隔</div>
-        </a-form-item>
-        <a-form-item label="过敏药" :validateStatus="formErrors.data8 ? 'error' : ''" :help="formErrors.data8">
-          <a-input v-model="formData.data8" placeholder="过敏药数据，如：青霉素," />
-          <div class="input-tip">格式：多个值用逗号分隔</div>
-        </a-form-item>
-        <a-form-item label="其他数据" :validateStatus="formErrors.data9 ? 'error' : ''" :help="formErrors.data9">
-          <a-input v-model="formData.data9" placeholder="其他数据，如：测试," />
-          <div class="input-tip">格式：多个值用逗号分隔</div>
-        </a-form-item>
-      </template>
+      <a-form-item label="身高" :validateStatus="formErrors.data6 ? 'error' : ''" :help="formErrors.data6">
+        <a-input v-model="formData.data6" placeholder="身高数据，如：167cm,,,,,,,,,164cm" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <a-form-item label="体重" :validateStatus="formErrors.data7 ? 'error' : ''" :help="formErrors.data7">
+        <a-input v-model="formData.data7" placeholder="体重数据，如：95kg,,,,,90kg" />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <a-form-item label="过敏药" :validateStatus="formErrors.data8 ? 'error' : ''" :help="formErrors.data8">
+        <a-input v-model="formData.data8" placeholder="过敏药数据，如：青霉素," />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
+      <a-form-item label="其他数据" :validateStatus="formErrors.data9 ? 'error' : ''" :help="formErrors.data9">
+        <a-input v-model="formData.data9" placeholder="其他数据，如：测试," />
+        <div class="input-tip">格式：多个值用逗号分隔</div>
+      </a-form-item>
       <!-- 按钮 -->
       <a-form-item :wrapper-col="{ span: 18, offset: 6 }">
         <a-button type="primary" @click="submitForm" :loading="submitLoading" style="margin-right: 10px">确定</a-button>