Merge remote-tracking branch 'origin/master'

src/api/business/inHospital.js

@@ -35,6 +35,14 @@ export function updateHospital(data) {
   })
 }
 
+export function updateHospitalRecord(data) {
+  return request({
+    url: '/business/hospital',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除业务管理-住院管理
 export function delHospital(id) {
   return request({

src/views/medical-record-management/medical-edit.vue

@@ -1158,7 +1158,7 @@ import {
   updateCheck, editRecord, getRecordPayment
 } from '@/api/business/mdeicalRecord'
 import { mapGetters } from 'vuex'
-import { addHospital, delHospital, listHospital, updateHospital } from '@/api/business/inHospital'
+import { addHospital, delHospital, listHospital, updateHospitalRecord } from '@/api/business/inHospital'
 
 export default {
   name: 'MedicalEdit',
@@ -1842,9 +1842,10 @@ export default {
       console.log('修改保存', row)
       const updateForm = JSON.parse(JSON.stringify(this.recordDetail))
       updateForm.inHospitalBo = row
-
+      updateForm.inHospitalBo.createTime = null
+      updateForm.createTime = null
       if (updateForm.inHospitalBo.id) {
-        updateHospital(updateForm).then(res => {
+        updateHospitalRecord(updateForm).then(res => {
           this.petInHospitalUpdateShow = false
           this.getInHospitalList(this.$route.params.id)
         })

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -68,7 +68,7 @@
       </el-table-column>
       <el-table-column label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.membershipLevel || '-' }}</span>
+          <span>{{ scope.row.petOwnerBo.membershipLevel || '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip>

src/views/service-management/registration-queue/components/prescribing-modle.vue

@@ -60,7 +60,7 @@
         </div>
         <div>
           <el-form-item label="诊断时间" prop="visitDate">
-            <el-input v-model="registerForm.reportTime" placeholder="暂无数据" :disabled="true" maxlength="20" />
+            <el-input v-model="registerForm.diagnosisTime" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </div>
         <div>