随访相关bug修复

2 years ago · a3bddb0649
6 changed files with 39 additions and 51 deletions
--- a/src/components/360View/followUpRecord/add-follow-record.vue
+++ b/src/components/360View/followUpRecord/add-follow-record.vue
@ -8,7 +8,7 @@
    @close="closeDialog"
  >
    <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
-      <el-form-item label="随访时间:" label-width="90px" prop="createTime">
+      <el-form-item label="随访时间:" label-width="100px" prop="createTime">
        <el-date-picker
          v-model="dataForm.createTime"
          type="date"
@ -16,7 +16,7 @@
          value-format="yyyy-MM-dd"
        />
      </el-form-item>
-      <el-form-item label="随访表单:" label-width="90px" prop="name">
+      <el-form-item label="随访表单:" label-width="100px" prop="name">
        <el-radio-group v-model="dataForm.name">
          <el-radio v-for="item in followFormList" :key="item.id" :label="item.name">{{ item.name }}</el-radio>
        </el-radio-group>
--- a/src/components/360View/followUpRecord/formList/invalid.vue
+++ b/src/components/360View/followUpRecord/formList/invalid.vue
@ -2,7 +2,9 @@
  <table>
    <tbody>
      <tr>
-        <td rowspan="2" style="width: 30%" />
+        <td rowspan="2" style="width: 30%">
+          <img width="300" src="@/assets/img/xianganlogo.png">
+        </td>
        <td class="table_title">翔安医院</td>
      </tr>
      <tr>
