From ba43966911a7a99567fcf7524da9a734c8d65477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 29 Mar 2024 10:45:47 +0800
Subject: [PATCH] xg

---
 src/views/manage/visitin/index.vue  |  4 ++--
 src/views/manage/visitout/index.vue | 26 ++++++++------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue
index 4d90983..661ae0e 100644
--- a/src/views/manage/visitin/index.vue
+++ b/src/views/manage/visitin/index.vue
@@ -278,8 +278,8 @@
           <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
         <el-form-item label="入院时间" prop="admissionTime">
-          <el-date-picker clearable v-model="form.admissionTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-            style="width:200px" placeholder="请选择入院时间">
+          <el-date-picker clearable v-model="form.admissionTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+            format='yyyy-MM-dd HH:mm' style="width:200px" placeholder="请选择入院时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="手术名称" prop="surgicalName">
diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue
index 75b69fa..fe14f6a 100644
--- a/src/views/manage/visitout/index.vue
+++ b/src/views/manage/visitout/index.vue
@@ -14,12 +14,7 @@
           style="width:300px" value-format="yyyy-MM-dd" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
-      <!-- <el-form-item label="就诊时间" prop="visitTime">
-        <el-date-picker v-model="queryParams.visitTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
-          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="入院时间" prop="admissionTime">
+      <!-- <el-form-item label="入院时间" prop="admissionTime">
         <el-date-picker v-model="queryParams.admissionTime" value-format="yyyy-MM-dd" style="width:300px" type="daterange"
           range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item> -->
@@ -285,19 +280,19 @@
         <el-form-item label="就诊流水号" prop="visitSerialNumber">
           <el-input v-model="form.visitSerialNumber" placeholder="请输入就诊流水号" style="width:200px" />
         </el-form-item>
-        <el-form-item label="就诊时间" prop="visitTime" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
-          <el-date-picker clearable v-model="form.visitTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择就诊时间"
-            style="width:200px">
+        <el-form-item label="门诊时间" prop="dischargeTime" v-if="form.visitMethod == 'OUTPATIENT_SERVICE'">
+          <el-date-picker clearable v-model="form.dischargeTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+            format='yyyy-MM-dd HH:mm' placeholder="请选择门诊时间" style="width:200px">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="入院时间" prop="admissionTime" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
-          <el-date-picker clearable v-model="form.admissionTime" type="date" value-format="yyyy-MM-dd"
-            style="width:200px" placeholder="请选择入院时间">
+          <el-date-picker clearable v-model="form.admissionTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+            format='yyyy-MM-dd HH:mm' style="width:200px" placeholder="请选择入院时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="出院时间" prop="dischargeTime" v-if="form.visitMethod == 'BE_IN_HOSPITAL'">
-          <el-date-picker clearable v-model="form.dischargeTime" type="date" value-format="yyyy-MM-dd"
-            :picker-options="pickerOptions" style="width:200px" placeholder="请选择出院时间">
+          <el-date-picker clearable v-model="form.dischargeTime" type="datetime" value-format="yyyy-MM-dd HH:mm"
+            format='yyyy-MM-dd HH:mm' :picker-options="pickerOptions" style="width:200px" placeholder="请选择出院时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="手术名称" prop="surgicalName">
@@ -529,7 +524,6 @@ export default {
         admissionTime: null,
         dischargeTime: null,
         outpatientNumber: null,
-        visitTime: null,
         dischargeMethod: null,
         patientSource: null,
       },
@@ -574,9 +568,6 @@ export default {
         dischargeTime: [
           { required: true, message: '请选择患者出院时间', trigger: 'change' }
         ],
-        visitTime: [
-          { required: true, message: '请选择患者就诊时间', trigger: 'change' }
-        ],
         billingDoctorId: [
           { required: true, message: '请选择开单医生', trigger: 'change' }
         ],
@@ -713,7 +704,6 @@ export default {
         registrationDate: null,
         appointmentDate: null,
         outpatientNumber: null,
-        visitTime: null,
         dischargeMethod: null,
         openId: null,
         unionId: null,