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

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

src/views/followup/record-manage/dialog/change-followup-status.vue

@@ -69,7 +69,7 @@
             changeEnteringStatus({
                fuPlanPatientTimesId: this.statusForm.fuPlanPatientTimesId,
                patientId: this.statusForm.patientId,
-               status: this.statusForm.status,
+               status: (this.statusForm.status == 1 ? 2 : 1),
                reason: this.statusForm.reason,
               }).then(({data}) => {
                 if(data == 2) {