@ -39,10 +41,10 @@ export default {
    }
  },
  watch: {
-    jsonText(val) {
-      if (val) {
-        const data = val && JSON.parse(val)
-        this.radio = data.radio
+    followId() {
+      if (this.jsonText) {
+        const data = JSON.parse(this.jsonText)
+        this.radio = data && data.radio
      } else {
        this.radio = '0'
      }
@ -51,6 +53,8 @@ export default {
  created() {
    if (this.jsonText) {
      this.radio = this.jsonText && JSON.parse(this.jsonText).radio
+    } else {
+      this.radio = '0'
    }
  },
  methods: {
--- a/src/components/360View/followUpRecord/formList/outFollow.vue
+++ b/src/components/360View/followUpRecord/formList/outFollow.vue
@ -3,7 +3,9 @@
    <table>
      <tbody>
        <tr>
-          <td rowspan="2" style="width: 30%" />
+          <td rowspan="2" style="width: 30%">
+            <img width="300" src="@/assets/img/xianganlogo.png">
+          </td>
          <td class="table_title" colspan="2">翔安医院</td>
        </tr>
        <tr>
@ -258,18 +260,19 @@ export default {
    }
  },
  watch: {
-    jsonText(val) {
-      if (val) {
+    followId() {
+      if (this.jsonText) {
        const data = JSON.parse(this.jsonText)
        this.patientData = data.patientData
        this.checks = data.checks
        this.slitChecks = data.slitChecks
        this.diaMeasures = data.diaMeasures
      } else {
-        this.patientData = this.initData.patientData
-        this.checks = this.initData.checks
-        this.slitChecks = this.initData.slitChecks
-        this.diaMeasures = this.initData.diaMeasures
+        const data = JSON.parse(JSON.stringify(this.initData))
+        this.patientData = data.patientData
+        this.checks = data.checks
+        this.slitChecks = data.slitChecks
+        this.diaMeasures = data.diaMeasures
      }
    }
  },
--- a/src/components/360View/followUpRecord/formList/phoneFollow.vue
+++ b/src/components/360View/followUpRecord/formList/phoneFollow.vue
@ -2,7 +2,9 @@
  <table>
    <tbody>
      <tr>
-        <td rowspan="2" style="width: 30%" />
+        <td rowspan="2" style="width: 30%">
+          <img width="300" src="@/assets/img/xianganlogo.png">
+        </td>
        <td class="table_title" colspan="2">翔安医院</td>
      </tr>
      <tr>
@ -46,12 +48,12 @@
        <td>OD</td>
        <td>OS</td>
      </tr>
-      <tr>
+      <tr v-if="followData.OD">
        <td>视力</td>
        <td><el-input v-model="followData.OD.vision" style="flex: 1" /></td>
        <td><el-input v-model="followData.OD.pressure" style="flex: 1" /></td>
      </tr>
-      <tr>
+      <tr v-if="followData.OS">
        <td>眼压</td>
        <td><el-input v-model="followData.OS.vision" style="flex: 1" /></td>
        <td><el-input v-model="followData.OS.pressure" style="flex: 1" /></td>
@ -97,6 +99,8 @@
 </template>

 <script>
+import _ from 'lodash'
+
 export default {
  name: 'PhoneFollow',
  props: {
@ -137,16 +141,16 @@ export default {
    }
  },
  watch: {
-    jsonText(val) {
-      if (val) {
+    followId() {
+      if (this.jsonText) {
        this.followData = JSON.parse(this.jsonText)
      } else {
-        this.followData = this.initData
+        this.followData = _.cloneDeep(this.initData)
      }
    }
  },
  created() {
-    this.initData = JSON.parse(JSON.stringify(this.followData))
+    this.initData = _.cloneDeep(this.followData)
    if (this.jsonText) {
      this.followData = JSON.parse(this.jsonText)
    }
--- a/src/components/360View/followUpRecord/index.vue
+++ b/src/components/360View/followUpRecord/index.vue
@ -18,8 +18,8 @@
        </div>
        <div class="table_form">
          <invalid v-if="curFormType==='无效联系'" id="followFunc" ref="followRef" :json-text="dataForm.jsonText" :follow-id="dataForm.id" />
-          <phone-follow v-else-if="curFormType==='电话随访'" id="followFunc" ref="followRef" :json-text="dataForm.jsonText" :follow-id="dataForm.id" />
-          <out-follow v-else id="followFunc" ref="followRef" :patient-id="patientId" :json-text="dataForm.jsonText" :follow-id="dataForm.id" :platform="platform" />
+          <phone-follow v-if="curFormType==='电话随访'" id="followFunc" ref="followRef" :json-text="dataForm.jsonText" :follow-id="dataForm.id" />
+          <out-follow v-if="curFormType==='门诊随访'" id="followFunc" ref="followRef" :patient-id="patientId" :json-text="dataForm.jsonText" :follow-id="dataForm.id" :platform="platform" />
        </div>
      </div>
      <!-- 没有随访数据 -->
@ -48,7 +48,6 @@ import timeLineFollowUp from '@/components/360View/time-line-follow-up'
 // import editFullCaseTemplate from '@/components/hm-crf/edit-full-case-template.vue'
 // import intelligentFull from '@/components/hm-crf/intelligent-full.vue'
 import addFollowRecord from './add-follow-record.vue'
-import IntelligentFill from '@/mixins/IntelligentFill'
 import Invalid from '@/components/360View/followUpRecord/formList/invalid.vue'
 import PhoneFollow from '@/components/360View/followUpRecord/formList/phoneFollow.vue'
 import OutFollow from '@/components/360View/followUpRecord/formList/outFollow.vue'
@ -64,7 +63,6 @@ export default {
    // editFullCaseTemplate,
    // intelligentFull
  },
-  mixins: [IntelligentFill],
  props: {
    patientIdNumber: {
      type: String,
@ -95,30 +93,8 @@ export default {
      timeAxisDataVisit: [], // 左侧时间轴数据
      curFormType: '',
      followRecordVisible: false,
-      // crfVisible: false,
      followUpVisible: false,
-      editFullCaseTemplateVisible: false,
-      intelligentFullVisible: false,
-      jsArr: [],
      dataForm: {},
-      name: '',
-      formDate: '',
-      callList: [{
-        date: '2021--4-12 12:53:21',
-        recordFile: '',
-        recordLength: '10:12:12',
-        flag: 1
-      }, {
-        date: '2021--4-12 13:53:21',
-        recordFile: '',
-        recordLength: '10:12:12',
-        flag: 1
-      }, {
-        date: '2021--4-12 14:53:21',
-        recordFile: '',
-        recordLength: '10:12:12',
-        flag: 0
-      }],
      followFormList: [
        {
          id: '1',
@ -156,6 +132,7 @@ export default {
      }
      this.$http.get('/patient/view/getTimeAxisDataVisit', { params }).then(res => {
        this.timeAxisDataVisit = res.data.data
+        this.curFormType = this.timeAxisDataVisit[0].itemList[0].groupName
        if (add) {
          const index = this.timeAxisDataVisit.findIndex(item => item.date === this.$moment(value.createTime).format('YYYY-MM-DD'))
          this.$refs.timeline.itemCurrentIndex = index || 0
@ -174,7 +151,7 @@ export default {
          if (Isdate) {
            const itemListIndex = itemListCurrentIndex * 1 === 0 ? 0 : itemListCurrentIndex - 1
            this.$refs.timeline.itemListCurrentIndex = itemListIndex
-            this.dataForm = this.timeAxisDataVisit[itemCurrentIndex].itemList[itemListIndex]
+            this.dataForm = this.timeAxisDataVisit.length && this.timeAxisDataVisit[itemCurrentIndex].itemList[itemListIndex]
            window.sessionStorage.setItem('itemCurrentIndex', itemCurrentIndex)
            window.sessionStorage.setItem('itemListIndex', itemListIndex)
          } else {
@ -182,7 +159,7 @@ export default {
            const itemIndex = itemCurrentIndex * 1 === 0 ? 0 : itemCurrentIndex - 1
            this.$refs.timeline.itemCurrentIndex = itemIndex
            this.$refs.timeline.itemListCurrentIndex = 0
-            this.dataForm = this.timeAxisDataVisit[itemIndex].itemList[0]
+            this.dataForm = this.timeAxisDataVisit.length && this.timeAxisDataVisit[itemIndex].itemList[0]
            window.sessionStorage.setItem('itemCurrentIndex', itemIndex)
            window.sessionStorage.setItem('itemListIndex', 0)
          }
--- a/src/components/360View/special/index.vue
+++ b/src/components/360View/special/index.vue
@ -213,8 +213,8 @@ export default {
      //   }
      // })
      // const baseUrl = 'http://z1.huimucloud.com:8085'
-      const baseUrl = 'http://10.80.5.32:8026'
-      // const baseUrl = 'http://192.168.0.85:8001'
+      // const baseUrl = 'http://10.80.5.32:8026'
+      const baseUrl = 'http://192.168.0.85:8001'
      const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
      window.open(href, '_blank')
    },