修改bug

src/api/patient/patient.js

@@ -76,7 +76,6 @@ export function GetPatientInfo(phone) {
 }
 
 export function savePatient(data) {
-  console.log('data', data)
   return request({
     url: '/m/api/patient/savepatient',
     method: 'post',

src/pages/doctorAdvice/components/CourseManagement.vue

@@ -16,8 +16,17 @@
         </div>
       </div>
       <div class="adviceBox" v-show="showOne">
-        <van-list v-model="loading" finished-text="没有更多了" @load="onLoad" :finished="finished">
-          <div class="adviceOne" v-for="(item, index) in this.courseManagement" :key="item.id">
+        <van-list
+          v-model="loading"
+          finished-text="没有更多了"
+          @load="onLoad"
+          :finished="finished"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in this.courseManagement"
+            :key="item.id"
+          >
             <div class="adviceTitle">
               <p>{{ getTime(item.record_time) }}</p>
               <van-icon
@@ -55,10 +64,23 @@
 
     <!-- 弹出层 -->
     <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"
@@ -110,10 +132,9 @@ export default {
       newShow: false,
       startShow: false,
       endShow: false,
-      startTime: moment()
-        .subtract(30, "days")
-        .format("YYYY-MM-DD"),
-      endTime: moment(new Date()).format("YYYY-MM-DD"),
+      startTime: "请选择",
+      endTime: "请选择",
+      endTimes: "",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -143,7 +164,7 @@ export default {
       this.typeShow = false;
     },
     getstartTime(value) {
-      console.log(value);
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -155,10 +176,18 @@ export default {
       }
 
       this.startTime = `${year}-${month}-${day}`;
+      this.courseManagement = [];
+      this.getCourseManagement(
+        this.patientid,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
       this.startShow = false;
     },
     getstartTime2(value) {
-      console.log(value);
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -170,6 +199,15 @@ export default {
       }
 
       this.endTime = `${year}-${month}-${day}`;
+
+      this.courseManagement = [];
+      this.getCourseManagement(
+        this.patientid,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
       this.endShow = false;
     },
     getTime(time) {

src/pages/doctorAdvice/components/DialysisRecord.vue

@@ -23,8 +23,17 @@
       </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 dialysisRecord" :key="index">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in dialysisRecord"
+            :key="index"
+          >
             <div class="adviceTitle">
               <p>{{ getTime(item.dialysis_date) }}</p>
             </div>
@@ -56,15 +65,19 @@
               </p>
               <p>
                 透析时长(h)：{{ item.prescription.dialysis_duration_hour }}h{{
-                item.prescription.dialysis_duration_minute
+                  item.prescription.dialysis_duration_minute
                 }}min
               </p>
               <p>干体重(kg)：{{ item.predialysis_evaluation.dry_weight }}</p>
-              <p>透前称重(kg)：{{ item.predialysis_evaluation.weight_before }}</p>
-              <p>透后称重(kg)：{{ item.assessment_after_dislysis.weight_after }}</p>
+              <p>
+                透前称重(kg)：{{ item.predialysis_evaluation.weight_before }}
+              </p>
+              <p>
+                透后称重(kg)：{{ item.assessment_after_dislysis.weight_after }}
+              </p>
               <p>
                 透前血压(mmHg)：{{
-                item.predialysis_evaluation.systolic_blood_pressure
+                  item.predialysis_evaluation.systolic_blood_pressure
                 }}/
                 {{ item.predialysis_evaluation.diastolic_blood_pressure }}
               </p>
@@ -76,10 +89,18 @@
               <p>
                 抗凝剂：
                 <span v-if="item.prescription.anticoagulant == 1">无肝素</span>
-                <span v-if="item.prescription.anticoagulant == 2">普通肝素</span>
-                <span v-if="item.prescription.anticoagulant == 3">低分子肝素</span>
-                <span v-if="item.prescription.anticoagulant == 4">阿加曲班</span>
-                <span v-if="item.prescription.anticoagulant == 5">枸橼酸钠</span>
+                <span v-if="item.prescription.anticoagulant == 2"
+                  >普通肝素</span
+                >
+                <span v-if="item.prescription.anticoagulant == 3"
+                  >低分子肝素</span
+                >
+                <span v-if="item.prescription.anticoagulant == 4"
+                  >阿加曲班</span
+                >
+                <span v-if="item.prescription.anticoagulant == 5"
+                  >枸橼酸钠</span
+                >
               </p>
               <p>
                 首剂：
@@ -117,7 +138,9 @@
               @click="
                 toDialysisRecordDetail(item.patient_id, item.dialysis_date)
               "
-            >全部</div>
+            >
+              全部
+            </div>
           </div>
         </van-list>
       </div>
@@ -134,10 +157,23 @@
 
     <!-- 弹出层 -->
     <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"
@@ -201,10 +237,8 @@ export default {
         "CRRT",
         "腹水回输"
       ],
-      startTime: moment()
-        .subtract(30, "days")
-        .format("YYYY-MM-DD"),
-      endTime: moment(new Date()).format("YYYY-MM-DD"),
+      startTime: "请选择",
+      endTime: "请选择",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -217,7 +251,8 @@ export default {
       doctor: [],
       patient_name: "",
       index: 0,
-      id: 0
+      id: 0,
+      patient_id: 0
     };
   },
   methods: {
@@ -271,9 +306,20 @@ export default {
       if (value === "腹水回输") {
         this.types = 14;
       }
+      this.page = 1;
+      this.dialysisRecord = [];
+      this.getDialysisRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime,
+        this.types
+      );
       this.typeShow = false;
     },
     getstartTime(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -283,11 +329,20 @@ export default {
       if (day >= 1 && day <= 9) {
         day = `0${day}`;
       }
-
       this.startTime = `${year}-${month}-${day}`;
+      this.dialysisRecord = [];
+      this.getDialysisRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime,
+        this.types
+      );
       this.startShow = false;
     },
     getstartTime2(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -299,6 +354,15 @@ export default {
       }
 
       this.endTime = `${year}-${month}-${day}`;
+      this.dialysisRecord = [];
+      this.getDialysisRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime,
+        this.types
+      );
       this.endShow = false;
     },
     getPatientDetail(patientid) {
@@ -404,6 +468,7 @@ export default {
     var patientid = this.$route.query.patientid;
     this.getPatientDetail(patientid);
     this.getDialysisRecord(patientid);
+    this.patient_id = patientid;
   }
 };
 </script>

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -23,18 +23,36 @@
       </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="Delete(item.groupno, index)" />
+                <van-icon
+                  class="ellipsis"
+                  name="ellipsis"
+                  @click="Delete(item.groupno, index, it.execution_staff)"
+                />
               </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.start_time) }}</span>
+                  <span style="margin-left:1rem">{{
+                    getTimes(it.start_time)
+                  }}</span>
                 </div>
                 <div class="orderContent">
                   <p v-if="it.parent_id === 0">
@@ -62,10 +80,15 @@
                 </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>
@@ -94,7 +117,12 @@
                 </div>
               </div>
             </div>
-            <div class="all" @click="toDoctorAdviceDetail(item.child[0].groupno)">全部</div>
+            <div
+              class="all"
+              @click="toDoctorAdviceDetail(item.child[0].groupno)"
+            >
+              全部
+            </div>
           </div>
         </van-list>
       </div>
@@ -111,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"
@@ -169,13 +210,9 @@ export default {
       endShow: false,
       type: "全部",
       columns: ["全部", "长期医嘱", "临时医嘱"],
-      startTime: moment()
-        .subtract(30, "days")
-        .format("YYYY-MM-DD"),
-      endTime: moment(new Date()).format("YYYY-MM-DD"),
-      endTimes: moment(new Date())
-        .add(1, "days")
-        .format("YYYY-MM-DD"),
+      startTime: "请选择",
+      endTime: "请选择",
+      endTimes: "",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -193,7 +230,8 @@ export default {
       patient_id: "",
       doctor: [],
       id: 0,
-      index: 0
+      index: 0,
+      staff: 0
     };
   },
   methods: {
@@ -201,10 +239,21 @@ export default {
       this.typeShow = false;
     },
     onConfirm(value) {
+      this.page = 1;
       this.type = value;
       this.typeShow = false;
+      this.doctorAdvice = [];
+      this.getDoctorAdvices(
+        this.patient_id,
+        this.type,
+        this.startTime,
+        this.endTimes,
+        this.form.limit,
+        this.form.page
+      );
     },
     getstartTime(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -216,9 +265,19 @@ export default {
       }
 
       this.startTime = `${year}-${month}-${day}`;
+      this.doctorAdvice = [];
+      this.getDoctorAdvices(
+        this.patient_id,
+        this.type,
+        this.startTime,
+        this.endTime,
+        this.form.limit,
+        this.form.page
+      );
       this.startShow = false;
     },
     getstartTime2(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -230,6 +289,16 @@ export default {
       }
 
       this.endTime = `${year}-${month}-${day}`;
+
+      this.doctorAdvice = [];
+      this.getDoctorAdvices(
+        this.patient_id,
+        this.type,
+        this.startTime,
+        this.endTime,
+        this.form.limit,
+        this.form.page
+      );
       this.endShow = false;
     },
     changeData(val) {},
@@ -241,13 +310,13 @@ export default {
         this.form.type = 1;
       }
       if (this.type === "临时医嘱") {
-        this.form.type = 2;
+        this.form.type = 3;
       }
       getDoctorAdvices(
         patientid,
         this.form.type,
         this.startTime,
-        this.endTimes,
+        this.endTime,
         this.form.limit,
         this.form.page
       ).then(response => {
@@ -357,17 +426,22 @@ export default {
         }
       }
     },
-    Delete(id, index) {
+    Delete(id, index, staff) {
       this.id = id;
       this.index = index;
+      this.staff = staff;
       this.newShow = true;
     },
     toDelete(val) {
       if (val.name == "删除") {
-        this.DeleteManagement(this.id, this.index);
+        this.DeleteManagement(this.id, this.index, this.staff);
       }
     },
-    DeleteManagement(id, index) {
+    DeleteManagement(id, index, staff) {
+      if (staff > 0) {
+        this.$toast("医嘱已执行,无法删除");
+        return false;
+      }
       Dialog.confirm({
         title: "删除提示!",
         message: "确认删除该条信息吗?,删除后将无法恢复!"

src/pages/doctorAdvice/components/DryWeight.vue

@@ -17,8 +17,17 @@
       </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 dryweight" :key="index">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in dryweight"
+            :key="index"
+          >
             <div class="adviceTitle">
               <p>{{ getTime(item.ctime) }}</p>
               <van-icon
@@ -61,6 +70,26 @@
         @select="onDeleteConfirm"
       />
     </div>
+    <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-datetime-picker
+        v-model="currentDate"
+        type="date"
+        :min-date="minDate"
+        :max-date="maxDate"
+        @confirm="getstartTime"
+        @cancel="startShow = false"
+      />
+    </van-popup>
+    <van-popup v-model="endShow" position="bottom" :style="{ height: '40%' }">
+      <van-datetime-picker
+        v-model="currentDate"
+        type="date"
+        :min-date="minDate"
+        :max-date="maxDate"
+        @confirm="getstartTime2"
+        @cancel="endShow = false"
+      />
+    </van-popup>
   </div>
 </template>
 
@@ -83,15 +112,11 @@ export default {
       newShow: false,
       startShow: false,
       endShow: false,
-      startTime: moment()
-        .subtract(30, "days")
-        .format("YYYY-MM-DD"),
-      endTime: moment(new Date()).format("YYYY-MM-DD"),
+      startTime: "请选择",
+      endTime: "请选择",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
-      endTimes: moment(new Date())
-        .add(1, "days")
-        .format("YYYY-MM-DD"),
+      endTimes: "",
       currentDate: new Date(),
       actions: [{ name: "删除" }],
       page: 1,
@@ -118,6 +143,7 @@ export default {
       this.typeShow = false;
     },
     getstartTime(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -129,9 +155,19 @@ export default {
       }
 
       this.startTime = `${year}-${month}-${day}`;
+      this.dryweight = [];
+      this.getDryWeight(
+        this.patient_id,
+        this.startTime,
+        this.endTime,
+        this.limit,
+        this.page
+      );
+
       this.startShow = false;
     },
     getstartTime2(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -143,13 +179,21 @@ export default {
       }
 
       this.endTime = `${year}-${month}-${day}`;
+      this.dryweight = [];
+      this.getDryWeight(
+        this.patient_id,
+        this.startTime,
+        this.endTime,
+        this.limit,
+        this.page
+      );
       this.endShow = false;
     },
     getDryWeight(patientid) {
       getDryWeight(
         patientid,
         this.startTime,
-        this.endTimes,
+        this.endTime,
         this.limit,
         this.page
       ).then(response => {

src/pages/doctorAdvice/components/Education.vue

@@ -16,8 +16,17 @@
         </div>
       </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 Education" :key="index">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in Education"
+            :key="index"
+          >
             <div class="adviceTitle">
               <p>{{ getTime(item.assessment_date) }}</p>
               <van-icon
@@ -48,7 +57,11 @@
 
     <!-- 弹出层 -->
     <div>
-      <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"
@@ -97,10 +110,8 @@ export default {
       newShow: false,
       startShow: false,
       endShow: false,
-      startTime: moment()
-        .subtract(30, "days")
-        .format("YYYY-MM-DD"),
-      endTime: moment(new Date()).format("YYYY-MM-DD"),
+      startTime: "请选择",
+      endTime: "请选择",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -128,6 +139,7 @@ export default {
       this.typeShow = false;
     },
     getstartTime(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -139,9 +151,18 @@ export default {
       }
 
       this.startTime = `${year}-${month}-${day}`;
+      this.Education = [];
+      this.getEducation(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
       this.startShow = false;
     },
     getstartTime2(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -153,6 +174,14 @@ export default {
       }
 
       this.endTime = `${year}-${month}-${day}`;
+      this.Education = [];
+      this.getEducation(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
       this.endShow = false;
     },
     getPatientDetail(patientid) {

src/pages/doctorAdvice/components/LongDialysis.vue

@@ -207,13 +207,9 @@ export default {
         "嘉兴",
         "湖州"
       ],
-      startTime: moment()
-        .subtract(30, "days")
-        .format("YYYY-MM-DD"),
-      endTime: moment(new Date()).format("YYYY-MM-DD"),
-      endTimes: moment(new Date())
-        .add(1, "days")
-        .format("YYYY-MM-DD"),
+      startTime: "请选择",
+      endTime: "请选择",
+      endTimes: "",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -251,7 +247,7 @@ export default {
       this.typeShow = false;
     },
     getstartTime(value) {
-      console.log(value);
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -263,10 +259,18 @@ export default {
       }
 
       this.startTime = `${year}-${month}-${day}`;
+      this.dialysisrecord = [];
+      this.GetLongDialysisRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
       this.startShow = false;
     },
     getstartTime2(value) {
-      console.log(value);
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -278,9 +282,17 @@ export default {
       }
 
       this.endTime = `${year}-${month}-${day}`;
+      this.dialysisrecord = [];
+      this.GetLongDialysisRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
       this.endShow = false;
     },
-    GetLongDialysisRecord(id) {
+    GetLongDialysisRecord(id, limit, page, startime, endtime) {
       GetLongDialysisRecord(
         id,
         this.limit,

src/pages/doctorAdvice/components/RescueRecord.vue

@@ -16,8 +16,17 @@
         </div>
       </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 this.rescueRecords" :key="index">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in this.rescueRecords"
+            :key="index"
+          >
             <div class="adviceTitle">
               <p>{{ getTime(item.record_time) }}</p>
               <van-icon
@@ -52,7 +61,11 @@
 
     <!-- 弹出层 -->
     <div>
-      <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"
@@ -72,7 +85,12 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @select="Delete" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @select="Delete"
+      />
     </div>
   </div>
 </template>
@@ -96,10 +114,9 @@ export default {
       newShow: false,
       startShow: false,
       endShow: false,
-      startTime: moment()
-        .subtract(30, "days")
-        .format("YYYY-MM-DD"),
-      endTime: moment(new Date()).format("YYYY-MM-DD"),
+      startTime: "请选择",
+      endTime: "请选择",
+      endTimes: "",
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -127,6 +144,7 @@ export default {
       this.typeShow = false;
     },
     getstartTime(value) {
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -138,10 +156,18 @@ export default {
       }
 
       this.startTime = `${year}-${month}-${day}`;
+      this.rescueRecords = [];
+      this.getRescueRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
       this.startShow = false;
     },
     getstartTime2(value) {
-      console.log(value);
+      this.page = 1;
       let year = value.getFullYear();
       let month = value.getMonth() + 1;
       let day = value.getDate();
@@ -153,6 +179,14 @@ export default {
       }
 
       this.endTime = `${year}-${month}-${day}`;
+      this.rescueRecords = [];
+      this.getRescueRecord(
+        this.patient_id,
+        this.limit,
+        this.page,
+        this.startTime,
+        this.endTime
+      );
       this.endShow = false;
     },
     getPatientDetail(patientid) {

src/pages/doctorAdvice/components/Scheduling.vue

@@ -129,10 +129,8 @@ export default {
       type: '全部',
       types: 0,
       columns: ['HD', 'HDF', 'HD+HP', 'HP', 'HF', 'SCUF', 'IUF', 'HFHD', 'HFHD+HP', 'PHF', 'HFR', 'HDF+HP', 'CRRT', '腹水回输'],
-      startTime: moment()
-        .subtract(30, 'days')
-        .format('YYYY-MM-DD'),
-      endTime: moment(new Date()).format('YYYY-MM-DD'),
+      startTime: '请选择',
+      endTime: '请选择',
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
@@ -159,6 +157,7 @@ export default {
       this.typeShow = false
     },
     onConfirm (value) {
+      this.page = 1
       if (value === '全部') {
         this.types = 0
       }
@@ -207,10 +206,11 @@ export default {
       }
       this.type = value
       this.typeShow = false
+      this.scheduLing = []
       this.getScheduling(this.patient_id, this.limit, this.page, this.startTime, this.endTime, this.types)
     },
     getstartTime (value) {
-      console.log(value)
+      this.page = 1
       let year = value.getFullYear()
       let month = value.getMonth() + 1
       let day = value.getDate()
@@ -222,10 +222,12 @@ export default {
       }
 
       this.startTime = `${year}-${month}-${day}`
+      this.scheduLing = []
+      this.getScheduling(this.patient_id, this.limit, this.page, this.startTime, this.endTime, this.types)
       this.startShow = false
     },
     getstartTime2 (value) {
-      console.log(value)
+      this.page = 1
       let year = value.getFullYear()
       let month = value.getMonth() + 1
       let day = value.getDate()
@@ -237,6 +239,8 @@ export default {
       }
 
       this.endTime = `${year}-${month}-${day}`
+      this.scheduLing = []
+      this.getScheduling(this.patient_id, this.limit, this.page, this.startTime, this.endTime, this.types)
       this.endShow = false
     },
     getPatientDetail (patientid) {

src/pages/patients/addPatient.vue

@@ -928,29 +928,82 @@ export default {
       };
       savePatient(params).then(response => {
         if (response.data.state === 1) {
-          var patient = response.data.data.patient;
-          this.$toast("保存成功");
-          this.$router.push({ path: "/patients" });
-        } else {
-          this.$toast("手机号码已存在");
-          if (this.patientForm.sex === 1) {
-            this.patientForm.sex = "男";
-          }
-          if (this.patientForm.sex === 2) {
-            this.patientForm.sex = "女";
-          }
-          if (this.patientForm.patientsoure === 1) {
-            this.patientForm.patientsoure = "门诊";
+          var msg = response.data.data.msg;
+          console.log("msg", msg);
+          if (msg === "身份证号码已存在") {
+            this.$toast("身份证号码已存在");
+            if (this.patientForm.sex === 1) {
+              this.patientForm.sex = "男";
+            }
+            if (this.patientForm.sex === 2) {
+              this.patientForm.sex = "女";
+            }
+            if (this.patientForm.patientsoure === 1) {
+              this.patientForm.patientsoure = "门诊";
+            }
+            if (this.patientForm.patientsoure === 2) {
+              this.patientForm.patientsoure = "住院";
+            }
+            if (this.patientForm.lapseto === 1) {
+              this.patientForm.lapseto = "留治";
+            }
+            if (this.patientForm.lapseto === 2) {
+              this.patientForm.lapseto = "转出";
+            }
+            return false;
           }
-          if (this.patientForm.patientsoure === 2) {
-            this.patientForm.patientsoure = "住院";
+          if (msg === "手机号码已存在") {
+            this.$toast("手机号码已存在");
+            if (this.patientForm.sex === 1) {
+              this.patientForm.sex = "男";
+            }
+            if (this.patientForm.sex === 2) {
+              this.patientForm.sex = "女";
+            }
+            if (this.patientForm.patientsoure === 1) {
+              this.patientForm.patientsoure = "门诊";
+            }
+            if (this.patientForm.patientsoure === 2) {
+              this.patientForm.patientsoure = "住院";
+            }
+            if (this.patientForm.lapseto === 1) {
+              this.patientForm.lapseto = "留治";
+            }
+            if (this.patientForm.lapseto === 2) {
+              this.patientForm.lapseto = "转出";
+            }
+            return false;
           }
-          if (this.patientForm.lapseto === 1) {
-            this.patientForm.lapseto = "留治";
+          if (msg === "透析号已存在") {
+            this.$toast("透析号已存在");
+            if (this.patientForm.sex === 1) {
+              this.patientForm.sex = "男";
+            }
+            if (this.patientForm.sex === 2) {
+              this.patientForm.sex = "女";
+            }
+            if (this.patientForm.patientsoure === 1) {
+              this.patientForm.patientsoure = "门诊";
+            }
+            if (this.patientForm.patientsoure === 2) {
+              this.patientForm.patientsoure = "住院";
+            }
+            if (this.patientForm.lapseto === 1) {
+              this.patientForm.lapseto = "留治";
+            }
+            if (this.patientForm.lapseto === 2) {
+              this.patientForm.lapseto = "转出";
+            }
+            return false;
           }
-          if (this.patientForm.lapseto === 2) {
-            this.patientForm.lapseto = "转出";
+          var patient = response.data.data.patient;
+          console.log("patient", patient);
+          if (msg === undefined) {
+            this.$toast("保存成功");
+            this.$router.push({ path: "/patients" });
           }
+        } else {
+          this.$toast("网络错误");
         }
       });
     },

src/pages/patients/editPatient.vue

@@ -641,9 +641,18 @@ export default {
             patientdetail.member_fistdate,
             "{y}-{m}-{d}"
           );
-          this.patientForm.fistDate = uParseTimeOne(
-            patientdetail.first_dialysis_date
-          );
+
+          console.log("首次透析日期", patientdetail.first_dialysis_date);
+
+          if (patientdetail.first_dialysis_date < 0) {
+            this.patientForm.fistDate = "";
+          }
+          if (patientdetail.first_dialysis_date > 0) {
+            this.patientForm.fistDate = uParseTimeOne(
+              patientdetail.first_dialysis_date
+            );
+          }
+
           this.patientForm.diagnose = patientdetail.diagnose;
           if (patientdetail.member_treatement === 1) {
             this.patientForm.treatmentMethod = "西医治疗";
@@ -800,11 +809,6 @@ export default {
         this.patientForm.lapseto = 0;
       }
 
-      if (this.resultTwo.length === 0 && this.result.indexOf("1") != -1) {
-        this.$toast("传染病不能为空");
-        return false;
-      }
-
       if (this.patientForm.patientsoure == "门诊") {
         this.patientForm.patientsoure = 1;
       }
@@ -980,8 +984,80 @@ export default {
       };
       updatedPatient(params).then(response => {
         if (response.data.state === 1) {
-          var patients = response.data.data.patients;
-          this.$router.push("/patientdetail?patientid=" + patients.id);
+          var msg = response.data.data.msg;
+          console.log("msg", msg);
+          if (msg === "身份证号码已存在") {
+            this.$toast("身份证号码已存在");
+            if (this.patientForm.sex === 1) {
+              this.patientForm.sex = "男";
+            }
+            if (this.patientForm.sex === 2) {
+              this.patientForm.sex = "女";
+            }
+            if (this.patientForm.patientsoure === 1) {
+              this.patientForm.patientsoure = "门诊";
+            }
+            if (this.patientForm.patientsoure === 2) {
+              this.patientForm.patientsoure = "住院";
+            }
+            if (this.patientForm.lapseto === 1) {
+              this.patientForm.lapseto = "留治";
+            }
+            if (this.patientForm.lapseto === 2) {
+              this.patientForm.lapseto = "转出";
+            }
+            return false;
+          }
+          if (msg == "手机号码已存在") {
+            this.$toast("手机号码已存在");
+            if (this.patientForm.sex === 1) {
+              this.patientForm.sex = "男";
+            }
+            if (this.patientForm.sex === 2) {
+              this.patientForm.sex = "女";
+            }
+            if (this.patientForm.patientsoure === 1) {
+              this.patientForm.patientsoure = "门诊";
+            }
+            if (this.patientForm.patientsoure === 2) {
+              this.patientForm.patientsoure = "住院";
+            }
+            if (this.patientForm.lapseto === 1) {
+              this.patientForm.lapseto = "留治";
+            }
+            if (this.patientForm.lapseto === 2) {
+              this.patientForm.lapseto = "转出";
+            }
+            return false;
+          }
+          if (msg === "透析号码已存在") {
+            this.$toast("透析号码已存在");
+            if (this.patientForm.sex === 1) {
+              this.patientForm.sex = "男";
+            }
+            if (this.patientForm.sex === 2) {
+              this.patientForm.sex = "女";
+            }
+            if (this.patientForm.patientsoure === 1) {
+              this.patientForm.patientsoure = "门诊";
+            }
+            if (this.patientForm.patientsoure === 2) {
+              this.patientForm.patientsoure = "住院";
+            }
+            if (this.patientForm.lapseto === 1) {
+              this.patientForm.lapseto = "留治";
+            }
+            if (this.patientForm.lapseto === 2) {
+              this.patientForm.lapseto = "转出";
+            }
+            return false;
+          }
+
+          if (msg === undefined) {
+            this.$toast("修改成功");
+            var patients = response.data.data.patients;
+            this.$router.push("/patientdetail?patientid=" + patients.id);
+          }
         }
       });
     },