更新数据

src/App.vue

@@ -32,10 +32,7 @@ export default {
       document.documentElement.scrollTop = 0;
     }
   },
-  created() {
-
-    console.log("111111");
-  }
+  created() {}
 };
 </script>
 

src/api/patient/patient.js

@@ -450,10 +450,40 @@ export function DeleteManagement(id, params) {
 }
 
 export function updatedPatient(data) {
-  console.log('data是什么', data)
   return request({
     url: '/m/api/patient/updatedpatient',
     method: 'post',
     data: data
   })
 }
+
+export function getAllDoctor(params) {
+  return request({
+    url: '/m/api/patient/getalldoctor',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllInspection(params) {
+  return request({
+    url: '/m/api/patient/getallinspection',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getInspection(id, limit, page, startime, endtime) {
+  const params = {
+    id: id,
+    limit: limit,
+    page: page,
+    startime: startime,
+    endtime: endtime
+  }
+  return request({
+    url: '/m/api/patient/getinspection',
+    method: 'get',
+    params: params
+  })
+}

src/pages/allDoctorAdvice/index.vue

@@ -7,14 +7,22 @@
       </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">{{ getTimes(it.start_time) }}</span>
+                <span style="margin-left:1rem">{{
+                  getTimes(it.start_time)
+                }}</span>
               </div>
               <div class="orderContent">
                 <p v-if="it.parent_id === 0">
@@ -36,16 +44,21 @@
                 </div>
               </div>
               <div class="doctorBox">
-                <p>开嘱医生：{{ it.user_name }}</p>
-                <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
-                <p>核对护士：{{ getDoctor(it.checker) }}</p>
+                <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">{{ getTimes(item.child[0].start_time) }}</span>
+                <span style="margin-left:1rem">{{
+                  getTimes(item.child[0].start_time)
+                }}</span>
               </div>
               <div class="orderContent">
                 <p>
@@ -68,9 +81,9 @@
                 </div>
               </div>
               <div class="doctorBox">
-                <p>开嘱医生：{{ getDoctor(item.advice_doctor) }}</p>
-                <p>执行护士：{{ getDoctor(item.execution_staff) }}</p>
-                <p>核对护士：{{ getDoctor(item.checker) }}</p>
+                <p>开嘱医生：{{ getDoctor(it.advice_doctor) }}</p>
+                <p>执行护士：{{ getDoctor(it.execution_staff) }}</p>
+                <p>核对护士：{{ getDoctor(it.checker) }}</p>
               </div>
             </div>
           </div>
@@ -81,7 +94,7 @@
 </template>
 <script>
 import { setRem, setHeight } from "@/libs/functionRem";
-import { GetDoctorAdviceDetail } from "@/api/patient/patient";
+import { GetDoctorAdviceDetail, getAllDoctor } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 export default {
   data() {
@@ -115,7 +128,6 @@ export default {
             }
           }
           this.childList = objarr;
-          console.log(this.childList);
           let dataInfo = {};
           doctorAdvicedetail.forEach((item, index) => {
             let { groupno } = item;
@@ -128,13 +140,10 @@ export default {
             dataInfo[groupno].child.push(item);
           });
           let list = Object.values(dataInfo); // list 转换成功的数据
-          console.log("list", list);
           let arr = [];
           list.map(item => {
-            // console.log(item.child);
             if (item.child.length > 1) {
               item.child.map(it => {
-                // console.log(it);
                 if (arr.indexOf(it.advice_date) == -1) {
                   arr.push(it.advice_date);
                 } else {
@@ -143,21 +152,8 @@ export default {
               });
             }
           });
+          console.log("list是 ", list);
           this.doctorAdvicedetail = list;
-          var doctor = response.data.data.doctor;
-          this.doctor = doctor;
-          // var arr = [];
-          // var objarr = [];
-          // for (let i = 0; i < doctorAdvicedetail.length; i++) {
-          //   this.patient_name = doctorAdvicedetail[0].name;
-          //   this.patient_date = doctorAdvicedetail[0].advice_date;
-          //   if (doctorAdvicedetail[i].parent_id == 0) {
-          //     arr.push(doctorAdvicedetail[i]);
-          //   }
-          //   if (doctorAdvicedetail[i].parent_id != 0) {
-          //     objarr.push(doctorAdvicedetail[i]);
-          //   }
-          // }
         }
       });
     },
@@ -168,10 +164,20 @@ export default {
     getTimes(time) {
       return uParseTime(time, "{h}:{i}");
     },
+    getAllDoctor() {
+      getAllDoctor().then(response => {
+        if (response.data.state === 1) {
+          var doctor = response.data.data.doctor;
+          console.log("doctor", doctor);
+          this.doctor = doctor;
+        }
+      });
+    },
     getDoctor(id) {
+      console.log("id是", id);
       for (let i = 0; i < this.doctor.length; i++) {
         if ((this.doctor[i].admin_user_id = id)) {
-          return this.doctor[i].name;
+          return this.doctor[i].user_name;
         }
       }
     }
@@ -184,6 +190,7 @@ export default {
     this.GetDoctorAdviceDetail(id);
     var patientid = this.$route.query.patientid;
     this.id = patientid;
+    this.getAllDoctor();
   }
 };
 </script>

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -242,12 +242,10 @@ export default {
       this.typeShow = false;
     },
     onConfirm(value) {
-      console.log("value值是什么", value);
       this.type = value;
       this.typeShow = false;
     },
     getstartTime(value) {
-      console.log(value);
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -262,7 +260,6 @@ export default {
       this.startShow = false;
     },
     getstartTime2(value) {
-      console.log(value);
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -276,9 +273,7 @@ export default {
       this.endTime = `${year}-${month}-${day}`;
       this.endShow = false;
     },
-    changeData(val) {
-      console.log("val", val);
-    },
+    changeData(val) {},
     getDoctorAdvices(patientid) {
       if (this.type === "全部") {
         this.form.type = 0;
@@ -320,9 +315,7 @@ export default {
             }
             dataInfo[groupno].child.push(item);
           });
-          // console.log(dataInfo);
           let list = Object.values(dataInfo); // list 转换成功的数据
-          console.log("list", list);
           let arr = [];
           list.map(item => {
             // console.log(item.child);
@@ -337,7 +330,6 @@ export default {
               });
             }
           });
-
           var doctor = response.data.data.doctor;
           this.doctor = doctor;
           console.log("医生", doctor);

src/pages/doctorAdvice/components/Inspection.vue

@@ -27,22 +27,22 @@
           v-model="loading"
           :finished="finished"
           finished-text="没有更多了"
-          @load="onLoad"
         >
-          <div class="adviceOne" v-for="item in 3" :key="index">
+          <div
+            class="adviceOne"
+            v-for="(item, index) in Inspection"
+            :key="index"
+          >
             <div class="adviceTitle">
-              <p>2019.09.01</p>
+              <p>{{ getTime(item.inspect_date) }}</p>
               <van-icon
                 class="ellipsis"
                 name="ellipsis"
                 @click="newShow = true"
               />
             </div>
-            <div class="orderContent">
-              <p>血常规</p>
-              <p>肝功能</p>
-              <p>凝血七项</p>
-              <p>肾功能</p>
+            <div class="orderContent" v-for="(it, i) in item.child" :key="i">
+              <p>{{ it.project_name }}</p>
             </div>
             <div class="all">全部</div>
           </div>
@@ -108,35 +108,40 @@
 </template>
 
 <script>
-import { getPatientDetail } from "@/api/patient/patient";
+import {
+  getPatientDetail,
+  getAllInspection,
+  getInspection
+} from "@/api/patient/patient";
+import { uParseTime } from "@/utils/tools";
+import { Dialog } from "vant";
+const moment = require("moment");
 export default {
   data() {
     return {
+      loading: false,
+      finished: false,
       newShow: false,
       typeShow: false,
       startShow: false,
       endShow: false,
-      type: "请选择",
-      columns: [
-        "杭州",
-        "宁波",
-        "温州",
-        "嘉兴",
-        "湖州",
-        "杭州",
-        "宁波",
-        "温州",
-        "嘉兴",
-        "湖州"
-      ],
-      startTime: "请选择",
-      endTime: "请选择",
+      type: "全部",
+      columns: [],
+      startTime: moment()
+        .subtract(30, "days")
+        .format("YYYY-MM-DD"),
+      endTime: moment(new Date()).format("YYYY-MM-DD"),
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
       actions: [{ name: "编辑" }, { name: "删除" }],
       showOne: true,
-      showTwo: false
+      showTwo: false,
+      list: [],
+      page: 1,
+      limit: 10,
+      total: 0,
+      Inspection: []
     };
   },
   methods: {
@@ -192,11 +197,69 @@ export default {
           this.patientName = patientDetail.name;
         }
       });
-    }
+    },
+    getAllInspection() {
+      getAllInspection().then(response => {
+        if (response.data.state === 1) {
+          var inspection = response.data.data.inspection;
+          for (let i = 0; i < inspection.length; i++) {
+            this.columns.push(inspection[i].project_name);
+          }
+        }
+      });
+    },
+    getInspection(patientid) {
+      getInspection(
+        patientid,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      ).then(response => {
+        if (response.data.state == 1) {
+          var inspection = response.data.data.inspection;
+          console.log("inspection", inspection);
+          var total = response.data.data.total;
+          console.log("total", total);
+          let dataInfo = {};
+          inspection.forEach((item, index) => {
+            let { inspect_date } = item;
+            if (!dataInfo[inspect_date]) {
+              dataInfo[inspect_date] = {
+                inspect_date,
+                child: []
+              };
+            }
+            dataInfo[inspect_date].child.push(item);
+          });
+          let list = Object.values(dataInfo); // list 转换成功的数据
+          console.log("按时间分组", list);
+          this.Inspection = list;
+          let arr = [];
+          var result = [];
+          var obj = {};
+          list.map(item => {
+            console.log(item.child);
+            if (item.child.length > 1) {
+              item.child.map(it => {});
+            }
+          });
+        }
+      });
+      this.finished = true;
+    },
+    getTime(time) {
+      // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    onLoad() {}
   },
   created() {
     var patientid = this.$route.query.patientid;
     this.getPatientDetail(patientid);
+    // 获取所有检验检查项目
+    this.getAllInspection();
+    this.getInspection(patientid);
   }
 };
 </script>

src/pages/main/index.vue

@@ -31,7 +31,7 @@ export default {
       unReadWaitNum: 0,
       unReadDialysisNum: 0,
       sqls: [
-        window.matchMedia("(max-width:418px)"), //和CSS一样，也要注意顺序！
+        window.matchMedia("(max-width:418px)"), // 和CSS一样，也要注意顺序！
         window.matchMedia("(max-width:768px)"),
         window.matchMedia("(max-width:992px)"),
         window.matchMedia("(max-width:1200px)")
@@ -209,7 +209,6 @@ export default {
       });
     },
     getData() {
-      console.log("111111");
       // this.requestScheduals()
       // this.requestDialysisScheduals()
     },

src/router/index.js

@@ -46,22 +46,16 @@ export default new Router({
     },
     // 首页
     {
-      path: "/myIndex",
-      name: "myIndex",
-      component: () => import("@/pages/home/index"),
-      children: [
-        {
-          path: "/homeIndex",
-          component: () => import("@/pages/homeIndex/index.vue"),
+      path: '/myIndex',
+      name: 'myIndex',
+      component: () => import('@/pages/home/index'),
+      children: [{
+          path: '/homeIndex',
+          component: () => import('@/pages/homeIndex/index.vue'),
           meta: {
             noCache: true // 不会被 <keep-alive> 缓存
-<<<<<<< .mine
-          }
-
-=======
           }
 
->>>>>>> .theirs
         },
         // 我的
         {
@@ -78,71 +72,71 @@ export default new Router({
       ]
     },
     {
-      path: "/perfectOrg",
-      component: () => import("@/pages/org"),
+      path: '/perfectOrg',
+      component: () => import('@/pages/org'),
       meta: {
         noCache: true // 不会被 <keep-alive> 缓存
       }
     },
     // 患者中心
     {
-      path: "/patients",
-      name: "patients",
-      component: () => import("@/pages/patientManagement/patientManagement")
+      path: '/patients',
+      name: 'patients',
+      component: () => import('@/pages/patientManagement/patientManagement')
     },
     // 新增病人
     {
-      path: "/addPatints",
-      name: "addpatients",
-      component: () => import("@/pages/patients/addPatient")
+      path: '/addPatints',
+      name: 'addpatients',
+      component: () => import('@/pages/patients/addPatient')
     },
     // 全部病程
     {
-      path: "/coursedetail",
-      name: "coursedetail",
-      component: () => import("@/pages/allCourseManagement/index")
+      path: '/coursedetail',
+      name: 'coursedetail',
+      component: () => import('@/pages/allCourseManagement/index')
     },
     // 全部干体重
     {
-      path: "/dryweight",
-      name: "dryweight",
-      component: () => import("@/pages/allDryWeight/index")
+      path: '/dryweight',
+      name: 'dryweight',
+      component: () => import('@/pages/allDryWeight/index')
     },
     // 基本信息
     {
-      path: "/editPatient",
-      name: "editPatient",
-      component: () => import("@/pages/patients/editPatient")
+      path: '/editPatient',
+      name: 'editPatient',
+      component: () => import('@/pages/patients/editPatient')
     },
     // 全部排班
     {
-      path: "/editScheduling",
-      name: "editscheduling",
-      component: () => import("@/pages/allScheduling/index")
+      path: '/editScheduling',
+      name: 'editscheduling',
+      component: () => import('@/pages/allScheduling/index')
     },
     // 全部透后宣教
     {
-      path: "/editEducation",
-      name: "editeducation",
-      component: () => import("@/pages/allEducation/index")
+      path: '/editEducation',
+      name: 'editeducation',
+      component: () => import('@/pages/allEducation/index')
     },
     // 全部抢救记录
     {
-      path: "/rescuerecord",
-      name: "rescuerecord",
-      component: () => import("@/pages/allRescue/index")
+      path: '/rescuerecord',
+      name: 'rescuerecord',
+      component: () => import('@/pages/allRescue/index')
     },
     //
     {
-      path: "/patientdetail",
-      name: "patientdetail",
-      component: () => import("@/pages/doctorAdvice/index")
+      path: '/patientdetail',
+      name: 'patientdetail',
+      component: () => import('@/pages/doctorAdvice/index')
     },
     // 搜索
     {
-      path: "/search",
-      name: "search",
-      component: () => import("@/pages/search/index")
+      path: '/search',
+      name: 'search',
+      component: () => import('@/pages/search/index')
     },
     // 关于我们
     {
@@ -158,86 +152,86 @@ export default new Router({
       name: 'longdialysis',
       component: () => import('@/pages/allLongDialysis/index')
     },
-    //, 
+    //,
     {
       path: '/alldoctoradvice',
       name: '/alldoctoradvice',
       component: () => import('@/pages/allDoctorAdvice/index')
     },
     {
-      path: "/product",
-      name: "Product",
-      component: () => import("@/pages/product/index")
+      path: '/product',
+      name: 'Product',
+      component: () => import('@/pages/product/index')
     },
     {
-      path: "/main",
-      name: "main",
-      component: () => import("@/pages/main/index")
+      path: '/main',
+      name: 'main',
+      component: () => import('@/pages/main/index')
     },
     {
-      path: "/details",
-      name: "details",
-      component: () => import("@/pages/main/DetailsPage")
+      path: '/details',
+      name: 'details',
+      component: () => import('@/pages/main/DetailsPage')
     },
     {
-      path: "/monitoring",
-      name: "monitorPage",
-      component: () => import("@/pages/monitoring/index")
+      path: '/monitoring',
+      name: 'monitorPage',
+      component: () => import('@/pages/monitoring/index')
     },
     {
-      path: "/my",
-      name: "my",
-      component: () => import("@/pages/personal/index")
+      path: '/my',
+      name: 'my',
+      component: () => import('@/pages/personal/index')
     },
     {
-      path: "/advice",
-      name: "doctorAdvice",
-      component: () => import("@/pages/advice/index")
+      path: '/advice',
+      name: 'doctorAdvice',
+      component: () => import('@/pages/advice/index')
     },
     {
-      path: "/EditPersonal",
-      name: "EditPersonal",
-      component: () => import("@/pages/personal/EditPersonal")
+      path: '/EditPersonal',
+      name: 'EditPersonal',
+      component: () => import('@/pages/personal/EditPersonal')
     },
     {
-      path: "/ElectronicSignature",
-      name: "ElectronicSignature",
-      component: () => import("@/pages/personal/ElectronicSignature")
+      path: '/ElectronicSignature',
+      name: 'ElectronicSignature',
+      component: () => import('@/pages/personal/ElectronicSignature')
     },
     {
-      path: "/Print",
-      name: "Print",
-      component: () => import("@/pages/main/PrintIndex")
+      path: '/Print',
+      name: 'Print',
+      component: () => import('@/pages/main/PrintIndex')
     },
     {
-      path: "/add_urgent_schedule",
-      name: "AddUrgentSchedule",
-      component: () => import("@/pages/main/add_urgent_schedule")
+      path: '/add_urgent_schedule',
+      name: 'AddUrgentSchedule',
+      component: () => import('@/pages/main/add_urgent_schedule')
     },
     {
-      path: "/Prints",
-      name: "Prints",
-      component: () => import("@/pages/main/Print")
+      path: '/Prints',
+      name: 'Prints',
+      component: () => import('@/pages/main/Print')
     },
     {
-      path: "/forgetPassword",
-      name: "forgetPassword",
-      component: () => import("@/pages/personal/ForgetPassword")
+      path: '/forgetPassword',
+      name: 'forgetPassword',
+      component: () => import('@/pages/personal/ForgetPassword')
     },
     {
-      path: "/changePassword",
-      name: "changePassword",
-      component: () => import("@/pages/personal/ChangePassword")
+      path: '/changePassword',
+      name: 'changePassword',
+      component: () => import('@/pages/personal/ChangePassword')
     },
     {
-      path: "/privacy",
-      name: "privacy",
-      component: () => import("@/pages/privacy/index")
+      path: '/privacy',
+      name: 'privacy',
+      component: () => import('@/pages/privacy/index')
     },
     {
-      path: "/userAgreement",
-      name: "userAgreement",
-      component: () => import("@/pages/userAgreement/index")
+      path: '/userAgreement',
+      name: 'userAgreement',
+      component: () => import('@/pages/userAgreement/index')
     }
   ]
 })