医生端小程序 v1.2 1、复筛表单

src/api/doctor/screening.js

@@ -15,6 +15,16 @@ export function getLastScreen(params) {
     return fetchBase({ url: `/chronic-admin/v1/chronic-screening-rescreen/last-info`, body: params, loading: true})
 }
 
+// 保存复筛
+export function saveSecondScreening(params) {
+    return fetchBase({ url: `/chronic-admin/v1/chronic-screening-rescreen/save`,body: params,loading: true})
+}
+
+// 修改复筛
+export function updateSecondScreening(params) {
+    return fetchBase({ url: `/chronic-admin/v1/chronic-screening-rescreen/update`,body: params,loading: true})
+}
+
 // 保存初筛
 export function saveFirstScreening(params) {
     return fetchBase({ url: `/chronic-admin/v1/chronic-screening-record/save`,body: params,loading: true})

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '779099b2-3d34-41ef-b14a-4a435fb48adb'
+                    token = 'f0c1b081-b6d8-4958-a40f-0750cc272271'
                 }
             }
             if (token) {

src/doctor/screening/second/BaseInfo.vue

@@ -141,7 +141,7 @@ export default {
                 this.$refs.form.validate().then(() => {
                     let par = {
                         residentsRecord: {
-                            ...this.info,
+                            // ...this.info,
                             ...baseInfo,
                             id: this.info.personId
                         },

src/doctor/screening/second/Result.vue

@@ -4,12 +4,9 @@
         <div class="mt-3">筛查完成</div>
         <div class="text-start mt-5">
             <span style="color: #595959;">通过筛查，您的慢病高危评估结果为：</span>
-            <span class="text-red">高危人群</span>
+            <div class="text-red mt-2" style='line-height: 24px'>{{specialScreenResultList.join("、")}}</div>
         </div>
         <div style="margin-top: .48rem">
-            <van-button type='primary' block round plain
-                @click='toScreen'>专病高危筛查</van-button>
-            <div class="pt-3"></div>
             <van-button type='primary' block round plain
                 @click='toDetail'>查看居民详情</van-button>
             <div class="text-16 pt-5" style="color: #8c8c8c;"
@@ -21,7 +18,8 @@
 <script>
 export default {
     props: {
-        residentInfoId: String
+        residentInfoId: String,
+        specialScreenResultList: Array,
     },
     methods: {
         toScreen() {

src/doctor/screening/second/SecondForm.vue

@@ -12,7 +12,12 @@
                        v-show='step == 2'
                        ref='formInfo'
             ></form-cont>
+            <common-bottom
+                v-if='step == 3'
+                ref='commonBottom'
+            ></common-bottom>
             <result :residentInfoId='residentInfoId'
+                    :specialScreenResultList='specialScreenResultList'
                     v-show='step == 4'
             ></result>
         </div>
@@ -44,17 +49,20 @@
 <script>
 import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
 import ArchiveCommon from '@/doctor/components/archiveCommon/archiveCommon'
-import { fetchCurrencyById, getChronicResidentsId } from '@/api/doctor/generalFU'
+import { getChronicResidentsId } from '@/api/doctor/generalFU'
 import FormCont from '@/doctor/screening/second/FormCont'
 import Result from '@/doctor/screening/second/Result'
 import DiseaseSelect from '@/doctor/screening/second/DiseaseSelect'
 import BaseInfo from '@/doctor/screening/second/BaseInfo'
 import { fetchDataHandle } from '@/utils/common'
-import { getLastScreen, secondScreenDetail } from '@/api/doctor/screening'
+import { getLastScreen, saveSecondScreening, secondScreenDetail, updateSecondScreening } from '@/api/doctor/screening'
 import { showToast } from 'vant'
+import CommonBottom from '@/doctor/screening/second/CommonBottom'
+import { useStore } from '@/doctor/store'
 
 export default {
     components: {
+        CommonBottom,
         BaseInfo,
         DiseaseSelect,
         Result,
@@ -64,10 +72,12 @@ export default {
     },
     data() {
         return {
+            store: useStore(),
             step: 1,
             info: {},
             residentInfo: {},
-            diseaseArraysInfo: []
+            diseaseArraysInfo: [],
+            specialScreenResultList: [],
         }
     },
     computed: {
@@ -179,7 +189,37 @@ export default {
             this.step = val
         },
         //提交所有表单
-        onsubmit() {
+        async onsubmit() {
+            let baseInfo = await this.$refs.baseInfo.onSubmit()
+            let formInfo = await this.$refs.formInfo.onSubmit()
+            let commonBottom = await this.$refs.commonBottom.onSubmit()
+            let params = {
+                ...formInfo,
+                ...commonBottom,
+                ...baseInfo,
+                diseaseArrays: baseInfo.diseaseArrays ? baseInfo.diseaseArrays.join() : '',
+                source: 2
+            }
+            if (formInfo.specialScreenResult) {
+                let list = formInfo.specialScreenResult.split(",")
+                list.forEach(item => {
+                    let res = this.store.getDict(`CP00137`).filter(e => e.value == item)
+                    if (res && res.length) {
+                        this.specialScreenResultList.push(res[0].name)
+                    }
+                })
+            }
+            if (!params.id) {
+                saveSecondScreening(params).then(res => {
+                    this.$message.success('新增成功')
+                    this.toNext(4)
+                })
+            } else {
+                updateSecondScreening(params).then(res => {
+                    this.$message.success('修改成功')
+                    this.toNext(4)
+                })
+            }
 
         },
         onBack() {

vue.config.js

@@ -31,7 +31,7 @@ module.exports = defineConfig({
             },
             '/chronic-admin': {
                 target: 'https://beta-tumour.zmnyjk.com',
-                // target: 'http://192.168.1.163:8900',
+                // target: 'http://192.168.1.125:8900',
                 changOrigin: true,
                 pathRewrite: {
                     // '^/chronic-admin': '/'