8月15日

src/xt_pages/dialysis/PatientBox.vue

             核酸检测日期:<span v-if="schedule.dialysis_order!=null">{{getTimeOne(schedule.dialysis_order.nuclein_date)}}</span>
           </span>
         </p>
+        <p>
+          <span v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
+            透析时长:
+             <span v-if="schedule.prescription!=null && schedule.prescription.dialysis_duration_hour >0">{{schedule.prescription.dialysis_duration_hour}}时</span>
+             <span v-if="schedule.prescription!=null && schedule.prescription.dialysis_duration_minute>0">{{schedule.prescription.dialysis_duration_minute}}分</span>
+          </span>
+        </p>
         <p>
           <span>
               目标超滤量:
                <span v-if="$store.getters.xt_user.org.id!=10340"> {{schedule.prescription? schedule.prescription.target_ultrafiltration: ""}}</span>
             </span>
           </span>
-
-          <span  v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
+        </p>
+        <p>
+           <span  v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
              抗凝剂:
              <span v-if="schedule.prescription!=null">
                 <span v-if="schedule.prescription.anticoagulant == 1">无肝素</span>
              <span v-if="schedule.dialysis_order!=null">{{schedule.dialysis_order.dialysis_dialyszers}}</span>
              <span v-if="schedule.dialysis_order!=null">{{schedule.dialysis_order.dialysis_irrigation}}</span>
         </p>
+      
         <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
            备注:{{schedule.patient.sch_remark}}
         </p>

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

         // this.form.breathing_rated =  resp.monitor.breathing_rated ? resp.monitor.breathing_rated : '';
         this.form.systolic_bp = ""; // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = ""; // this.last_monitor_record.diastolic_blood_pressure;
-        this.form.blood_flow_volume = resp.monitor.blood_flow_volume
-          ? resp.monitor.blood_flow_volume
-          : "";
+        this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume: "";
         // 静脉压
         if (this.org_id == 10060 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10387) {
           this.form.venous_pressure = resp.monitor.venous_pressure;
         } else {
           this.form.transmembrane_pressure = ""; // this.last_monitor_record.transmembrane_pressure;
         }
-        if (this.org_id == 10318 || this.org_id == 9671) {
-         
+        if (this.org_id == 10318) {
           this.form.breathing_rated = resp.monitor.breathing_rate;
+        }else if(this.org_id == 9671){
+          this.form.breathing_rated = "20"
+        }else if(this.org_id == 10340){
+         this.form.breathing_rated = "20"
         } else {
           this.form.breathing_rated = "";
         }
         
          if(this.org_id == 9675 || this.org_id == 9671 || this.org_id == 10340){
             this.form.temperature = "36.5"
+
          }else{
            this.form.temperature = resp.monitor.temperature ? resp.monitor.temperature: "";
          }
         this.form.sodium_concentration = resp.monitor.sodium_concentration
           ? resp.monitor.sodium_concentration
           : "";
-        this.form.conductivity = resp.monitor.conductivity
-          ? resp.monitor.conductivity
-          : "";
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+          this.form.conductivity = 14
+        }else{
+           this.form.conductivity = resp.monitor.conductivity? resp.monitor.conductivity: "";
+        }
+      
         this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant
           ? resp.monitor.monitor_anticoagulant
           : "";
         this.form.heparin_amount = resp.monitor.heparin_amount
           ? resp.monitor.heparin_amount
           : "";
+         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+            this.form.dialysate_temperature = 36.5
+            
+         }
       });
     },
 

src/xt_pages/workforce/schedulePrint.vue

        <label class="title"> <span class="name">日期查询</span> : </label>
        <el-date-picker
         @change="changeTime"
+        format="yyyy-MM-dd" 
+        value-format="yyyy-MM-dd"
         v-model="listQuery.schedule_date"
         type="date"
         placeholder="选择日期">
           </template>
 
        </el-table-column>
-      
+       <el-table-column  label="班次" align="center">
+           <template slot-scope="scope">
+            <span v-if="scope.row.schedule_type ==1">上午</span>
+            <span v-if="scope.row.schedule_type==2">下午</span>
+            <span v-if="scope.row.schedule_type==3">晚上</span>
+          </template>
+        </el-table-column>
         <el-table-column  label="分区" align="center">
            <template slot-scope="scope">
             <span>