更新数据

src/api/patient/patient.js

@@ -432,3 +432,11 @@ export function getDialysisRecord(id, limit, page, startime, endtime, dislysType
     params: params
   })
 }
+
+export function GetDoctorAdviceDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getdoctoradvicedetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -23,60 +23,106 @@
       </div>
 
       <div class="adviceBox" v-show="showOne">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
-          <div class="adviceOne" v-for="(item, index) in doctorAdvice" :key="index">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in doctorAdvice"
+            :key="index"
+          >
             <div v-for="(it, i) in item.child" :key="i">
               <div class="adviceTitle" v-if="it.advice_date">
                 <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>
-                <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+                <van-icon
+                  class="ellipsis"
+                  name="ellipsis"
+                  @click="newShow = true"
+                />
               </div>
 
-              <div class="statOrder" v-if="it.advice_type == 1 && it.parent_id == 0">
+              <div
+                class="statOrder"
+                v-if="it.advice_type == 1 && it.parent_id == 0"
+              >
                 <div class="statOrderTitle">
                   <span>长期医嘱</span>
                   <span style="margin-left:1rem">
-                    {{
-                    getTimes(it.created_time)
-                    }}
+                    {{ getTimes(it.start_time) }}
                   </span>
                 </div>
                 <div class="orderContent">
                   <p v-if="it.parent_id === 0">
