Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

 Conflicts:
	src/doctor/Doctor.vue

src/api/doctor/separateFU.js

@@ -4,3 +4,11 @@ import { fetchBase } from '@/api/doctor/doctorFetch'
 export function addHypertensionForm(params) {
     return fetchBase({ url: `/chronic-admin/v1/chronic-visit-hypertension/save`, body: params, loading: true })
 }
+// 新增糖尿病随访
+export function addDiabetesForm(params) {
+    return fetchBase({ url: `/chronic-admin/v1/chronic-visit-diabetes/save`, body: params, loading: true })
+}
+// 新增冠心病随访
+export function addCoronaryHeartDiseaseForm(params) {
+    return fetchBase({ url: `/chronic-admin/v1/chronic-visit-coronary/save`, body: params, loading: true })
+}
\ No newline at end of file

src/doctor/followUp/separateFU/form/FormCont.vue

 <template>
     <div>
         <HypertensionForm v-if="diseaseInfo.diseaseType === 1" ref="hypertensionForm"></HypertensionForm>
-        <DiabetesForm v-if="diseaseType === 2"></DiabetesForm>
+        <DiabetesForm v-if="diseaseInfo.diseaseType === 2" ref="diabetesForm"></DiabetesForm>
+        <CoronaryHeartDiseaseForm v-if="diseaseInfo.diseaseType === 3" ref="coronaryHeartDiseaseForm"></CoronaryHeartDiseaseForm>
     </div>
 </template>
 <script>
 import HypertensionForm from './components/HypertensionForm.vue'
 import DiabetesForm from './components/DiabetesForm.vue'
-import { addHypertensionForm } from '@/api/doctor/separateFU'
+import CoronaryHeartDiseaseForm from './components/CoronaryHeartDiseaseForm.vue'
+import { addHypertensionForm, addDiabetesForm, addCoronaryHeartDiseaseForm } from '@/api/doctor/separateFU'
 export default {
-    components: { HypertensionForm, DiabetesForm },
+    components: { HypertensionForm, DiabetesForm, CoronaryHeartDiseaseForm },
     props: {
         baseInfo: {
             type: Object,
@@ -22,7 +24,7 @@ export default {
     },
     data() {
         return {
-            diseaseType: 2
+            // diseaseType: 2
         }
     },
     computed: {
@@ -32,15 +34,31 @@ export default {
     },
     methods: {
         async submit() {
-            const hypertensionForm = await this.$refs.hypertensionForm.submit()
             let form = {
                 ...this.diseaseInfo,
                 residentsRecord: this.baseInfo,
-                ...hypertensionForm,
                 residentInfoId: this.residentInfoId,
                 source: 2
             }
-            return await addHypertensionForm(form, true)
+            if (this.diseaseInfo.diseaseType === 1) {
+                const hypertensionForm = await this.$refs.hypertensionForm.submit()
+                return await addHypertensionForm({
+                    ...form,
+                    ...hypertensionForm
+                }, true)
+            } else if (this.diseaseInfo.diseaseType === 2) {
+                const diabetesForm = await this.$refs.diabetesForm.submit()
+                return await addDiabetesForm({
+                    ...form,
+                    ...diabetesForm
+                }, true)
+            } else if (this.diseaseInfo.diseaseType === 3) {
+                const coronaryHeartDiseaseForm = await this.$refs.coronaryHeartDiseaseForm.submit()
+                return await addCoronaryHeartDiseaseForm({
+                    ...form,
+                    ...coronaryHeartDiseaseForm
+                }, true)
+            }
         }
     }
 }

src/doctor/followUp/separateFU/form/Index.vue

@@ -25,7 +25,7 @@ export default {
     components: { BaseInfo, FormCont },
     data() {
         return {
-            step: 2,
+            step: 1,
             baseInfo: {},
             diseaseInfo: {}
         }

src/doctor/patientDetail/components/disease/List.vue

@@ -16,13 +16,13 @@
                             <span class="label shrink-0">诊断评估</span>
                             <span class="grow" >{{ item.diagnoseResultValue || '-' }}</span>
                         </div>
-                        <div>
-                            <span class="label">诊断单位</span>
-                            <span>{{ item.diseaseUnitName }}</span>
+                        <div class="flex">
+                            <span class="label shrink-0">诊断单位</span>
+                            <span class="grow text-wrap">{{ item.diseaseUnitName }}</span>
                         </div>
-                        <div>
-                            <span class="label">诊断科室</span>
-                            <span>{{ item.diseaseOfficeName }}</span>
+                        <div class="flex">
+                            <span class="label shrink-0">诊断科室</span>
+                            <span class="grow text-wrap">{{ item.diseaseOfficeName }}</span>
                         </div>
                         <div>
                             <span class="label">诊断医生</span>