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

 Conflicts:
	src/doctor/Doctor.vue

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

@@ -11,12 +11,29 @@
             class="form-input"
         />
         <van-popup v-model:show="showDiseaseType" position="bottom">
-            <van-picker
+            <!-- <van-picker
                 :columns-field-names="{ text: 'name', value: 'value' }"
                 :columns="store.getDict('CP00117')"
                 @confirm="diseaseConfirm"
                 @cancel="showDiseaseType = false"
+            /> -->
+            <div class="p-4" style="height: 100%">
+                <div class="flex justify-between items-center mb-4 pop-title">
+                    <div class="greyColor" @click="showDiseaseType = false">取消</div>
+                    <div>专病名称（单选）</div>
+                    <div></div>
+                </div>
+                <div style="height: 80%; overflow: auto">
+                    <CheckBtn
+                        clearable
+                        column-1
+                        :options="store.getDict('CP00117')"
+                        v-model:value="form.diseaseType"
+                        :fieldNames="{ text: 'name', value: 'value' }"
+                        @change="diseaseTypeChange"
                     />
+                </div>
+            </div>
         </van-popup>
 
         <div class="label-title mt-5" required>请选择</div>
@@ -29,7 +46,7 @@
                     class="doc-radio-group"
                 >
                     <van-radio :name="3" label-position="left">新增专病随访（常规）</van-radio>
-                    <van-radio :name="4" label-position="left" class="mt-2">新增专病随访（增加）</van-radio>
+                    <van-radio :name="4" label-position="left">新增专病随访（增加）</van-radio>
                 </van-radio-group>
             </template>
         </van-field>
@@ -53,24 +70,45 @@
                 @cancel="showDiseaseType = false"
             />
         </van-popup> -->
-        <ArchiveCommon ref="archive"></ArchiveCommon>
+        <ArchiveCommon ref="archive" :info="info"></ArchiveCommon>
     </van-form>
 </template>
 <script>
 import { useStore } from '@/doctor/store'
 import ArchiveCommon from '@/doctor/components/archiveCommon/archiveCommon.vue'
