解决冲突

src/api/patient/patient.js

@@ -356,3 +356,47 @@ export function toSearchPatient(keyword) {
     params: params
   })
 }
+
+export function SearchAllPatient(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/searchallpatient',
+    method: 'get',
+    params: params
+  })
+}
+
+export function SearchAllBlood(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/searchallblood',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSlowSearchPatient(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/getslowsearchepatient',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMemberSearchPatient(keyword) {
+  const params = {
+    keyword: keyword
+  }
+  return request({
+    url: '/m/api/patient/getmembersearchpatient',
+    method: 'get',
+    params: params
+  })
+}

src/pages/allRescue/index.vue

@@ -3,7 +3,7 @@
     <van-sticky>
       <div class="allRescueTitle">
         <i class="iconfont icon-zuojiantou jiantou" @click="toReturn"></i>
-        <span class="titleName">张三的抢救记录</span>
+        <span class="titleName">{{ recorddetail.name }}的抢救记录</span>
       </div>
     </van-sticky>
     <div class="courseBox">

src/pages/patientManagement/components/Blood.vue

@@ -63,7 +63,10 @@
 </template>
 
 <script>
-import { getAllBloodDialysisPatient } from "@/api/patient/patient";
+import {
+  getAllBloodDialysisPatient,
+  SearchAllBlood
+} from "@/api/patient/patient";
 export default {
   props: {
     searchValue: String
@@ -160,6 +163,14 @@ export default {
     },
     toPatientDetail(id) {
       this.$router.push("/patientdetail?patientid=" + id);
+    },
+    SearchAllBlood(val) {
+      SearchAllBlood(val).then(response => {
+        if (response.data.state === 1) {
+          var bloodpatient = response.data.data.bloodPatient;
+          console.log("血透病人", bloodpatient);
+        }
+      });
     }
   },
   created() {
@@ -168,7 +179,8 @@ export default {
   },
   watch: {
     searchValue(newVal) {
-      console.log(newVal);
+      console.log("监听", newVal);
+      this.SearchAllBlood(newVal);
     }
   }
 };

src/pages/patientManagement/components/Member.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import { getAllMemberPatient } from '@/api/patient/patient'
+import { getAllMemberPatient, getMemberSearchPatient } from '@/api/patient/patient'
 export default {
   props: {
     searchValue: String
@@ -70,6 +70,14 @@ export default {
     },
     toPatientDetail (id) {
       this.$router.push('/patientdetail?patientid=' + id)
+    },
+    getMemberSearchPatient (value) {
+      getMemberSearchPatient(value).then(response => {
+        if (response.data.state === 1) {
+          var memberpatient = response.data.data.memberPatient
+          console.log('会员病人', memberpatient)
+        }
+      })
     }
   },
   created () {
@@ -77,8 +85,9 @@ export default {
     this.getAllMemberPatient()
   },
   watch: {
-    searchValue(newVal) {
-      console.log(newVal);
+    searchValue (newVal) {
+      console.log(newVal)
+      this.getMemberSearchPatient(newVal)
     }
   }
 }

src/pages/patientManagement/components/Slow.vue

@@ -20,7 +20,8 @@
 
 <script>
 import {
-  getAllSlowPatient
+  getAllSlowPatient,
+  getSlowSearchPatient
 } from '@/api/patient/patient'
 export default {
   props: {
@@ -71,14 +72,23 @@ export default {
     },
     toPatientDetail (id) {
       this.$router.push('/patientdetail?patientid=' + id)
+    },
+    getSlowSearchPatient (val) {
+      getSlowSearchPatient(val).then(response => {
+        if (response.data.state === 1) {
+          var slowpatient = response.data.data.slowPatient
+          console.log('慢病病人', slowpatient)
+        }
+      })
     }
   },
   created () {
     this.getAllSlowPatient()
   },
   watch: {
-    searchValue(newVal) {
-      console.log(newVal);
+    searchValue (newVal) {
+      console.log(newVal)
+      this.getSlowSearchPatient(newVal)
     }
   }
 }

src/pages/patientManagement/patientManagement.vue

@@ -10,7 +10,11 @@
       </div>
     </van-sticky>
     <div class="searchBox">
-      <van-search v-model="value" placeholder="搜索患者透析号/姓名/首拼" />
+      <van-search
+        v-model="value"
+        placeholder="搜索患者透析号/姓名/首拼"
+        @search="SearchAllPatient"
+      />
     </div>
     <div class="chooseBox">
       <van-tabs v-model="active" sticky>
@@ -65,7 +69,10 @@
 
 <script>
 import "../../styles/resetStyle.scss";
-import { getBloodDialysisPatient } from "@/api/patient/patient";
+import {
+  getBloodDialysisPatient,
+  SearchAllPatient
+} from "@/api/patient/patient";
 import Slow from "@/pages/patientManagement/components/Slow";
 import Member from "@/pages/patientManagement/components/Member";
 import Blood from "@/pages/patientManagement/components/Blood";
@@ -135,13 +142,13 @@ export default {
       getBloodDialysisPatient(this.page, this.limit).then(response => {
         if (response.data.state == 1) {
           var patient = response.data.data.patient;
-          console.log("病人信息", patient);
+          // console.log("病人信息", patient);
           let arr = this.patients;
           arr.push(...patient);
           this.patients = arr;
           var total = response.data.data.total;
           this.total = total;
-          console.log("总计", total);
+          // console.log("总计", total);
         }
       });
     },
@@ -154,6 +161,14 @@ export default {
     },
     toback() {
       this.$router.push("/homeIndex");
+    },
+    SearchAllPatient(val) {
+      SearchAllPatient(val).then(response => {
+        if (response.data.state === 1) {
+          var patient = response.data.data.patient;
+          console.log("patient", patient);
+        }
+      });
     }
   },
   created() {

src/pages/search/index.vue

@@ -3,7 +3,7 @@
     <van-sticky>
       <div class="header">
         <i class="iconfont icon-zuojiantou" @click="toHomeIndex"></i>
-        <van-search v-model="value" placeholder=" 姓名 / 首拼 / 透析号" @search="toSearchPatient" />
+        <van-search v-model="value" placeholder=" 姓名 / 透析号" @search="toSearchPatient" />
       </div>
     </van-sticky>
     <div class="searchList">