Merge branch 'chronic-dev' into chronic-master

src/doctor/Doctor.vue

@@ -57,7 +57,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '80fa0d29-73b2-4593-87b8-fc46b53bf49e'
+                    token = '660972fe-8a58-4e69-be0f-ff60366c8ffb'
                 }
             }
             if (token) {

src/doctor/components/dataTime/dataTime.vue

@@ -9,7 +9,7 @@
                     v-model='data.selectedValues'
                     :min-date='data.minDate'
                     :max-date='data.maxDate'
-                    @change='changeTime'
+
         />
     </van-popup>
 </template>
@@ -74,6 +74,10 @@ watch(
     }
 )
 
+watch(()=> data.selectedValues, val => {
+    changeTime()
+})
+
 function getcolumns() {
     let strtime = props.values //传入的时间
     //console.log(strtime); 2023-09-05 19:28:00
@@ -159,7 +163,7 @@ function getcolumns() {
         if (data.minDate && minYear == Y) {
             let minDay = new Date(data.minDate).getDate()
             let allD = Object.keys(Array.apply(null, { length: days + 1 }))
-            allDays = allD.filter(item => item >= minDay)
+            allDays = allD.filter(item => item >=(minDay - 1))
         } else {
             allDays = Object.keys(Array.apply(null, { length: days + 1 }))
         }
@@ -183,7 +187,9 @@ function getcolumns() {
     if (data.showType.includes('hour')) {
         let hour = [] //创建小时数组
         let allHour = []
-        if (data.minDate && minYear == Y) {
+        let minMon = new Date(data.minDate).getMonth()
+        let minDay = new Date(data.minDate).getDate()
+        if (data.minDate && minYear == Y && minMon == M && minDay == D) {
             let minHour = new Date(data.minDate).getHours() ? new Date(data.minDate).getHours(): new Date().getHours()
             let allH = Object.keys(Array.apply(null, { length: 24 }))
             allHour = allH.filter(item => item >= minHour)
@@ -366,10 +372,10 @@ function changeColumns(val) {
         let allDays = []
         if (data.minDate && minYear == Y) {
             let minDay = new Date(data.minDate).getDate()
-            let allD = Object.keys(Array.apply(null, { length: days + 1 }))
-            allDays = allD.filter(item => item >= minDay)
+            let allD = Object.keys(Array.apply(null, { length: days + 1}))
+            allDays = allD.filter(item => item >= (minDay - 1))
         } else {
-            allDays = Object.keys(Array.apply(null, { length: days + 1 }))
+            allDays = Object.keys(Array.apply(null, { length: days + 1}))
         }
         day = allDays.map(function(item) {
             if (+item + 1 <= 10) {
@@ -391,7 +397,9 @@ function changeColumns(val) {
     if (data.showType.includes('hour')) {
         let hour = [] //创建小时数组
         let allHour = []
-        if (data.minDate && minYear == Y) {
+        let minMon = new Date(data.minDate).getMonth()
+        let minDay = new Date(data.minDate).getDate()
+        if (data.minDate && minYear == Y && minMon == M && minDay == D) {
             let minHour = new Date(data.minDate).getHours() ? new Date(data.minDate).getHours(): new Date().getHours()
             let allH = Object.keys(Array.apply(null, { length: 24 }))
             allHour = allH.filter(item => item >= minHour)

src/doctor/followUp/generalFU/detail/Detail.vue

@@ -147,7 +147,7 @@
                                 </div>
                             </div>
                             <div class='card mt-2' v-if='detailInfo?.publicizeType?.includes(3)'>
-                                <Mp4 :files='mp4List' :activeMediaUrl="activeMediaUrl"
+                                <Mp4 :files='mp4List' :activeMediaUrl='activeMediaUrl'
                                      @play='e => activeMediaUrl = e.annexUrl' />
                             </div>
                             <div class='card flex flex-col mt-2' style='row-gap: .06rem;'
@@ -173,9 +173,12 @@
                         <template #right-icon>
                             <doc-icon type='doc-down' />
                         </template>
-                        <div>
+                        <div v-if='info.uploadVisitRecordImageList && info.uploadVisitRecordImageList.length'>
                             <image-preview :img-list='info.uploadVisitRecordImageList'></image-preview>
                         </div>
+                        <div v-else class='w-full' style='text-align: right'>
+                            <span>-</span>
+                        </div>
                     </van-collapse-item>
                     <van-collapse-item key='11' title='现场随访照片' name='11'>
                         <template #right-icon>
@@ -186,9 +189,12 @@
                                                         <img style='width: 1.47rem;height: 2.04rem'  :src="url.trueDownloadUrl" />
                                                     </div>
                                                 </div>-->
-                        <div>
+                        <div v-if='info.sceneVisitImageList && info.sceneVisitImageList.length'>
                             <image-preview :img-list='info.sceneVisitImageList'></image-preview>
                         </div>
+                        <div v-else class='w-full' style='text-align: right'>
+                            <span>-</span>
+                        </div>
                     </van-collapse-item>
                     <van-collapse-item key='12' title='推送渠道' name='12'
                                        v-if='info?.visitWayRules?.includes(2) || info?.visitWayRules?.includes(3) || info?.visitWayRules?.includes(4)'>
@@ -211,7 +217,8 @@
                                 <span class='text-end'>
                                     <div class='flex items-center'>
                                    <span>{{ info?.serviceResidents?.messageStateName || '-' }}</span>
-                                   <span class='ml-4' v-if='info?.serviceResidents?.messageState == 4' style='font-size: 12px'>
+                                   <span class='ml-4' v-if='info?.serviceResidents?.messageState == 4'
+                                         style='font-size: 12px'>
                                    <van-button plain type='primary' size='small' @click='toReSend'>重新发送</van-button>
                                    </span>
                                         </div>
@@ -297,7 +304,7 @@ export default {
             ],
             // 控制音频同一时间只播放一个
             activeMediaUrl: '',
-            hideActiveMediaUrl: '',
+            hideActiveMediaUrl: ''
         }
     },
     computed: {
@@ -385,12 +392,12 @@ export default {
         //数据处理
         dataHandle() {
             const { visitWayRules, publicizeType } = this.info
-                if (publicizeType) {
-                    this.detailInfo.publicizeType = publicizeType.split(',').map(item => Number(item))
-                }
-                if (visitWayRules) {
-                    this.detailInfo.visitWayRules = visitWayRules.split(',').map(item => Number(item))
-                }
+            if (publicizeType) {
+                this.detailInfo.publicizeType = publicizeType.split(',').map(item => Number(item))
+            }
+            if (visitWayRules) {
+                this.detailInfo.visitWayRules = visitWayRules.split(',').map(item => Number(item))
+            }
         },
         //重新发送
         toReSend() {

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

@@ -323,6 +323,10 @@ const defaultForm = (info = {}) => {
         //随访人群
         groupsArrays: undefined,
         groupsArraysName: undefined,
+
+        //慢病标签
+
+
         //随访方式
         visitWay: undefined,
         visitWayName: undefined,
@@ -572,6 +576,7 @@ export default {
                         sendNumber,
                         residentInfoId: this.form.residentInfoId,
                         residentsRecord: {
+                            ...this.info,
                             ...others,
                             groupsArrays: this.info.groupsArrays,
                             id: this.form.personId

src/doctor/followUp/generalFU/form/GeneralFUForm.vue

@@ -312,7 +312,7 @@ export default {
         this.currentTime1 = time.split('-')
         this.startTime = new dayjs().add(1, 'day').format('YYYY-MM-DD HH:mm:ss')
         this.startDateRange.max = new Date(date.year() + 10, date.month(), date.date())
-        this.startDateRange.min = new Date(date.year(), date.month(), date.date())
+        this.startDateRange.min = new Date(date.year(), date.month(), date.date() + 1)
     },
     methods: {
         setForm(data = {}) {