Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/store/followup/planManage.js

@@ -50,8 +50,9 @@ export default {
       state.groupList = payload.labelDtoList
     },
     GET_RESIDENT_DETAIL(state, payload) {
+      console.log('居民信息', payload)
       state.residentDetail = payload
-      state.timeNodeList = payload.fPlanPatientDatilDtoList.timeNodeList
+      state.timeNodeList = payload.fPlanDto.fPlanTimeReqList
     },
     GET_PLAN_DETAIL(state, payload) {
       state.planDetail = payload
@@ -120,9 +121,10 @@ export default {
       });
     },
     getResidentDetail(context, payload) {
-      getResidentDetail({
-        ...payload
-      }).then(({data}) => {
+      getResidentDetail(
+        payload.planId,
+        payload.patientId
+      ).then(({data}) => {
         context.commit('GET_RESIDENT_DETAIL', data);
       });
     },

src/utils/followup/followapis.js

@@ -100,21 +100,20 @@ export const getGroupList = (params) => {
     description: '获取分组列表',
   })
 };
-export const getResidentDetail = (params) => {
+export const getResidentDetail = (planId,patientId) => {
   return fetch({
     headers,
-    url: getFollowUpSC(`/followup/planPatient/detail`),
+    url: getFollowUpSC(`/followup/planPatient/${planId}/detail/${patientId}`),
     method: 'get',
-    params: params,
     description: '获取居民详情',
   })
 };
-export const changePlan = (params) => {
+export const changePlan = (data) => {
   return fetch({
     headers,
     url: getFollowUpSC(`/followup/planPatient/change`),
     method: 'put',
-    params: params,
+    data: data,
     description: '变更计划',
   })
 };

src/views/followup/plan-manage/resident-detail.vue

@@ -14,51 +14,51 @@
           <el-button class="button-white" plain size="small" @click="finishFollowup">结束随访</el-button>
         </div>
       </div>
-      <div class="base-info" v-if="residentDetail.fPlanPatientDatilDtoList">
+      <div class="base-info">
         <div class="resident-info base-content">
           <div class="content-div">
             <div class="c-title">姓名：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.nickName}}</div>
+            <div class="c-content">{{residentDetail.patientName}}</div>
           </div>
           <div class="content-div ">
             <div class="c-title">性别：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.sexName}}</div>
+            <div class="c-content">{{residentDetail.sexName}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">年龄：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.sexName}}</div>
+            <div class="c-content">{{residentDetail.age}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">身份证号：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.cardNo}}</div>
+            <div class="c-content">{{residentDetail.idNo}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">联系方式：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.mobile}}</div>
+            <div class="c-content">{{residentDetail.mobilePhone}}</div>
           </div>
         </div>
         <div class="group-info base-content">
           <div class="content-div">
             <div class="c-title">分组：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.labelName}}</div>
+            <div class="c-content">{{residentDetail.labelName}}</div>
           </div>
         </div>
         <div class="followup-info base-content">
           <div class="content-div">
             <div class="c-title">随访模板：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.planTemplate}}</div>
+            <div class="c-content">{{planDetails.resourceName}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">随访开始时间：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.time}}</div>
+            <div class="c-content">{{planDetails.timeStr}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">备注：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.remark}}</div>
+            <div class="c-content">{{planDetails.remarksStatusStr}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">随访状态：</div>
-            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.statusName}}</div>
+            <div class="c-content">{{planDetails.statusName}}</div>
           </div>
         </div>
       </div>
@@ -66,7 +66,7 @@
         <p class="title">随访时间节点</p>
         <div class="node-div">
           <el-radio-group v-model="timeNodes" size="small">
-            <el-radio-button :key="item.nodeId" v-for="item in timeNodeList" :label="item.nodeId">{{item.timeNodeContent}}</el-radio-button>
+            <el-radio-button :key="item.id" v-for="item in timeNodeList" :label="item.id">{{item.timeStr}}</el-radio-button>
           </el-radio-group>
         </div>
         <div class="followup-contents">
@@ -129,6 +129,7 @@
         showFinishFollowup: false, //是否展示结束随访,
         planChangeData: {}, //变更信息
         finishData: {}, //结束信息
+        planDetails: {}, //计划详情
       }
     },
     created() {
@@ -155,7 +156,7 @@
       ...mapActions('planManage', ['getResidentDetail', 'getNodeTimeContent', 'getGroupList']),
       changePlan() {
         this.planChangeData = {
-          group: this.residentDetail.fPlanPatientDatilDtoList.labelIds,
+          group: this.residentDetail.labelName,
           planId: this.residentDetail.fPlanPatientDatilDtoList.planId,
           startTime:  this.residentDetail.fPlanPatientDatilDtoList.time
         }
@@ -177,10 +178,13 @@
     watch: {
       timeNodeList(val) {
         console.log('val1',val)
-        this.timeNodes = val[0].nodeId
+        this.timeNodes = val[0].id
       },
       timeNodes(val) {
         this.getNodeTimeContent(val)
+      },
+      residentDetail(val) {
+        this.planDetails = val.fPlanDto
       }
     }
   }