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

src/api/doctor/separateFU.js

@@ -97,9 +97,9 @@ export function getSeparateFUDetail(params) {
     return fetchBase({ url: `/chronic-admin/v1/chronic-visit-record/specialized-detail`, body: params, loading: true })
 }
 
-// 获取检验项目对码表
-export function getInspectCode(configType) {
-    return fetchBase({ url: `/chronic-admin/v1/chronic-inspect-item/query-list/${configType}`, loading: true })
+// 获取辅助检查项目对码表
+export function getInspectCode(diseaseType) {
+    return fetchBase({ url: `/chronic-admin/v1/chronic-inspect-item-special/query-list/${diseaseType}`, loading: true })
 }
 
 // 引用最近一次复筛数据-高血压

src/doctor/followUp/separateFU/form/components/ChronicKidneyDiseaseForm.vue

@@ -874,7 +874,7 @@ import DocOffice from '@/doctor/components/docOffice/DocOffice.vue'
 import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor.vue'
 import MovementTip from '@/doctor/components/movementTip/MovementTip.vue'
 
-import InspectV2 from '../../components/InspectV2.vue'
+import InspectV2 from '../../components/InspectV3.vue'
 import TreatmentPlan from '../../components/TreatmentPlan.vue'
 import dayjs from 'dayjs'
 export default {
@@ -1321,7 +1321,9 @@ export default {
 
                     const form = fetchDataHandle(this.form, {
                         symptom: 'arrToStr',
-                        currentDiagnosis: 'arrToStr'
+                        currentDiagnosis: 'arrToStr',
+                        // 辅助检查
+                        auxiliaryExamination: 'arrToStr'
                     })
                     // 录入信息（日期、单位、科室、医生）默认当前
                     let createdInfo = {
@@ -1410,7 +1412,8 @@ export default {
         dataProcess(data) {
             const form = fetchDataHandle(data, {
                 symptom: 'strToArrNum',
-                currentDiagnosis: 'strToArrNum'
+                currentDiagnosis: 'strToArrNum',
+                auxiliaryExamination: 'strToArrNum'
             })
             this.form = form
             // 下次随访日期

src/doctor/followUp/separateFU/form/components/CopdForm.vue

@@ -774,8 +774,9 @@
                     <span>x10⁹/L</span>
                 </template>
             </van-field>
-            <InspectV2 ref="inspectRef" :diseaseInfo="diseaseInfo" :form="form"></InspectV2>
+            
         </div>
+        <InspectV2 ref="inspectRef" :diseaseInfo="diseaseInfo" :form="form"></InspectV2>
         
 
         <!-- 最近三个月内是否有急性加重情况 -->
@@ -1230,7 +1231,7 @@ import DocOffice from '@/doctor/components/docOffice/DocOffice.vue'
 import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor.vue'
 import MovementTip from '@/doctor/components/movementTip/MovementTip.vue'
 
-import InspectV2 from '../../components/InspectV2.vue'
+import InspectV2 from '../../components/InspectV3.vue'
 import TreatmentPlan from '../../components/TreatmentPlan.vue'
 import dayjs from 'dayjs'
 export default {
@@ -1690,7 +1691,9 @@ export default {
                         symptom: 'arrToStr',
                         complication: 'arrToStr',
                         currentDiagnosis: 'arrToStr',
-                        vaccinesHistoryHave: 'arrToStr'
+                        vaccinesHistoryHave: 'arrToStr',
+                        // 辅助检查
+                        auxiliaryExamination: 'arrToStr'
                     })
                     // 录入信息（日期、单位、科室、医生）默认当前
                     let createdInfo = {
@@ -1783,7 +1786,8 @@ export default {
                 symptom: 'strToArrNum',
                 complication: 'strToArrNum',
                 vaccinesHistoryHave: 'strToArrNum',
-                currentDiagnosis: 'strToArrNum'
+                currentDiagnosis: 'strToArrNum',
+                auxiliaryExamination: 'strToArrNum'
             })
             this.form = form
             // 下次随访日期

src/doctor/followUp/separateFU/form/components/CoronaryHeartDiseaseForm.vue

@@ -878,7 +878,7 @@ import DocOffice from '@/doctor/components/docOffice/DocOffice.vue'
 import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor.vue'
 import MovementTip from '@/doctor/components/movementTip/MovementTip.vue'
 
-import InspectV2 from '../../components/InspectV2.vue'
+import InspectV2 from '../../components/InspectV3.vue'
 import TreatmentPlan from '../../components/TreatmentPlan.vue'
 import dayjs from 'dayjs'
 export default {
@@ -1323,7 +1323,9 @@ export default {
 
                     const form = fetchDataHandle(this.form, {
                         symptom: 'arrToStr',
-                        currentDiagnosis: 'arrToStr'
+                        currentDiagnosis: 'arrToStr',
+                        // 辅助检查
+                        auxiliaryExamination: 'arrToStr'
                     })
                     // 录入信息（日期、单位、科室、医生）默认当前
                     let createdInfo = {
@@ -1412,7 +1414,8 @@ export default {
         dataProcess(data) {
             const form = fetchDataHandle(data, {
                 symptom: 'strToArrNum',
-                currentDiagnosis: 'strToArrNum'
+                currentDiagnosis: 'strToArrNum',
+                auxiliaryExamination: 'strToArrNum'
             })
             this.form = form
             // 下次随访日期

src/doctor/followUp/separateFU/form/components/DiabetesForm.vue

@@ -1055,7 +1055,7 @@ import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor
 import DocImageUpload from '@/doctor/components/docImageUpload/DocImageUpload.vue'
 import MovementTip from '@/doctor/components/movementTip/MovementTip.vue'
 
-import Inspect from '../../components/Inspect.vue'
+import Inspect from '../../components/InspectV3.vue'
 import TreatmentPlan from '../../components/TreatmentPlan.vue'
 import dayjs from 'dayjs'
 export default {

src/doctor/followUp/separateFU/form/components/DyslipidemiaForm.vue

@@ -877,7 +877,7 @@ import DocOffice from '@/doctor/components/docOffice/DocOffice.vue'
 import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor.vue'
 import MovementTip from '@/doctor/components/movementTip/MovementTip.vue'
 
-import InspectV2 from '../../components/InspectV2.vue'
+import InspectV2 from '../../components/InspectV3.vue'
 import TreatmentPlan from '../../components/TreatmentPlan.vue'
 import dayjs from 'dayjs'
 export default {

src/doctor/followUp/separateFU/form/components/HypertensionForm.vue

@@ -667,6 +667,7 @@
             </template>
         </van-field>
 
+        <!-- 辅助检查 -->
         <Inspect ref="inspectRef" :form="form" :diseaseInfo="diseaseInfo"></Inspect>
 
         <!-- 目前高血压用药及依从性 -->
@@ -940,7 +941,7 @@ import DocOffice from '@/doctor/components/docOffice/DocOffice.vue'
 import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor.vue'
 import MovementTip from '@/doctor/components/movementTip/MovementTip.vue'
 
-import Inspect from '../../components/Inspect.vue'
+import Inspect from '../../components/InspectV3.vue'
 import TreatmentPlan from '../../components/TreatmentPlan.vue'
 import dayjs from 'dayjs'
 

src/doctor/followUp/separateFU/form/components/StrokeForm.vue

@@ -877,7 +877,7 @@ import DocOffice from '@/doctor/components/docOffice/DocOffice.vue'
 import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor.vue'
 import MovementTip from '@/doctor/components/movementTip/MovementTip.vue'
 
-import InspectV2 from '../../components/InspectV2.vue'
+import InspectV2 from '../../components/InspectV3.vue'
 import TreatmentPlan from '../../components/TreatmentPlan.vue'
 import dayjs from 'dayjs'
 export default {
@@ -1321,7 +1321,9 @@ export default {
 
                     const form = fetchDataHandle(this.form, {
                         symptom: 'arrToStr',
-                        currentDiagnosis: 'arrToStr'
+                        currentDiagnosis: 'arrToStr',
+                        // 辅助检查
+                        auxiliaryExamination: 'arrToStr'
                     })
                     // 录入信息（日期、单位、科室、医生）默认当前
                     let createdInfo = {
@@ -1410,7 +1412,8 @@ export default {
         dataProcess(data) {
             const form = fetchDataHandle(data, {
                 symptom: 'strToArrNum',
-                currentDiagnosis: 'strToArrNum'
+                currentDiagnosis: 'strToArrNum',
+                auxiliaryExamination: 'strToArrNum'
             })
             this.form = form
             // 下次随访日期

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

@@ -32,6 +32,12 @@
                             <span class='label'>诊断</span>
                             <span>{{ item.diagnose || '-' }}</span>
                         </div>
+                        <div v-if="item.serveType === 3 || item.serveType === 4">
+                            <span class="label">评估结果</span>
+                            <span v-if="item.evaluationResults === 1" style="color: #D9001B">{{ item.evaluationResultsName }}</span>
+                            <span v-if="item.evaluationResults === 2" style="color: #F59A23">{{ item.evaluationResultsName }}</span>
+                            <span v-if="item.evaluationResults === 3" style="color: #70B603">{{ item.evaluationResultsName }}</span>
+                        </div>
                         <div v-if='item.bloodPressure'>
                             <span class='label'>血压</span>
                             <span>{{ item.bloodPressure || '-' }}</span>
@@ -52,7 +58,8 @@
                         <div class='bt-group'>
                             <van-button round size='small' class='doc-btn-primary' @click.stop='toDetail(item)'>详情
                             </van-button>
-                            <!--                             <van-button round size="small" class="doc-btn-primary" v-if="item.allowUpdate == 1">转诊</van-button>-->
+                            <!-- 评估 -->
+                            <van-button round size='small' class='doc-btn-primary' @click.stop='showEvaluation = true' v-if='!(item.allowUpdate !==1 || item.serveType == 5)'>评估</van-button>
                             <van-button round size='small' class='doc-btn-primary' @click.stop='editBtn(item)'
                                         v-if='!(item.allowUpdate !==1 || item.serveType == 5)'>修改
                             </van-button>
@@ -76,8 +83,10 @@ import { delDiagnose, deleteVisitRecord, getVisitManageList } from '@/api/doctor
 import { useStore } from '@/doctor/store'
 import { showConfirmDialog } from 'vant'
 import { delHighVisit } from '@/api/doctor/highVisitApi'
+import CheckBtn from '@/doctor/components/checkBtn/CheckBtn.vue'
 
 export default {
+    components: { CheckBtn },
     inject: ['residentInfo'],
     props: {
         diseaseType: Number