commit

src/views/medical-advice/nursing-manage/ThreeTestList.vue

@@ -693,7 +693,7 @@ const validateBodyWeightData = () => {
 
 
 
-// 验证保存数据时的入院时间（使用最晚的入院时间）
+// 验证保存数据时的入院时间（使用最晚的入院时间，精确到时分秒）
 const validateSaveDataAdmissionDate = () => {
     if (!patientDetailInfoList.value || patientDetailInfoList.value.length === 0) {
         return true
@@ -714,15 +714,18 @@ const validateSaveDataAdmissionDate = () => {
         return true
     }
     
-    const admissionDateStr = getFormatDatetime(latestAdmissionDate, 'YYYY-MM-DD')
+    const admissionDateStr = getFormatDatetime(latestAdmissionDate, 'YYYY-MM-DD HH:mm:ss')
     
     // 验证图表数据
     for (let i = 0; i < yzTemperatureVOS.value.length; i++) {
         const row = yzTemperatureVOS.value[i]
-        if (row.recDateStr) {
-            const inputDate = new Date(row.recDateStr)
-            if (inputDate < latestAdmissionDate) {
-                ElMessage.error(`第${i + 1}行图表数据：输入日期 ${row.recDateStr} 不能早于患者入院时间 ${admissionDateStr}`)
+        if (row.recDateStr && row.specialtextTimeStr) {
+            // 构建完整的日期时间字符串：recDateStr + specialtextTimeStr
+            const inputDateTimeStr = `${row.recDateStr} ${row.specialtextTimeStr}:00`
+            const inputDateTime = new Date(inputDateTimeStr)
+            
+            if (inputDateTime < latestAdmissionDate) {
+                ElMessage.error(`第${i + 1}行图表数据：输入时间 ${inputDateTimeStr} 不能早于患者入院时间 ${admissionDateStr}`)
                 return false
             }
         }
@@ -731,10 +734,13 @@ const validateSaveDataAdmissionDate = () => {
     // 验证总量数据
     for (let i = 0; i < yzTemperatureSums.value.length; i++) {
         const row = yzTemperatureSums.value[i]
-        if (row.recDateStr) {
-            const inputDate = new Date(row.recDateStr)
-            if (inputDate < latestAdmissionDate) {
-                ElMessage.error(`第${i + 1}行总量数据：输入日期 ${row.recDateStr} 不能早于患者入院时间 ${admissionDateStr}`)
+        if (row.recDateStr && row.specialtextTimeStr) {
+            // 构建完整的日期时间字符串：recDateStr + specialtextTimeStr
+            const inputDateTimeStr = `${row.recDateStr} ${row.specialtextTimeStr}:00`
+            const inputDateTime = new Date(inputDateTimeStr)
+            
+            if (inputDateTime < latestAdmissionDate) {
+                ElMessage.error(`第${i + 1}行总量数据：输入时间 ${inputDateTimeStr} 不能早于患者入院时间 ${admissionDateStr}`)
                 return false
             }
         }