修改

src/store/getters.js

@@ -22,6 +22,8 @@ const getters = {
   xt_user: state => state.xt_user,
   schedule_type_selected: state => state.xt_user.schedule_type_selected,
   zone_selected: state => state.xt_user.zone_selected,
+  patient_state_selected: state => state.xt_user.patient_state_selected,
+  treat_state_selected: state => state.xt_user.treat_state_selected,
 
   xt_role_temps: state => state.xt_role_temps,
 

src/store/modules/xt_user.js

@@ -9,6 +9,8 @@ const xt_user = {
     org_id: 0,
     schedule_type_selected: 0,
     zone_selected: 0,
+    patient_state_selected: 0,
+    treat_state_selected: 0,
     app_id: 0,
     user: {
       id: 0,
@@ -60,6 +62,12 @@ const xt_user = {
     SET_ZONE_SELECTED: (state, zone_selected) => {
       state.zone_selected = zone_selected
     },
+    SET_PAtIENT_STATE_SELECTED: (state, patient_state_selected) => {
+      state.patient_state_selected = patient_state_selected
+    },
+    SET_TREAT_STATE_SELECTED: (state, treat_state_selected) => {
+      state.treat_state_selected = treat_state_selected
+    },
     SET_FILEDS_LIST: (state, configlist) => {
       state.fileds = configlist
     },
@@ -176,6 +184,12 @@ const xt_user = {
     SetZoneSelected({ commit }, zone_selected) {
       commit('SET_ZONE_SELECTED', zone_selected)
     },
+    SetPatientStateSelected({ commit }, patient_state_selected) {
+      commit('SET_PAtIENT_STATE_SELECTED', patient_state_selected)
+    },
+    SetTreatStateSelected({ commit }, treat_state_selected) {
+      commit('SET_TREAT_STATE_SELECTED', treat_state_selected)
+    },
     SetSubscibePatients({
                           commit,
                           state

src/xt_pages/dialysis/PatientBox.vue

@@ -6,7 +6,7 @@
       v-for="schedule in schedules"
       v-if="schedule.patient"
       :class="borderColor(schedule)"
-      @click="detailAction(schedule)"
+      @click.stop="detailAction(schedule)"
       :key="schedule.id"
     >
       <div class="kehu">
@@ -19,6 +19,7 @@
             "
             alt=""
           />
+          <div>
           <div class="right">
             <h3 class="name">
               {{ schedule.patient.name
@@ -28,9 +29,23 @@
               >{{ genderText(schedule) }} | {{ getAge(schedule) }} 岁</span
             >
           </div>
+          <div style="margin-top:5px;text-align:left;height:24px;">
+              <span class="tip1" v-if="schedule.prescription == null || schedule.prescription.creater == 0" @click.stop="open(schedule)">
+                开处方
+              </span>
+              <span class="tip2" v-if="schedule.treatment_summary == null || schedule.treatment_summary.dialysis_summary == ''" @click.stop="open1(schedule)">
+                开小结
+              </span>
+            </div>
         </div>
-        <div class="online" v-show="computeState(schedule) != 4">
-          <p :class="stateColor(schedule)">{{ stateText(schedule) }}</p>
+        </div>
+        <div>
+          <div style="height:24px;margin-right: 10px;">
+            <div class="online" v-show="computeState(schedule) != 4">
+              <p :class="stateColor(schedule)">{{ stateText(schedule) }}</p>
+            </div>
+          </div>
+          <div style="margin-top:13px;font-size:12px;color:#a8b3ba;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
         </div>
       </div>
       <div class="function" :class="functionColor(schedule)">
@@ -56,15 +71,65 @@
       </div>
     </div>
     <!-- </router-link> -->
+    <dialysis-prescription-dialog
+      title="透析处方"
+      ref="prescription"
+      :patient="patient"
+      :prescription="prescription"
+      :solution="solution"
+      @advice="adviceFunc"
+      :niprocart_info="niprocart_info"
+      :jms_info="jms_info"
+      :fistula_needle_set_info="fistula_needle_set_info"
+      :fistula_needle_set_16_info="fistula_needle_set_16_info"
+      :hemoperfusion_info="hemoperfusion_info"
+      :dialyser_sterilised_info="dialyser_sterilised_info"
+      :filtryzer_info="filtryzer_info"
+      :dialyzers_info="dialyzers_info"
+      :injector_info="injector_info"
+      :bloodlines_info="bloodlines_info"
+      :tubingHemodialysis_info="tubingHemodialysis_info"
+      :safe_package_info="safe_package_info"
+      :aliquid_info="aliquid_info"
+      :config="config"
+      :admin_users="admin_users"
+      :targetAdvices="longAdvices"
+      :waitUploadAdvices="waitUploadAdvices"
+      :is_open="is_open"
+      :predialysis="predialysis_evaluation"
+      :last_predialysis="lastPredialysisEvaluation"
+      :record="assessment_after_dislysis"
+      :last_record="lastAssessmentAfterDislysis"
+      :last_prescription="lastDialysisPrescribe"
+      :dry_weight="lastDryWeightDislysis"
+      :schedual="temp_schedual"
+      :date='date'
+    ></dialysis-prescription-dialog>
+    <treatment-summary-dialog
+      title="治疗小结"
+      ref="treatmentSummary"
+      :patient="patient"
+      :treatment_summary="treatment_summary"
+    ></treatment-summary-dialog>
   </div>
 </template>
 
 <script>
 import { parseTime } from "@/utils";
 import { jsGetAge } from "@/utils/tools";
+import dialysisPrescriptionDialog from "../dialysis/details/dialog/dialysisPrescriptionDialog";
+import treatmentSummaryDialog from "../dialysis/details/dialog/treatmentSummaryDialog";
+import {
+  getDialysisScheduleDetail,
+  getLongAdvice,
+} from "@/api/dialysis_record";
 
 export default {
   name: "PatientBox",
+  components:{
+    dialysisPrescriptionDialog,
+    treatmentSummaryDialog
+  },
   data() {
     return {
       patients: [
@@ -96,13 +161,64 @@ export default {
           sex: "女",
           age: 90
         }
-      ]
+      ],
+      //
+      longAdvices: [],
+      waitUploadAdvices: [],
+      is_open: 0,
+      targetAdvices: [],
+
+      patient: { id: 0 }, // 患者信息
+      schedual: { id: 0 }, // 患者排班信息
+      prescription: { id: 0 }, // 透析处方
+      solution: { id: 0 }, // 透析方案
+      system_prescribe: { id: 0 },
+      receiver_treatment_access: { id: 0 }, // 接诊评估
+      predialysis_evaluation: { id: 0 }, // 透前评估
+      doctor_advices: [], // 临时医嘱
+      double_check: { id: 0 }, // 双人核对
+      assessment_after_dislysis: { id: 0 }, // 透后评估
+      treatment_summary: { id: 0 }, // 治疗小结
+      monitor_records: [], // 透析监测
+      dialysis_order: { id: 0 }, // 透析记录
+      admin_users: [], // 系统用户列表
+      devices: [], // 设备
+      device_numbers: [], // 床位号
+
+      admin_user_map: {}, // {user_id: admin_user object}
+      device_map: {}, // {device_id: device}
+      device_number_map: {}, // {device_number_id: device_number}
+
+      niprocart_info: [],
+      jms_info: [],
+      fistula_needle_set_info: [],
+      fistula_needle_set_16_info: [],
+      hemoperfusion_info: [],
+      dialyser_sterilised_info: [],
+      filtryzer_info: [],
+      dialyzers_info: [],
+      injector_info: [],
+      bloodlines_info: [],
+      tubingHemodialysis_info: [],
+      safe_package_info: [],
+      aliquid_info: [],
+      config: {},
+
+      lastPredialysisEvaluation: { id: 0 },
+      lastMonitorRecord: { id: 0 },
+      lastAssessmentAfterDislysis: { id: 0 },
+      lastDryWeightDislysis: { id: 0 },
+      headNurses: [],
+      lastDialysisPrescribe: { id: 0 },
+      temp_schedual: null,
+      date:''
     };
   },
   props: {
     schedules: {
       type: Array
-    }
+    },
+    patientStateVal:Number
   },
   methods: {
     stateColor: function(schedual) {
@@ -252,8 +368,252 @@ export default {
           patient_name: schedual.patient.name
         }
       });
+    },
+    //
+    getScheduleDetail: function() {
+      var dateStr = parseTime(this.date, "{y}-{m}-{d}");
+      this.doctor_advices = [];
+      getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
+        var resp = rs.data;
+        if (resp.state == 1) {
+          var patient = resp.data.patient; // 患者信息
+          console.log("患者信息",patient)
+          var schedual = resp.data.schedual; // 患者排班信息
+          var prescription = resp.data.prescription; // 透析处方
+          if(prescription!=null){
+              if(prescription.body_fluid == -2 ){
+                 prescription.body_fluid = 0
+             }
+          }
+          console.log("透析处方",prescription)
+          var solution = resp.data.solution; // 透析方案
+          var receiver_treatment_access = resp.data.receiver_treatment_access; // 接诊评估
+          console.log("receiver_treatment_access",receiver_treatment_access)
+          var predialysis_evaluation = resp.data.predialysis_evaluation; // 透前评估
+          console.log("透前评估",predialysis_evaluation)
+           if(predialysis_evaluation !=null){
+             if(predialysis_evaluation.blood_access_part_id == -2){
+                predialysis_evaluation.blood_access_part_id = 0
+             }
+           }
+          var doctor_advices = resp.data.doctor_advices; // 临时医嘱
+          //console.log("力气-------", doctor_advices);
+          var double_check = resp.data.double_check; // 双人核对
+          var assessment_after_dislysis = resp.data.assessment_after_dislysis; // 透后评估
+          //console.log("透后品谷数", assessment_after_dislysis);
+          var treatment_summary = resp.data.treatment_summary; // 治疗小结
+          var monitor_records = resp.data.monitor_records; // 透析监测
+          var dialysis_order = resp.data.dialysis_order; // 透析记录
+
+          var niprocart_info = resp.data.niprocart_info;
+          var jms_info = resp.data.jms_info;
+          var fistula_needle_set_info = resp.data.fistula_needle_set_info;
+          var fistula_needle_set_16_info = resp.data.fistula_needle_set_16_info;
+          var hemoperfusion_info = resp.data.hemoperfusion_info;
+          var dialyser_sterilised_info = resp.data.dialyser_sterilised_info;
+          var filtryzer_info = resp.data.filtryzer_info;
+          var dialyzers_info = resp.data.dialyzers_info;
+          var injector_info = resp.data.injector_info;
+          var bloodlines_info = resp.data.bloodlines_info;
+          var tubingHemodialysis_info = resp.data.tubingHemodialysis_info;
+          var safe_package_info = resp.data.safe_package_info;
+          var aliquid_info = resp.data.aliquid_info;
+
+          var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation;
+          console.log("上次透前评估",lastPredialysisEvaluation)
+          if(lastPredialysisEvaluation !=null){
+             if(lastPredialysisEvaluation.blood_access_part_id == -2){
+               lastPredialysisEvaluation.blood_access_part_id = 0
+             }
+          }
+          var lastMonitorRecord = resp.data.lastMonitorRecord;
+          var lastAssessmentAfterDislysis =
+            resp.data.lastAssessmentAfterDislysis;
+          var lastDialysisPrescribe = resp.data.lastDialysisPrescribe;
+          var lastDryWeightDislysis = resp.data.lastDryWeightDislysis;
+
+          var system_prescribe = resp.data.system_prescribe;
+
+          
+          this.$refs.prescription.setLastRecord(
+            schedual,
+            lastAssessmentAfterDislysis,
+            lastPredialysisEvaluation,
+            lastDialysisPrescribe,
+            lastDryWeightDislysis,
+            system_prescribe
+          );
+
+          var headNurses = resp.data.headNurse;
+
+          var config = resp.data.config;
+          this.lastPredialysisEvaluation = lastPredialysisEvaluation;
+          this.lastMonitorRecord = lastMonitorRecord;
+          this.lastAssessmentAfterDislysis = lastAssessmentAfterDislysis;
+          this.lastDialysisPrescribe = lastDialysisPrescribe;
+          this.lastDryWeightDislysis = lastDryWeightDislysis;
+          this.headNurses = headNurses;
+          this.system_prescribe = system_prescribe;
+
+          this.niprocart_info = niprocart_info;
+          this.jms_info = jms_info;
+          this.fistula_needle_set_info = fistula_needle_set_info;
+          this.fistula_needle_set_16_info = fistula_needle_set_16_info;
+          this.hemoperfusion_info = hemoperfusion_info;
+          this.dialyser_sterilised_info = dialyser_sterilised_info;
+          this.filtryzer_info = filtryzer_info;
+          this.dialyzers_info = dialyzers_info;
+          this.injector_info = injector_info;
+          this.bloodlines_info = bloodlines_info;
+          this.tubingHemodialysis_info = tubingHemodialysis_info;
+          this.safe_package_info = safe_package_info;
+          this.aliquid_info = aliquid_info;
+          this.config = config;
+
+          this.patient = patient;
+          this.schedual = schedual == null ? { id: 0 } : schedual;
+          this.prescription = prescription == null ? { id: 0 } : prescription;
+          console.log('this.prescription',this.prescription)
+          this.solution = solution == null ? { id: 0 } : solution;
+          console.log('this.solution',this.solution)
+          this.receiver_treatment_access =
+            receiver_treatment_access == null
+              ? { id: 0 }
+              : receiver_treatment_access;
+          this.predialysis_evaluation =
+            predialysis_evaluation == null ? { id: 0 } : predialysis_evaluation;
+          this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
+          this.double_check = double_check == null ? { id: 0 } : double_check;
+          this.assessment_after_dislysis =
+            assessment_after_dislysis == null
+              ? { id: 0 }
+              : assessment_after_dislysis;
+          this.treatment_summary =
+            treatment_summary == null ? { id: 0 } : treatment_summary;
+          this.monitor_records = monitor_records == null ? [] : monitor_records;
+          this.dialysis_order =
+            dialysis_order == null ? { id: 0 } : dialysis_order;
+
+          // this.$refs.stat_order.setAdvices(this.doctor_advices)
+          // this.$refs.monitoring.setRecords(this.monitor_records)
+
+          this.admin_users = resp.data.doctors;
+          this.devices = resp.data.devices;
+          this.device_numbers = resp.data.device_numbers;
+
+          
+
+          var device_map = {};
+          for (let index = 0; index < this.devices.length; index++) {
+            const device = this.devices[index];
+            device_map[device.id] = device;
+          }
+          this.device_map = device_map;
+
+          var admin_map = {};
+          for (let index = 0; index < this.admin_users.length; index++) {
+            const admin = this.admin_users[index];
+            admin_map[admin.id] = admin;
+          }
+          this.admin_user_map = admin_map;
+
+          var device_number_map = {};
+          for (let index = 0; index < this.device_numbers.length; index++) {
+            const device_number = this.device_numbers[index];
+            device_number_map[device_number.id] = device_number;
+          }
+          this.device_number_map = device_number_map;
+        } else {
+          this.$message.error(resp.msg);
+        }
+
+        if (this.lastDialysisPrescribe != null) {
+          delete this.lastDialysisPrescribe.target_ultrafiltration;
+        }
+        if (this.solution != null) {
+          delete this.solution.target_ultrafiltration;
+        }
+      });
+    },
+    getLongAdvice() {
+      let params = {
+        patient_id: this.patient_id
+      };
+      getLongAdvice(params).then(rs => {
+        var resp = rs.data;
+        if (resp.state == 1) {
+          var status = parseInt(resp.data.status);
+
+          switch (status) {
+            case 2:
+              var totalAdvice = resp.data.advices;
+              var longAdvicesTwo = resp.data.advices_two;
+              var waitUploadAdvices = [];
+              for (let i = 0; i < totalAdvice.length; i++) {
+                totalAdvice[i]["isCheck"] = 1;
+              }
+
+              for (let i = 0; i < totalAdvice.length; i++) {
+                for (let a = 0; a < longAdvicesTwo.length; a++) {
+                  if (
+                    totalAdvice[i].template_id ==
+                      longAdvicesTwo[a].template_id &&
+                    totalAdvice[i].frequency_type ==
+                      longAdvicesTwo[a].frequency_type
+                  ) {
+                    totalAdvice[i]["isCheck"] = 0;
+                  }
+                }
+              }
+
+              for (let i = 0; i < totalAdvice.length; i++) {
+                if (totalAdvice[i].isCheck == 1) {
+                  waitUploadAdvices.push(totalAdvice[i]);
+                }
+              }
+
+              this.is_open = resp.data.is_open_remind;
+              this.longAdvices = totalAdvice;
+              this.waitUploadAdvices = waitUploadAdvices;
+              break;
+          }
+        } else {
+          this.$message.error(resp.msg);
+        }
+      });
+    },
+    adviceFunc: function() {
+      this.$emit("advice");
+    },
+    open(schedual){
+      this.date = schedual.schedule_date
+      this.patient_id = schedual.patient_id
+      this.getScheduleDetail()
+      this.getLongAdvice()
+      this.$refs.prescription.show(this.prescription);
+      
+    },
+    open1(schedual){
+      this.date = schedual.schedule_date
+      this.patient_id = schedual.patient_id
+      this.getScheduleDetail()
+      this.getLongAdvice()
+      this.$refs.treatmentSummary.show(this.treatment_summary,this.date);
+      
+    },
+    getTime(date){
+      date = new Date(date * 1000)
+      var Y = date.getFullYear() + '-';
+      var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
+      var D = (date.getDate() < 10 ? '0'+date.getDate() : date.getDate());
+      var h = (date.getHours() < 10 ? '0'+date.getHours() : date.getHours());
+      var m = (date.getMinutes() < 10 ? '0'+date.getMinutes() : date.getMinutes());
+      var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds());
+      
+      let strDate = h  + ':' + m;
+      return strDate;
     }
-  }
+  },
 };
 </script>
 
@@ -292,14 +652,15 @@ export default {
   }
   .kehu {
     @include display-flex;
-    @include align-items-center;
+    // @include align-items-center;
     @include text-align;
     @include justify-content-between;
     border-bottom: 1px #e5e5e5 solid;
     padding: 0 0 10px 20px;
     .tx {
       @include display-flex;
-      @include align-items-center;
+      // @include align-items-center;
+      width: 60%;
       img {
         width: 45px;
         height: 45px;
@@ -308,14 +669,18 @@ export default {
         margin: 0 15px 0 0;
       }
       .right {
-        float: left;
-        text-align: left;
+        // float: left;
+        // text-align: left;
+        display:flex;
+        align-items: center;
+        margin-top: 6px;
         .name {
           font-size: 15px;
           color: #34495e;
           font-weight: bold;
           height: 20px;
           line-height: 20px;
+          margin-right:10px;
           .yc {
             background: #ff7979;
             color: #fff;
@@ -334,12 +699,36 @@ export default {
           color: #7b8a97;
         }
       }
+      .tip1{
+        background: #4fc7cb;
+        border-radius: 5px;
+        text-align: center;
+        font-size: 12px;
+        display: inline-block;
+        width: 60px;
+        color: #fff;
+        width: 65px;
+        height: 24px;
+        line-height: 24px;
+      }
+      .tip2{
+        background: #7bce91;
+        border-radius: 5px;
+        text-align: center;
+        font-size: 12px;
+        display: inline-block;
+        width: 60px;
+        color: #fff;
+        width: 65px;
+        height: 24px;
+        line-height: 24px;
+      }
     }
 
     .online {
       text-align: center;
-      width: 50%;
-      border-left: 1px #e5e5e5 solid;
+      width: 30%;
+      // border-left: 1px #e5e5e5 solid;
       p {
         background: #c6cdd2;
         color: #fff;
@@ -349,6 +738,7 @@ export default {
         border-radius: 4px;
         margin: 0 auto;
         font-size: 12px;
+        margin-top:4px;
       }
       .blue {
         background: $main-color;

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1203,8 +1203,14 @@ export default {
         'dialyzer_perfusion_apparatus'
       )
       console.log('灌流器', this.dialyzerPerfusionApparatus)
-      var date = this.$route.query && this.$route.query.date
-      this.record_date = uParseTime(date, '{y}-{m}-{d}')
+      if(this.$route.query && this.$route.query.date){
+        var date = this.$route.query && this.$route.query.date
+        this.record_date = uParseTime(date, '{y}-{m}-{d}')
+      }else{
+        var date = schedual.schedule_date
+        this.record_date = uParseTime(date, '{y}-{m}-{d}')
+      }
+      
 
       if (
         this.prescription != null &&
@@ -3240,73 +3246,212 @@ export default {
       //   this.dialysisPrescription.anticoagulant_zongliang = "";
       // }
     },
-    'prescription.id': function() {
-      if (this.prescription.id > 0) {
-        for (var index in this.dialysisPrescription) {
-          this.dialysisPrescription[index] = this.prescription[index]
-        }
+    'prescription.id':{
+      immediate: true,
+      deep:true,
+      handler(oldVal,newVal) {
+        if(oldVal == newVal){
+          for (var index in this.dialysisPrescription) {
+            this.dialysisPrescription[index] = this.prescription[index]
+          }
 
-        if (this.prescription['dialysate_formulation'] == 0) {
-          this.dialysisPrescription['dialysate_formulation'] = ''
-        }
+          if (this.prescription['dialysate_formulation'] == 0) {
+            this.dialysisPrescription['dialysate_formulation'] = ''
+          }
 
-        if (this.prescription['anticoagulant'] == 0) {
-          this.dialysisPrescription['anticoagulant'] = ''
-        }
+          if (this.prescription['anticoagulant'] == 0) {
+            this.dialysisPrescription['anticoagulant'] = ''
+          }
 
-        if (this.prescription['dialysis_duration_hour'] == 0) {
-          this.dialysisPrescription['dialysis_duration_hour'] = ''
-        }
-        if (this.prescription['dialysis_duration_minute'] == 0) {
-          this.dialysisPrescription['dialysis_duration_minute'] = ''
-        }
-        if (this.prescription['blood_flow_volume'] == 0) {
-          this.dialysisPrescription['blood_flow_volume'] = ''
-        }
-        if (this.prescription['target_ultrafiltration'] == 0) {
-          this.dialysisPrescription['target_ultrafiltration'] = ''
-        }
-        if (this.prescription['dialysate_temperature'] == 0) {
-          this.dialysisPrescription['dialysate_temperature'] = ''
-        }
-        if (this.prescription['anticoagulant_shouji'] == 0) {
-          this.dialysisPrescription['anticoagulant_shouji'] = ''
-        }
-        if (this.prescription['anticoagulant_weichi'] == 0) {
-          this.dialysisPrescription['anticoagulant_weichi'] = ''
-        }
-        if (this.prescription['anticoagulant_zongliang'] == 0) {
-          this.dialysisPrescription['anticoagulant_zongliang'] = ''
-        }
-        if (this.prescription['anticoagulant_gaijiliang'] == 0) {
-          this.dialysisPrescription['anticoagulant_gaijiliang'] = ''
-        }
-        if (this.prescription['kalium'] == 0) {
-          this.dialysisPrescription['kalium'] = ''
-        }
-        if (this.prescription['sodium'] == 0) {
-          this.dialysisPrescription['sodium'] = ''
-        }
-        if (this.prescription['calcium'] == 0) {
-          this.dialysisPrescription['calcium'] = ''
-        }
-        if (this.prescription['bicarbonate'] == 0) {
-          this.dialysisPrescription['bicarbonate'] = ''
-        }
-        if (this.prescription['glucose'] == 0) {
-          this.dialysisPrescription['glucose'] = ''
-        }
-        if (this.prescription['dialysate_flow'] == 0) {
-          this.dialysisPrescription['dialysate_flow'] = ''
-        }
-        if (this.prescription['conductivity'] == 0) {
-          this.dialysisPrescription['conductivity'] = ''
-        }
-        if (this.prescription['replacement_total'] == 0) {
-          this.dialysisPrescription['replacement_total'] = ''
+          if (this.prescription['dialysis_duration_hour'] == 0) {
+            this.dialysisPrescription['dialysis_duration_hour'] = ''
+          }
+          if (this.prescription['dialysis_duration_minute'] == 0) {
+            this.dialysisPrescription['dialysis_duration_minute'] = ''
+          }
+          if (this.prescription['blood_flow_volume'] == 0) {
+            this.dialysisPrescription['blood_flow_volume'] = ''
+          }
+          if (this.prescription['target_ultrafiltration'] == 0) {
+            this.dialysisPrescription['target_ultrafiltration'] = ''
+          }
+          if (this.prescription['dialysate_temperature'] == 0) {
+            this.dialysisPrescription['dialysate_temperature'] = ''
+          }
+          if (this.prescription['anticoagulant_shouji'] == 0) {
+            this.dialysisPrescription['anticoagulant_shouji'] = ''
+          }
+          if (this.prescription['anticoagulant_weichi'] == 0) {
+            this.dialysisPrescription['anticoagulant_weichi'] = ''
+          }
+          if (this.prescription['anticoagulant_zongliang'] == 0) {
+            this.dialysisPrescription['anticoagulant_zongliang'] = ''
+          }
+          if (this.prescription['anticoagulant_gaijiliang'] == 0) {
+            this.dialysisPrescription['anticoagulant_gaijiliang'] = ''
+          }
+          if (this.prescription['kalium'] == 0) {
+            this.dialysisPrescription['kalium'] = ''
+          }
+          if (this.prescription['sodium'] == 0) {
+            this.dialysisPrescription['sodium'] = ''
+          }
+          if (this.prescription['calcium'] == 0) {
+            this.dialysisPrescription['calcium'] = ''
+          }
+          if (this.prescription['bicarbonate'] == 0) {
+            this.dialysisPrescription['bicarbonate'] = ''
+          }
+          if (this.prescription['glucose'] == 0) {
+            this.dialysisPrescription['glucose'] = ''
+          }
+          if (this.prescription['dialysate_flow'] == 0) {
+            this.dialysisPrescription['dialysate_flow'] = ''
+          }
+          if (this.prescription['conductivity'] == 0) {
+            this.dialysisPrescription['conductivity'] = ''
+          }
+          if (this.prescription['replacement_total'] == 0) {
+            this.dialysisPrescription['replacement_total'] = ''
+          }
+          if (this.prescription['target_ktv'] == 0) {
+            this.dialysisPrescription['target_ktv'] = ''
+          }
         }
-        if (this.prescription['target_ktv'] == 0) {
-          this.dialysisPrescription['target_ktv'] = ''
+        if (this.prescription.id > 0) {
+          for (var index in this.dialysisPrescription) {
+            this.dialysisPrescription[index] = this.prescription[index]
+          }
+
+          if (this.prescription['dialysate_formulation'] == 0) {
+            this.dialysisPrescription['dialysate_formulation'] = ''
+          }
+
+          if (this.prescription['anticoagulant'] == 0) {
+            this.dialysisPrescription['anticoagulant'] = ''
+          }
+
+          if (this.prescription['dialysis_duration_hour'] == 0) {
+            this.dialysisPrescription['dialysis_duration_hour'] = ''
+          }
+          if (this.prescription['dialysis_duration_minute'] == 0) {
+            this.dialysisPrescription['dialysis_duration_minute'] = ''
+          }
+          if (this.prescription['blood_flow_volume'] == 0) {
+            this.dialysisPrescription['blood_flow_volume'] = ''
+          }
+          if (this.prescription['target_ultrafiltration'] == 0) {
+            this.dialysisPrescription['target_ultrafiltration'] = ''
+          }
+          if (this.prescription['dialysate_temperature'] == 0) {
+            this.dialysisPrescription['dialysate_temperature'] = ''
+          }
+          if (this.prescription['anticoagulant_shouji'] == 0) {
+            this.dialysisPrescription['anticoagulant_shouji'] = ''
+          }
+          if (this.prescription['anticoagulant_weichi'] == 0) {
+            this.dialysisPrescription['anticoagulant_weichi'] = ''
+          }
+          if (this.prescription['anticoagulant_zongliang'] == 0) {
+            this.dialysisPrescription['anticoagulant_zongliang'] = ''
+          }
+          if (this.prescription['anticoagulant_gaijiliang'] == 0) {
+            this.dialysisPrescription['anticoagulant_gaijiliang'] = ''
+          }
+          if (this.prescription['kalium'] == 0) {
+            this.dialysisPrescription['kalium'] = ''
+          }
+          if (this.prescription['sodium'] == 0) {
+            this.dialysisPrescription['sodium'] = ''
+          }
+          if (this.prescription['calcium'] == 0) {
+            this.dialysisPrescription['calcium'] = ''
+          }
+          if (this.prescription['bicarbonate'] == 0) {
+            this.dialysisPrescription['bicarbonate'] = ''
+          }
+          if (this.prescription['glucose'] == 0) {
+            this.dialysisPrescription['glucose'] = ''
+          }
+          if (this.prescription['dialysate_flow'] == 0) {
+            this.dialysisPrescription['dialysate_flow'] = ''
+          }
+          if (this.prescription['conductivity'] == 0) {
+            this.dialysisPrescription['conductivity'] = ''
+          }
+          if (this.prescription['replacement_total'] == 0) {
+            this.dialysisPrescription['replacement_total'] = ''
+          }
+          if (this.prescription['target_ktv'] == 0) {
+            this.dialysisPrescription['target_ktv'] = ''
+          }
+        }else if(this.prescription.id == 0){
+          for (var index in this.dialysisPrescription) {
+            this.dialysisPrescription[index] = this.prescription[index]
+          }
+
+          if (this.prescription['dialysate_formulation'] == 0) {
+            this.dialysisPrescription['dialysate_formulation'] = ''
+          }
+
+          if (this.prescription['anticoagulant'] == 0) {
+            this.dialysisPrescription['anticoagulant'] = ''
+          }
+
+          if (this.prescription['dialysis_duration_hour'] == 0) {
+            this.dialysisPrescription['dialysis_duration_hour'] = ''
+          }
+          if (this.prescription['dialysis_duration_minute'] == 0) {
+            this.dialysisPrescription['dialysis_duration_minute'] = ''
+          }
+          if (this.prescription['blood_flow_volume'] == 0) {
+            this.dialysisPrescription['blood_flow_volume'] = ''
+          }
+          if (this.prescription['target_ultrafiltration'] == 0) {
+            this.dialysisPrescription['target_ultrafiltration'] = ''
+          }
+          if (this.prescription['dialysate_temperature'] == 0) {
+            this.dialysisPrescription['dialysate_temperature'] = ''
+          }
+          if (this.prescription['anticoagulant_shouji'] == 0) {
+            this.dialysisPrescription['anticoagulant_shouji'] = ''
+          }
+          if (this.prescription['anticoagulant_weichi'] == 0) {
+            this.dialysisPrescription['anticoagulant_weichi'] = ''
+          }
+          if (this.prescription['anticoagulant_zongliang'] == 0) {
+            this.dialysisPrescription['anticoagulant_zongliang'] = ''
+          }
+          if (this.prescription['anticoagulant_gaijiliang'] == 0) {
+            this.dialysisPrescription['anticoagulant_gaijiliang'] = ''
+          }
+          if (this.prescription['kalium'] == 0) {
+            this.dialysisPrescription['kalium'] = ''
+          }
+          if (this.prescription['sodium'] == 0) {
+            this.dialysisPrescription['sodium'] = ''
+          }
+          if (this.prescription['calcium'] == 0) {
+            this.dialysisPrescription['calcium'] = ''
+          }
+          if (this.prescription['bicarbonate'] == 0) {
+            this.dialysisPrescription['bicarbonate'] = ''
+          }
+          if (this.prescription['glucose'] == 0) {
+            this.dialysisPrescription['glucose'] = ''
+          }
+          if (this.prescription['dialysate_flow'] == 0) {
+            this.dialysisPrescription['dialysate_flow'] = ''
+          }
+          if (this.prescription['conductivity'] == 0) {
+            this.dialysisPrescription['conductivity'] = ''
+          }
+          if (this.prescription['replacement_total'] == 0) {
+            this.dialysisPrescription['replacement_total'] = ''
+          }
+          if (this.prescription['target_ktv'] == 0) {
+            this.dialysisPrescription['target_ktv'] = ''
+          }
         }
       }
     },

src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue

@@ -148,7 +148,7 @@ export default {
       default: () => {
         return { id: 0 }
       }
-    }
+    },
   },
   data() {
     return {
@@ -174,13 +174,22 @@ export default {
         zl_doctor: '',
         nursing_record: '',
         special_record: ''
-      }
+      },
+      //
+      date:''
     }
   },
   methods: {
-    show(record) {
+    show(record,date) {
       this.isVisibility = true
       this.record = record
+      console.log(111111111111111,date)
+      if(date){
+        this.date = date
+        this.record_date = uParseTime(this.date, '{y}-{m}-{d}')
+        console.log(22222222222,this.record_date)
+      }
+      
       console.log('治疗小结', record)
       this.getPermission()
     },
@@ -364,10 +373,43 @@ export default {
   },
   watch: {
     isVisibility(val) {},
-    'treatment_summary.id': function() {
-      if (this.treatment_summary.id > 0) {
-        for (var index in this.treatmentSummary) {
-          this.treatmentSummary[index] = this.treatment_summary[index]
+    'treatment_summary.id': {
+      immediate: true,
+      deep:true,
+      handler(oldVal,newVal) {
+        if(oldVal == newVal){
+          for (var index in this.treatmentSummary) {
+            this.treatmentSummary[index] = this.treatment_summary[index]
+          }
+        }
+        if (this.treatment_summary.id > 0) {
+          for (var index in this.treatmentSummary) {
+            this.value = ''
+            this.value2 = ''
+            this.value3 = ''
+            this.value4 = ''
+            this.treatmentSummary[index] = this.treatment_summary[index]
+          }
+        }else if(this.treatment_summary.id == 0){
+          for (var index in this.treatmentSummary) {
+            // this.treatmentSummary[index] = this.treatment_summary[index]
+            this.value = ''
+            this.value2 = ''
+            this.value3 = ''
+            this.value4 = ''
+            this.treatmentSummary = {
+              mission: '',
+              dialysis_summary: '',
+              sj_nurse: '',
+              zl_nurse: '',
+              hd_nurse: '',
+              xj_nurse: '',
+              zl_doctor: '',
+              nursing_record: '',
+              special_record: ''
+            }
+          }
+          
         }
       }
     }
@@ -380,8 +422,13 @@ export default {
 
     this.specialRecord = getDataConfig('special_record', 'special_record')
 
-    var date = this.$route.query && this.$route.query.date
-    this.record_date = uParseTime(date, '{y}-{m}-{d}')
+    // var date = this.$route.query && this.$route.query.date
+    // this.record_date = uParseTime(date, '{y}-{m}-{d}')
+
+    if(this.$route.query && this.$route.query.date){
+      var date = this.$route.query && this.$route.query.date
+      this.record_date = uParseTime(date, '{y}-{m}-{d}')
+    }
   }
 }
 </script>

src/xt_pages/dialysis/schedualPatient.vue

@@ -4,12 +4,12 @@
     <bread-crumb :crumbs='crumbs'></bread-crumb>
   </div>
   <div class="app-container">
-    <div class="cell clearfix">
-      <!-- <label class="title"><span class="name">病人查询</span> : </label> -->
+    <!-- <div class="cell clearfix">
+      <label class="title"><span class="name">病人查询</span> : </label>
       <el-input size="small" style="width: 280px;" v-model.trim="search_input" class="filter-item"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
-    </div>
-    <div class="cell clearfix">
+    </div> -->
+    <!-- <div class="cell clearfix">
       <label class="title"><span class="name">日期查询</span> : </label>
       <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
     </div>
@@ -30,12 +30,54 @@
           </li>
         </ul>
       </div>
+    </div> -->
+    <div class="cell clearfix">
+      <label class="title"><span class="name">患者状态</span> : </label>
+      <div class="time ">
+        <ul class="">
+          <li v-for="option in patient_state" :key="option.value" @click="handleStateChange(option.value)" :class="patientStateVal == option.value ? 'active' : ''" >{{option.label}}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cell clearfix">
+      <label class="title"><span class="name">治疗状态</span> : </label>
+      <div class="time ">
+        <ul class="">
+          <li v-for="option in treat_state" :key="option.value" @click="handleTreatChange(option.value)" :class="treatStateVal == option.value ? 'active' : ''" >{{option.label}}
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="cell clearfix" style="margin-bottom:10px;">
+      <label class="title"><span class="name">其他查询</span> : </label>
+      <el-select v-model="schedule_type_selected" placeholder="班次" style="margin-right:10px;" @change="handletimeType">
+        <el-option
+          v-for="item in schedule_type_options"
+          :key="item.value"
+          :label="item.text"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-select v-model="zone_selected" placeholder="分区" style="margin-right:10px;" @change="handleZoneChange">
+        <el-option
+          v-for="item in zone_options"
+          :key="item.id"
+          :label="item.text"
+          :value="item.id">
+        </el-option>
+      </el-select>
+      <label class="title"><span class="name">日期查询</span> : </label>
+      <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
+      <el-input size="small" style="width: 180px;" v-model.trim="search_input" class="filter-item"/>
+      <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
     </div>
 
     <div class="PatientArea">
-      <div v-for="zone_schedule in filtedSchedules" :key="zone_schedule.zone_id" class="list clearfix">
-        <h3 class="title">{{zone_schedule.zone_name}}</h3>
-        <patient-box :schedules="zone_schedule.schedules"></patient-box>
+      <div v-for="zone_schedule in allPatient" :key="zone_schedule.zone_id" class="list clearfix" style="display:flex;">
+        <!-- <h3 style="width:40px;" class="title">{{zone_schedule.zone_name}}</h3> -->
+        <div v-if="zone_schedule.schedules.length > 0 && patientStateVal != 1" style="font-size:16px;font-weight: bold;color: #34495e;margin-right:10px;">{{zone_schedule.zone_name}}</div>
+        <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' style="flex:1"></patient-box>
       </div>
       <div class="NoData" v-show="filtedSchedules.length == 0">
         <img src="@/assets/img/data.jpg" alt="">
@@ -106,7 +148,24 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
 
         // search_input 和 search_keyword，使输入关键字时不会经常刷新 filtedSchedules
         search_keyword: '', // 确定用于搜索的关键字
-        search_input: '' // 输入中的关键字
+        search_input: '', // 输入中的关键字
+
+        //
+        patient_state:[
+          {value: 0,label: '全部'},
+          {value: 1,label: '已签到'},
+          {value: 2,label: '未签到'},
+          {value: 3,label: '已上机'},
+          {value: 4,label: '已下机'},
+        ],
+        patientStateVal: 0,
+        treat_state:[
+          {value: 0,label: '全部'},
+          {value: 1,label: '待开处方'},
+          {value: 2,label: '待开小结'},
+        ],
+        treatStateVal: 0,
+        allPatient:[]
       }
     },
     computed: {
@@ -187,38 +246,48 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
     created() {
       var schedule_type_selected = this.$store.getters.schedule_type_selected
       var zone_selected = this.$store.getters.zone_selected
+      var patient_state_selected = this.$store.getters.patient_state_selected
+      var treat_state_selected = this.$store.getters.treat_state_selected
       if (schedule_type_selected) {
         this.schedule_type_selected = schedule_type_selected.schedule_type_selected
       }
       if (zone_selected) {
         this.zone_selected = zone_selected.zone_selected
       }
+      if (patient_state_selected) {
+        this.patientStateVal = patient_state_selected.patient_state_selected
+      }
+      if (treat_state_selected) {
+        this.treatStateVal = treat_state_selected.treat_state_selected
+      }
       this.getInitData()
     },
     methods: {
-      handletimeType: function(index) {
-        this.schedule_type_selected = index
-        this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
-        this.search_keyword = this.search_input = ''
-        // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
-        //   zone: this.zone_selected,
-        //   schedule_type: this.schedule_type_selected,
-        //   schedule_date: this.selected_date,
-        // })
-      },
-      handleZoneChange: function(index) {
-        this.zone_selected = index
-        this.$store.dispatch('SetZoneSelected', { zone_selected: index })
-        this.search_keyword = this.search_input = ''
-        // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
-        //   zone: this.zone_selected,
-        //   schedule_type: this.schedule_type_selected,
-        //   schedule_date: this.selected_date,
-        // })
-      },
+      // handletimeType: function(index) {
+      //   this.schedule_type_selected = index
+      //   this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
+      //   this.search_keyword = this.search_input = ''
+      //   // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
+      //   //   zone: this.zone_selected,
+      //   //   schedule_type: this.schedule_type_selected,
+      //   //   schedule_date: this.selected_date,
+      //   // })
+      // },
+      // handleZoneChange: function(index) {
+      //   this.zone_selected = index
+      //   this.$store.dispatch('SetZoneSelected', { zone_selected: index })
+      //   this.search_keyword = this.search_input = ''
+      //   // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
+      //   //   zone: this.zone_selected,
+      //   //   schedule_type: this.schedule_type_selected,
+      //   //   schedule_date: this.selected_date,
+      //   // })
+      // },
       handleScheduleDateChange: function() {
         this.zone_selected = 0
         this.schedule_type_selected = 0
+        this.patientStateVal = 0
+        this.treatStateVal = 0
         this.search_keyword = this.search_input = ''
         // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
         //   zone: this.zone_selected,
@@ -231,6 +300,14 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         this.search_keyword = this.search_input
         this.schedule_type_selected = 0
         this.zone_selected = 0
+        this.treatStateVal = 0
+        this.patientStateVal = 0
+        if(this.search_input != ''){
+          this.allPatient = this.filtedSchedules
+        }else{
+          this.getData()
+        }
+        
       },
       getInitData: function() {
         getDialysisRecordInitData().then(rs => {
@@ -245,6 +322,8 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             }
             this.zone_options = zone_options
             this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
+            this.getData()
+            console.log(1111111111111,this.zone_schedules)
           } else {
             this.$message.error(resp.msg)
           }
@@ -286,6 +365,194 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           zone_schedules.push({ zone_id: zone.id, zone_name: zone.text, schedules: schedules })
         }
         return zone_schedules
+      },
+
+      //
+      handleStateChange: function(index) {
+        this.patientStateVal = index
+        this.$store.dispatch('SetPatientStateSelected', { patient_state_selected: index })
+        this.search_keyword = this.search_input = ''
+        this.getData()
+      },
+      handleTreatChange: function(index) {
+        this.treatStateVal = index
+        this.$store.dispatch('SetTreatStateSelected', { treat_state_selected: index })
+        this.search_keyword = this.search_input = ''
+        this.getData()
+      },
+      handletimeType: function(index) {
+        this.schedule_type_selected = index
+        this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
+        this.search_keyword = this.search_input = ''
+        this.getData()
+      },
+      //分区
+      handleZoneChange: function(index) {
+        this.zone_selected = index
+        this.$store.dispatch('SetZoneSelected', { zone_selected: index })
+        this.search_keyword = this.search_input = ''
+        this.getData()
+      },
+      getData(){
+    
+        let patientArr = []
+        patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
+        // for (let i = 0; i < patientArr.length; i++) {
+          
+        //   for (let j = 0; j < patientArr[i].schedules.length; j++) {
+        //     if (patientArr[i].schedules.length > 0 && patientArr[i].schedules[j].dialysis_order != null) {
+        //       // 删除元素后改变i的值
+              
+        //       console.log("候诊区",patientArr[i].schedules[j])
+        //       patientArr[i].schedules.splice(j--, 1);
+        //     }
+        //   }
+        // }
+        let arr1 = []
+        if(this.patientStateVal == 0){
+          arr1 = patientArr
+        }else if(this.patientStateVal == 1){
+          let arr = []
+          arr = patientArr
+          for (let i = 0; i <arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || arr[i].schedules[j].assessment_before_dislysis.weight_before == '' || arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' || arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == '')) {
+                // 删除元素后改变i的值
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          console.log("执行1",arr)
+          arr1 = arr
+        }else if(this.patientStateVal == 2){
+          let arr = []
+          arr = patientArr
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis != null && (arr[i].schedules[j].assessment_before_dislysis.weight_before != 0 || arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure != 0 || arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure != 0))) {
+                // 删除元素后改变i的值
+                console.log('几次')
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          console.log("执行2",arr)
+          arr1 = arr
+        }else if(this.patientStateVal == 3){
+          let arr = []
+          arr = patientArr
+          for (let i = 0; i <arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].dialysis_order == null || (arr[i].schedules[j].dialysis_order != null && arr[i].schedules[j].dialysis_order.stage != 1))) {
+                // 删除元素后改变i的值
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          console.log("执行1",arr)
+          arr1 = arr
+        }else if(this.patientStateVal == 4){
+          let arr = []
+          arr = patientArr
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].dialysis_order == null || (arr[i].schedules[j].dialysis_order != null && arr[i].schedules[j].dialysis_order.stage != 2))) {
+                // 删除元素后改变i的值
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          console.log("执行2",arr)
+          arr1 = arr
+        }
+
+        let arr2 = []
+        if(this.treatStateVal == 0){
+          arr2 = JSON.parse(JSON.stringify(arr1))
+        }else if(this.treatStateVal == 1){
+          let arr = []
+          arr = JSON.parse(JSON.stringify(arr1))
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].prescription != null || arr[i].schedules[j].prescription != null ? arr[i].schedules[j].prescription.creater != 0 : false)) {
+                // 删除元素后改变i的值
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          arr2 = arr
+        }else if(this.treatStateVal == 2){
+          let arr = []
+          arr = JSON.parse(JSON.stringify(arr1))
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (arr[i].schedules.length > 0 && arr[i].schedules[j].treatment_summary != null && arr[i].schedules[j].treatment_summary.dialysis_summary != '') {
+                // 删除元素后改变i的值
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          arr2 = arr
+        }
+        
+
+        let arr3 = []
+        if(this.schedule_type_selected == 0){
+          arr3 = JSON.parse(JSON.stringify(arr2))
+        }else{
+          let arr = []
+          arr = JSON.parse(JSON.stringify(arr2))
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (this.schedule_type_selected != arr[i].schedules[j].schedule_type) {
+                // 删除元素后改变i的值
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          arr3 = arr
+        }
+        
+
+        let arr4 = []
+        if(this.zone_selected == 0){
+          arr4 = JSON.parse(JSON.stringify(arr3))
+        }else{
+          let arr = []
+          arr = JSON.parse(JSON.stringify(arr3))
+          for (let i = 0; i < arr.length; i++) {
+            if (this.zone_selected != arr[i].zone_id) {
+              // 删除元素后改变i的值
+              arr.splice(i--, 1);
+            }
+          }
+          arr4 = arr
+        }
+        
+        
+        if(this.patientStateVal == 1){
+          arr4.map((item,index) => {
+            if(index != 0){
+              arr4[0].schedules.push(...arr4[index].schedules)
+              arr4[index].schedules = []
+            }
+          })
+          arr4[0].schedules.map(item => {
+            item.created_time = item.assessment_before_dislysis.created_time
+          })
+          arr4[0].schedules.sort(this.compare('created_time'))
+          this.allPatient = arr4
+          console.log("arr4",arr4)
+        }else{
+          this.allPatient = arr4
+        }
+      },
+      compare(property){
+        return function(a,b){
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
+        }
       }
     }
   }

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

@@ -235,8 +235,14 @@ export default {
                   //我这边就两个柱子，大体就两个柱子颜色渐变，所以数组只有两个值，多个颜色就多个值
                   var colorList = [
                     ["#A9E0F3", "#9FBDFC"],
-
-                    ["#FFD7C0", "#FF9994"]
+                    ["#A9E0F3", "#9FBDFC"],
+                    ["#A9E0F3", "#9FBDFC"],
+                    ["#FFD7C0", "#FF9994"],
+                    ["#FFD7C0", "#FF9994"],
+                    ["#FFD7C0", "#FF9994"],
+                    ["#D7C3FD", "#B3A8F7"],
+                    ["#D7C3FD", "#B3A8F7"],
+                    ["#D7C3FD", "#B3A8F7"]
                   ];
 
                   var index = params.dataIndex;