-                    {{ it.advice_name }} 单次用量 {{ it.advice_desc
-                    }}{{ it.drug_spec_unit }} 静脉注射
+                    {{ it.advice_name }} {{ it.advice_desc
+                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number
+                    }}{{ it.prescribing_number_unit }} {{ it.single_dose
+                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}
+                    {{ it.execution_frequency }}
                   </p>
-                  <div v-for="(i,index) in childList" :key="index">
-                    <p v-if="i.parent_id == it.id">▲ {{ i.advice_name }} 单次用量 1g</p>
+                  <div v-for="(i, index) in childList" :key="index">
+                    <p v-if="i.parent_id == it.id">
+                      ▲ {{ i.advice_name }} {{ i.advice_desc
+                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number
+                      }}{{ i.prescribing_number_unit }} {{ i.single_dose
+                      }}{{ i.single_dose_unit }}
+                      {{ i.delivery_way }}
+                      {{ i.execution_frequency }}
+                    </p>
                   </div>
                 </div>
                 <div class="doctorBox">
                   <p>开嘱医生：{{ it.user_name }}</p>
-                  <p>执行护士：欧巧漫</p>
-                  <p>核对护士：钱多多</p>
+                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
+                  <p>核对护士：{{ getDoctor(it.checker) }}</p>
                 </div>
               </div>
 
-              <div class="statOrder" v-if="it.advice_type == 3">
+              <div
+                class="statOrder"
+                v-if="it.advice_type == 3 && it.parent_id == 0"
+              >
                 <div class="longOrderTitle">
                   <span>临时医嘱</span>
                   <span style="margin-left:1rem">
-                    {{
-                    getTimes(item.child[0].created_time)
-                    }}
+                    {{ getTimes(item.child[0].start_time) }}
                   </span>
                 </div>
                 <div class="orderContent">
-                  <p>那曲肝素钙注射液 单次用量 3075iu 静脉注射</p>
-                  <p>▲ 左卡尼汀注射液 单次用量 1g</p>
+                  <p>
+                    {{ it.advice_name }} {{ it.advice_desc
+                    }}{{ it.drug_spec_unit }} {{ it.prescribing_number
+                    }}{{ it.prescribing_number_unit }} {{ it.single_dose
+                    }}{{ it.single_dose_unit }} {{ it.delivery_way }}
+                    {{ it.execution_frequency }}
+                  </p>
+
+                  <div v-for="(i, index) in childList" :key="index">
+                    <p v-if="i.parent_id == it.id">
+                      ▲ {{ i.advice_name }} {{ i.advice_desc
+                      }}{{ i.drug_spec_unit }} {{ i.prescribing_number
+                      }}{{ i.prescribing_number_unit }} {{ i.single_dose
+                      }}{{ i.single_dose_unit }}
+                      {{ i.delivery_way }}
+                      {{ i.execution_frequency }}
+                    </p>
+                  </div>
                 </div>
                 <div class="doctorBox">
-                  <p>开嘱医生：效益</p>
-                  <p>执行护士：欧巧漫</p>
-                  <p>核对护士：钱多多</p>
+                  <p>开嘱医生：{{ it.user_name }}</p>
+                  <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
+                  <p>核对护士：{{ getDoctor(it.checker) }}</p>
                 </div>
               </div>
             </div>
-            <div class="all">全部</div>
+            <div
+              class="all"
+              @click="toDoctorAdviceDetail(item.child[0].groupno)"
+            >
+              全部
+            </div>
           </div>
         </van-list>
       </div>
@@ -93,11 +139,24 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
 
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -117,7 +176,12 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
@@ -127,10 +191,12 @@ import { getDoctorAdvices, getPatientDetail } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 const moment = require("moment");
 export default {
+  props: {
+    active: Number
+  },
   data() {
     return {
       loading: false,
-      onLoad: false,
       finished: false,
       newShow: false,
       typeShow: false,
@@ -158,7 +224,9 @@ export default {
       showOne: true,
       showTwo: false,
       doctorAdvice: [],
-      childList: []
+      childList: [],
+      patient_id: "",
+      doctor: []
     };
   },
   methods: {
@@ -224,7 +292,6 @@ export default {
         if (response.data.state === 1) {
           var advice = response.data.data.advice;
           // this.doctorAdvice = advice;
-          console.log("医嘱", advice);
           let objarr = [];
           for (let i = 0; i < advice.length; i++) {
             if (advice[i].parent_id != 0) {
@@ -232,9 +299,8 @@ export default {
             }
           }
           this.childList = objarr;
-          console.log("objaa", objarr);
           var total = response.data.data.total;
-          // console.log("总计", total);
+          this.total = total;
           let dataInfo = {};
           advice.forEach((item, index) => {
             let { groupno } = item;
@@ -248,7 +314,6 @@ export default {
           });
           // console.log(dataInfo);
           let list = Object.values(dataInfo); // list 转换成功的数据
-          // console.log(list);
           let arr = [];
           list.map(item => {
             // console.log(item.child);
@@ -263,8 +328,13 @@ export default {
               });
             }
           });
+
+          var doctor = response.data.data.doctor;
+          this.doctor = doctor;
+          console.log("医生", doctor);
           console.log("list", list);
           this.doctorAdvice = list;
+          this.loading = false;
         }
       });
     },
@@ -290,12 +360,49 @@ export default {
     },
     getTimes(time) {
       return uParseTime(time, "{h}:{i}");
+    },
+    onLoad() {
+      setTimeout(() => {
+        this.page++;
+        if (this.page <= Math.ceil(this.total / 10)) {
+          this.getDoctorAdvices(
+            this.patient_id,
+            this.form.type,
+            this.startTime,
+            this.endTimes,
+            this.form.limit,
+            this.form.page
+          );
+        } else {
+          this.loading = false;
+          this.finished = true;
+        }
+      }, 1000);
+    },
+    toDoctorAdviceDetail(id) {
+      var patientid = this.$route.query.patientid;
+      this.$router.push(
+        "/alldoctoradvice?id=" +
+          id +
+          "&patientid=" +
+          patientid +
+          "&active=" +
+          this.active
+      );
+    },
+    getDoctor(id) {
+      for (let i = 0; i < this.doctor.length; i++) {
+        if ((this.doctor[i].admin_user_id = id)) {
+          return this.doctor[i].name;
+        }
+      }
     }
   },
   created() {
     var patientid = this.$route.query.patientid;
     this.getDoctorAdvices(patientid);
     this.getPatientDetail(patientid);
+    this.patient_id = patientid;
   },
   watch: {
     $route(to, from) {

src/pages/doctorAdvice/index.vue

@@ -15,13 +15,16 @@
         </div>
       </van-sticky>
       <van-tab title="医嘱">
-        <doctor-management :dryId="patient_id"></doctor-management>
+        <doctor-management
+          :dryId="patient_id"
+          :active="active"
+        ></doctor-management>
       </van-tab>
       <van-tab title="长期透析处方">
-        <long-dialysis></long-dialysis>
+        <long-dialysis :active="active"></long-dialysis>
       </van-tab>
       <van-tab title="透析记录">
-        <dialysis-record></dialysis-record>
+        <dialysis-record :active="active"></dialysis-record>
       </van-tab>
       <van-tab title="干体重">
         <dry-weight :active="active" :dryId="patient_id"></dry-weight>
@@ -71,7 +74,10 @@
       </van-tab>-->
     </van-tabs>
     <van-popup v-model="show" position="top" :style="{ height: '100%' }">
-      <div style="padding:10px;font-size:1.25rem;text-align:right" @click="show = false">
+      <div
+        style="padding:10px;font-size:1.25rem;text-align:right"
+        @click="show = false"
+      >
         <van-icon name="cross" />
       </div>
       <van-search
@@ -98,7 +104,10 @@
     </van-popup>
 
     <van-popup v-model="show1" position="top" :style="{ height: '40%' }">
-      <div style="padding:10px;font-size:1.25rem;text-align:right" @click="show1 = false">
+      <div
+        style="padding:10px;font-size:1.25rem;text-align:right"
+        @click="show1 = false"
+      >
         <van-icon name="cross" />
       </div>
       <div class="titleBox">
@@ -107,7 +116,9 @@
           v-for="(item, index) in title"
           :key="index"
           @click="changeActive(index)"
-        >{{ item }}</div>
+        >
+          {{ item }}
+        </div>
       </div>
     </van-popup>
   </div>

src/router/index.js

@@ -131,6 +131,12 @@ export default new Router({
       name: 'longdialysis',
       component: () => import('@/pages/allLongDialysis/index')
     },
+    //, 
+    {
+      path: '/alldoctoradvice',
+      name: '/alldoctoradvice',
+      component: () => import('@/pages/allDoctorAdvice/index')
+    },
     {
       path: '/product',
       name: 'Product',