+import { getChronicResidentsId } from '@/api/doctor/generalFU'
+import CheckBtn from '@/doctor/components/checkBtn/CheckBtn.vue'
 export default {
-    components: { ArchiveCommon },
+    components: { ArchiveCommon, CheckBtn },
     data() {
         return {
             store: useStore(),
             form: {},
             rules: {},
             showDiseaseType: false,
-            showCertificateType: false
+            showCertificateType: false,
+            info: {}
         }     
     },
+    computed: {
+        residentInfoId() {
+            return this.$route.query.residentInfoId
+        },
+        diseaseType() {
+            return this.$route.query.diseaseType
+        }
+    },
+    created() {
+        this.init()
+    },
     methods: {
+        async init() {
+            const res = await getChronicResidentsId(this.residentInfoId)
+            this.info = res.data || {}
+        },
+        diseaseTypeChange() {
+
+        },
         diseaseConfirm({ selectedValues, selectedOptions }) {
             this.form.diseaseType = selectedValues[0]
             this.form.diseaseTypeName = selectedOptions[0].name
@@ -115,4 +153,11 @@ export default {
 :deep(.van-cell:after) {
     border-bottom: 0px;
 }
+:deep(.van-popup) {
+    height: 50% !important;
+}
+.greyColor {
+    color: var(--van-text-color-2);
+    font-weight: 400;
+}
 </style>
\ No newline at end of file

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

@@ -25,7 +25,7 @@ export default {
     components: { BaseInfo, FormCont },
     data() {
         return {
-            step: 2
+            step: 1
         }
     },
     computed: {
@@ -38,7 +38,11 @@ export default {
     },
     methods: {
         toBack() {
+            if (this.step === 1) {
                 this.$router.back()
+            } else {
+                this.step = 1
+            }
         },
         async toNext() {
             // this.$refs.baseInfo.onSubmit()

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

@@ -386,7 +386,7 @@
                 placeholder="0~3000，整数"
                 :rules="rules.drinkLiquor"
                 class="card-input"
-                label-width="32px"
+                label-width="36px"
                 label-class="label-mr"
             >
                 <template #extra>
@@ -399,7 +399,7 @@
                 placeholder="0~3000，整数"
                 :rules="rules.drinkBeer"
                 class="card-input mt-2"
-                label-width="32px"
+                label-width="36px"
                 label-class="label-mr"
             >
                 <template #extra>
@@ -412,7 +412,7 @@
                 placeholder="0~3000，整数"
                 :rules="rules.drinkRed"
                 class="card-input mt-2"
-                label-width="32px"
+                label-width="36px"
                 label-class="label-mr"
             >
                 <template #extra>
@@ -425,7 +425,7 @@
                 placeholder="0~3000，整数"
                 :rules="rules.drinkYellow"
                 class="card-input mt-2"
-                label-width="32px"
+                label-width="36px"
                 label-class="label-mr"
             >
                 <template #extra>
@@ -438,7 +438,7 @@
                 placeholder="0~3000，整数"
                 :rules="rules.drinkOther"
                 class="card-input mt-2"
-                label-width="32px"
+                label-width="36px"
                 label-class="label-mr"
             >
                 <template #extra>
@@ -906,6 +906,76 @@
                 @cancel="showNextVisitDate = false"
             />
         </van-popup>
+        <!-- 随访日期 -->
+        <div class="label-title mt-2">随访日期</div>
+        <van-field
+            v-model="form.visitDate"
+            isLink
+            readonly
+            placeholder="请选择"
+            :rules="rules.visitDate"
+            @click="showVisitDate = true"
+            class="form-input"
+        />
+        <van-popup v-model:show="showVisitDate" position="bottom">
+            <van-date-picker
+                v-model="form._visitDate" 
+                :min-date="visitDateRange.min"
+                :max-date="visitDateRange.max"
+                @confirm="visitDateConfirm"
+                @cancel="showVisitDate = false"
+            />
+        </van-popup>
+        <!-- 随访单位 -->
+        <div class="label-title mt-2">随访单位</div>
+        <van-field
+            v-model="form.visitUnitName"
+            is-link
+            readonly
+            placeholder="请选择"
+            @click="showVisitUnit = true"
+            class="form-input mt-2"
+        />
+        <DocUnit
+            v-model:show="showVisitUnit"
+            v-model:value="form.visitUnitId"
+            :valueName="form?.visitUnitName"
+            @change="visitUnitChange"
+        />
+        <!-- 随访科室 -->
+        <div class="label-title mt-2">随访科室</div>
+        <van-field
+            v-model="form.visitOfficeName"
+            is-link
+            readonly
+            placeholder="请选择"
+            @click="showVisitOffice = true"
+            class="form-input mt-2"
+        />
+        <DocOffice
+            v-model:show="showVisitOffice"
+            v-model:value="form.visitOfficeId"
+            :unitId="form.visitUnitId"
+            @change="visitOfficeChange"
+        />
+        <!-- 随访医生 -->
+        <div class="label-title mt-2">随访医生</div>
+        <van-field
+            v-model="form.visitDoctorName"
+            is-link
+            readonly
+            placeholder="请选择"
+            @click="showVisitDoctor = true"
+            class="form-input mt-2"
+        />
+        <DocOfficeDoctor
+            v-model:show="showVisitDoctor"
+            :allowClear="false"
+            v-model:value="form.visitDoctorId"
+            :unitId="form.visitUnitId"
+            :officeId="form.visitOfficeId"
+            @change="(option) => { form.visitDoctorName = option.staffName }"
+        />
     </van-form>
 </template>
 <script>
@@ -917,8 +987,9 @@ import BloodPressureBt from '@/doctor/components/bloodPressure/BloodPressureBt.v
 import DocImageUpload from '@/doctor/components/docImageUpload/DocImageUpload.vue'
 import DocUnit from '@/doctor/components/docUnit/DocUnit.vue'
 import DocOffice from '@/doctor/components/docOffice/DocOffice.vue'
+import DocOfficeDoctor from '@/doctor/components/docOfficeDoctor/DocOfficeDoctor.vue'
 export default {
-    components: { CheckBtn, BloodPressurePanel, BloodPressureBt, DocImageUpload, DocUnit, DocOffice },
+    components: { CheckBtn, BloodPressurePanel, BloodPressureBt, DocImageUpload, DocUnit, DocOffice, DocOfficeDoctor },
     inject: ['pressureObj'],
     data() {
         return {
@@ -1256,7 +1327,15 @@ export default {
             nextVisitDateRange: {
                 min: undefined,
                 max: undefined
-            }
+            },
+            showVisitDate: false,
+            visitDateRange: {
+                min: undefined,
+                max: undefined
+            },
+            showVisitUnit: false,
+            showVisitOffice: false,
+            showVisitDoctor: false
         }
     },
     methods: {
@@ -1326,6 +1405,16 @@ export default {
             this.form.nextVisitDate = selectedValues.join('-')
             this.showNextVisitDate = false
         },
+        visitDateConfirm({ selectedValues }) {
+            this.form.visitDate = selectedValues.join('-')
+            this.showVisitDate = false
+        },
+        visitUnitChange(option = {}) {
+            this.form.visitUnitName = option.unitName
+        },
+        visitOfficeChange(option = {}) {
+            this.form.visitOfficeName = option.officeName
+        },
 
         submit() {
             this.$refs.form.validate().then(() => {

src/doctor/patientDetail/PatientDetail.vue

@@ -217,6 +217,9 @@ export default {
                 // 诊断
                 query.excludeType = this.diagnoseList.map(e => e.value).join(',')
             }
+            if (val === 7) {
+                query.diseaseType = this.activeTab
+            }
             this.$router.push({
                 path: option.path,
                 query