医嘱管理

src/pages/allDoctorAdvice/index.vue

@@ -7,22 +7,18 @@
       </div>
     </van-sticky>
     <div class="orderBox">
-      <div
-        class="orderBoxOne"
-        v-for="(item, index) in doctorAdvicedetail"
-        :key="index"
-      >
+      <div class="orderBoxOne" v-for="(item, index) in doctorAdvicedetail" :key="index">
         <div v-for="(it, i) in item.child" :key="i">
-          <p class="time">
-            {{ it.advice_date ? getTime(it.advice_date) : "" }}
-          </p>
+          <p class="time">{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>
           <div class="statOrder">
             <div v-if="it.advice_type == 1 && it.parent_id == 0">
               <div class="statOrderTitle">
                 <span>长期医嘱</span>
-                <span style="margin-left:1rem">{{
+                <span style="margin-left:1rem">
+                  {{
                   getTimes(it.start_time)
-                }}</span>
+                  }}
+                </span>
               </div>
               <div class="orderContent">
                 <p v-if="it.parent_id === 0">
@@ -43,22 +39,21 @@
                   </p>
                 </div>
               </div>
-              <div class="doctorBox">
+              <div class="doctorBox" v-if="it.advice_doctor || it.execution_staff || it.checker">
                 <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
                 <p>执行护士：{{ getDoctor(item.execution_staff) }}</p>
                 <p>核对护士：{{ getDoctor(item.checker) }}</p>
               </div>
             </div>
 
-            <div
-              class="statOrder"
-              v-if="it.advice_type == 3 && it.parent_id == 0"
-            >
+            <div class="statOrder" v-if="it.advice_type == 3 && it.parent_id == 0">
               <div class="longOrderTitle">
                 <span>临时医嘱</span>
-                <span style="margin-left:1rem">{{
+                <span style="margin-left:1rem">
+                  {{
                   getTimes(item.child[0].start_time)
-                }}</span>
+                  }}
+                </span>
               </div>
               <div class="orderContent">
                 <p>
@@ -80,7 +75,7 @@
                   </p>
                 </div>
               </div>
-              <div class="doctorBox">
+              <div class="doctorBox" v-if="it.advice_doctor || it.execution_staff || it.checker">
                 <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
                 <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
                 <p>核对护士：{{ getDoctor(it.checker) }}</p>
@@ -140,7 +135,9 @@ export default {
           });
           let list = Object.values(dataInfo); // list 转换成功的数据
           let arr = [];
+
           list.map(item => {
+            let arr2 = [];
             if (item.child.length > 1) {
               item.child.map(it => {
                 if (arr.indexOf(it.advice_date) == -1) {
@@ -149,8 +146,26 @@ export default {
                   delete it["advice_date"];
                 }
               });
+              for (var i = item.child.length - 1; i != -1; i--) {
+                let obj = {};
+                obj.checker = item.child[i].checker;
+                obj.execution_staff = item.child[i].execution_staff;
+                obj.user_name = item.child[i].advice_doctor;
+                if (
+                  JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
+                ) {
+                  console.log("ajsdkljasldkasjdlkasjs");
+                  arr2.push(obj);
+                } else {
+                  console.log("删除");
+                  delete item.child[i]["checker"];
+                  delete item.child[i]["execution_staff"];
+                  delete item.child[i]["advice_doctor"];
+                }
+              }
             }
           });
+
           console.log("list是 ", list);
           this.doctorAdvicedetail = list;
         }

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -25,7 +25,7 @@
       <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">
-            <div v-for="(it, i) in item.child.slice(0, 3)" :key="i">
+            <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
@@ -36,7 +36,7 @@
               </div>
 
               <div class="statOrder" v-if="it.advice_type == 1 && it.parent_id == 0">
-                <div class="statOrderTitle">
+                <div class="statOrderTitle" v-if="i < 3">
                   <span>长期医嘱</span>
                   <span style="margin-left:1rem">
                     {{
@@ -44,7 +44,7 @@
                     }}
                   </span>
                 </div>
-                <div class="orderContent">
+                <div class="orderContent" v-if="i < 3">
                   <p v-if="it.parent_id === 0">
                     {{ it.advice_name }} {{ it.advice_desc
                     }}{{ it.drug_spec_unit }} {{ it.prescribing_number
@@ -63,7 +63,10 @@
                     </p>
                   </div>
                 </div>
-                <div class="doctorBox">
+                <div
+                  class="doctorBox"
+                  v-if="it.user_name || it.execution_staff || it.checker && i == item.child.length"
+                >
                   <p>开嘱医生：{{ it.user_name }}</p>
                   <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
                   <p>核对护士：{{ getDoctor(it.checker) }}</p>
@@ -71,7 +74,7 @@
               </div>
 
               <div class="statOrder" v-if="it.advice_type == 3 && it.parent_id == 0">
-                <div class="longOrderTitle">
+                <div class="longOrderTitle" v-if="i < 3">
                   <span>临时医嘱</span>
                   <span style="margin-left:1rem">
                     {{
@@ -79,7 +82,7 @@
                     }}
                   </span>
                 </div>
-                <div class="orderContent">
+                <div class="orderContent" v-if="i < 3">
                   <p>
                     {{ it.advice_name }} {{ it.advice_desc
                     }}{{ it.drug_spec_unit }} {{ it.prescribing_number
@@ -99,7 +102,10 @@
                     </p>
                   </div>
                 </div>
-                <div class="doctorBox">
+                <div
+                  class="doctorBox"
+                  v-if="it.user_name || it.execution_staff || it.checker && i == item.child.length"
+                >
                   <p>开嘱医生：{{ it.user_name }}</p>
                   <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
                   <p>核对护士：{{ getDoctor(it.checker) }}</p>
@@ -316,10 +322,12 @@ export default {
           });
           let list = Object.values(dataInfo); // list 转换成功的数据
           let arr = [];
+
           list.map(item => {
             // console.log(item.child);
+            let arr2 = [];
             if (item.child.length > 1) {
-              item.child.map(it => {
+              item.child.map((it, index) => {
                 // console.log(it);
                 if (arr.indexOf(it.advice_date) == -1) {
                   arr.push(it.advice_date);
@@ -327,8 +335,24 @@ export default {
                   delete it["advice_date"];
                 }
               });
+              for (var i = item.child.length - 1; i != -1; i--) {
+                let obj = {};
+                obj.checker = item.child[i].checker;
+                obj.execution_staff = item.child[i].execution_staff;
+                obj.user_name = item.child[i].user_name;
+                if (
+                  JSON.stringify(arr2).includes(JSON.stringify(obj)) == false
+                ) {
+                  arr2.push(obj);
+                } else {
+                  delete item.child[i]["checker"];
+                  delete item.child[i]["execution_staff"];
+                  delete item.child[i]["user_name"];
+                }
+              }
             }
           });
+
           var doctor = response.data.data.doctor;
           this.doctor = doctor;
           console.log("医生", doctor);