Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/PatientBox.vue

@@ -28,6 +28,7 @@
             <span class="num"
               >{{ genderText(schedule) }} | {{ getAge(schedule) }} 岁</span
             >
+            <div style="margin-left:10px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
           </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)">
@@ -36,22 +37,25 @@
             <span class="tip2" v-if="schedule.treatment_summary == null || schedule.treatment_summary.dialysis_summary == ''" @click.stop="open1(schedule)">
               开小结
             </span>
+            <span class="online" v-show="computeState(schedule) != 4">
+              <span :class="stateColor(schedule)">{{ stateText(schedule) }}</span>
+            </span>
           </div>
         </div>
         </div>
         <div>
-          <div style="height:24px;margin-right: 10px;">
+          <!-- <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:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div>
+          </div> -->
+          <!-- <div style="margin-top:13px;font-size:12px;color:#34495e;margin-right: 5px;" v-if="schedule.assessment_before_dislysis && patientStateVal == 1">签到时间：{{ getTime(schedule.assessment_before_dislysis.created_time) }}</div> -->
         </div>
       </div>
       <div class="dislysisInfo">
         <p>体重(前/后kg):{{ schedule.assessment_before_dislysis ? schedule.assessment_before_dislysis.weight_before : '' }}/{{ schedule.assessment_after_dislysis ? schedule.assessment_after_dislysis.weight_after : '' }}</p>
         <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}</p>
-        <p>透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}</p>
+        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}</p>
       </div>
       <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
         <ul>
@@ -680,7 +684,7 @@ export default {
     .tx {
       @include display-flex;
       // @include align-items-center;
-      width: 60%;
+      width: 90%;
       img {
         width: 45px;
         height: 45px;
@@ -749,7 +753,7 @@ export default {
       text-align: center;
       width: 30%;
       // border-left: 1px #e5e5e5 solid;
-      p {
+      span {
         background: #c6cdd2;
         color: #fff;
         width: 65px;
@@ -759,6 +763,7 @@ export default {
         margin: 0 auto;
         font-size: 12px;
         margin-top:4px;
+        display: inline-block;
       }
       .blue {
         background: $main-color;
@@ -787,6 +792,9 @@ export default {
     padding-left: 80px;
     >p{
       margin-bottom: 5px;
+      overflow:hidden;
+      text-overflow:ellipsis;
+      white-space:nowrap;
     }
   }
 }

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -16,69 +16,180 @@
           <div v-for="(record, index) in records" :key="record.id" class="print_page_main_content">
               <div id="dialysis-print-box-1">
                 <div id="dialysis-print-box-1-1" class="dialysis-print-order print-template-two print_page_main_content">
-                <div style="width:100%;text-align:center;">
+                <!-- <div style="width:100%;text-align:center;">
                     <div
                     class="order-yy-name"
                     style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;"
                     >
                     {{ orgname }}
                     </div>
-                </div>
+                </div> -->
                 <div style="display:inline-block;width:100%;text-align:center;">
                     <div
                     class="order-title"
                     style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;"
                     >
-                    血液净化治疗记录单
+                    {{ orgname }}  血液净化治疗记录单
                     </div>
                 </div>
                 <div class="row" style="display:flex;justify-content: space-between;">
-                    <div class="inline_block" style="margin-right:30px;">
+                    <div class="inline_block" style="margin-right:5px;">
                         日期 <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{y}") }}</div>年
                         <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{m}") }}</div>月
                         <div class="inline_block under_line" style="width:50px">{{ getTime(record.schedule_date, "{d}") }}</div>日
                     </div>
-                    <div class="inline_block" style="margin-right:30px;">
-                        机器编号 
-                        <div class="inline_block under_line" style="width:80px;">
-                          {{ record.device_zone.name && record.device_number.number ? getNewNumber(record.device_zone.name,record.device_number.number) : '' }}
-                        <!-- {{ record.device_zone.name && record.device_number.number ? record.device_zone.name + record.device_number.number : '' }} -->
-                        </div>
-                    </div>
-                    <div class="inline_block" style="margin-right:30px;">
-                        病案号 <div class="inline_block under_line" style="width:80px">{{ record.patient.dialysis_no }}</div>
-                    </div>
-                </div>
-                <div style="border-bottom: 2px solid #000;width:100%;"></div>
-                <div class="row">
-                    <div class="inline_block" style="margin-right:30px;">
+                    <div class="inline_block" style="margin-right:5px;">
                         姓名 
                         <div class="inline_block under_line" style="width:100px;text-align: center;">
                             {{ record.patient.name ? record.patient.name : "" }}
                         </div>
                     </div>
-                    <div class="inline_block" style="margin-right:30px;">
+                    <div class="inline_block" style="margin-right:5px;">
                         性别&nbsp;&nbsp;&nbsp;&nbsp;
                         <label-box :isChecked="record.patient.gender == 1" showValue="男" ></label-box>&nbsp;
                         <label-box :isChecked="record.patient.gender == 2" showValue="女" ></label-box>
                     </div>
-                    <div class="inline_block" style="margin-right:30px;">
+                    <div class="inline_block" style="margin-right:5px;">
                         年龄：
                         <div class="under_line" style="width: 50px;text-align: center">
                             {{ getNewAge(record.patient.id_card_no) }}
                         </div>
                         岁
                     </div>
+                    <div class="inline_block" style="margin-right:5px;">
+                        机器编号 
+                        <div class="inline_block under_line" style="width:80px;">
+                          {{ record.device_zone.name && record.device_number.number ? getNewNumber(record.device_zone.name,record.device_number.number) : '' }}
+                        <!-- {{ record.device_zone.name && record.device_number.number ? record.device_zone.name + record.device_number.number : '' }} -->
+                        </div>
+                    </div>
+                    <div class="inline_block">
+                        病案号 <div class="inline_block under_line" style="width:80px">{{ record.patient.dialysis_no }}</div>
+                    </div>
                 </div>
+                <div style="border-bottom: 2px solid #000;width:100%;"></div>
                 <div class="row">
                     <div class="inline_block" style="margin-right:30px;">
                         血液净化方式 
-                        <div class="inline_block under_line" style="width:300px;text-align: center;">
-                            <label-box :isChecked="record.prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>&nbsp;&nbsp;&nbsp;&nbsp;
-                            <label-box :isChecked="record.prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>&nbsp;&nbsp;&nbsp;&nbsp;
-                            <!-- <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>
-                            <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box> -->
-                            <label-box :isChecked="record.prescription.mode_id == 3 ? true : false" showValue="HD+HP"></label-box>
+                        <div
+                          class="under_line"
+                          style="width: 100px;text-align: center;font-weight:600;"
+                          v-if="!record.prescription"
+                        ></div>
+                        <div
+                          v-if="record.prescription"
+                          style="display: inline-block;"
+                        >
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="!record.prescription.mode_id"
+                          ></div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 1"
+                          >
+                            HD
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 2"
+                          >
+                            HDF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 3"
+                          >
+                            HD+HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 4"
+                          >
+                            HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 5"
+                          >
+                            HF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 6"
+                          >
+                            SCUF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 7"
+                          >
+                            IUF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 8"
+                          >
+                            HFHD
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 9"
+                          >
+                            HFHD+HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 10"
+                          >
+                            PHF
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 11"
+                          >
+                            HFR
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 12"
+                          >
+                            HDF+HP
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 13"
+                          >
+                            CRRT
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 14"
+                          >
+                            腹水回输
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 19"
+                          >
+                            IUF+HD
+                          </div>
                         </div>
                     </div>
                     <div class="inline_block" style="margin-right:30px;">
@@ -87,6 +198,12 @@
                             {{ record.prescription.dialyzer_perfusion_apparatus ? record.prescription.dialyzer_perfusion_apparatus : ''}}
                         </div>
                     </div>
+                    <div class="inline_block" style="margin-right:30px;">
+                        透析液配方 
+                        <div class="inline_block under_line" style="width:150px;text-align: center;">
+                            {{ record.prescription.dialysate_formulation ? dialysateFormulationName(record.prescription.dialysate_formulation) : ''}}
+                        </div>
+                    </div>
                 </div>
                 <div class="row">
                     血管通路 
@@ -118,6 +235,20 @@
                     &nbsp;
                     </div>
                 </div>
+                <div class="row">
+                  <div class="inline_block" style="margin-right:30px;">
+                      导管 
+                      <div class="inline_block under_line" style="width:200px;text-align: left;">
+                          {{ record.assessment_before_dislysis.catheter ? record.assessment_before_dislysis.catheter : ''}}
+                      </div>
+                  </div>
+                  <div class="inline_block" style="margin-right:30px;">
+                      内瘘 
+                      <div class="inline_block under_line" style="width:200px;text-align: left;">
+                          {{ record.assessment_before_dislysis.internal_fistula ? record.assessment_before_dislysis.internal_fistula : ''}}
+                      </div>
+                  </div>
+                </div>
                 <div class="row">
                     抗凝药物 
                     <div class="inline_block under_line" style="width:92%;text-align: left;">
@@ -211,29 +342,88 @@
                 </div>
                 <div class="row">
                     透前评估 
-                    <div class="inline_block under_line" style="width:92%;text-align: left;">
-                    <div class="inline_block" style="margin-right:30px;">
-                        体温
-                        <div class="inline_block" style="width:50px;text-align:center">
-                        {{ record.assessment_before_dislysis.temperature ? record.assessment_before_dislysis.temperature : "" }}
-                        </div>℃
-                    </div>
-                    <div class="inline_block" style="margin-right:30px;">
-                        血压
-                        <div class="inline_block" style="width:100px;text-align:center">
-                        {{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : "" }}/
-                        {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : "" }}
-                        </div>mmHg
-                    </div>
-                    <div class="inline_block" style="margin-right:30px;">
-                        脉搏
-                        <div class="inline_block" style="width:50px;text-align:center">
-                        {{ record.assessment_before_dislysis.pulse_frequency ? record.assessment_before_dislysis.pulse_frequency : "" }}
-                        </div>次/分
-                    </div>
+                    <div class="inline_block under_line" style="width:50%;text-align: left;">
+                      <div class="inline_block" style="margin-right:30px;">
+                          体温
+                          <div class="inline_block" style="width:50px;text-align:center">
+                          {{ record.assessment_before_dislysis.temperature ? record.assessment_before_dislysis.temperature : "" }}
+                          </div>℃
+                      </div>
+                      <div class="inline_block" style="margin-right:30px;">
+                          血压
+                          <div class="inline_block" style="width:100px;text-align:center">
+                          {{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : "" }}/
+                          {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : "" }}
+                          </div>mmHg
+                      </div>
+                      <div class="inline_block" style="margin-right:30px;">
+                          脉搏
+                          <div class="inline_block" style="width:50px;text-align:center">
+                          {{ record.assessment_before_dislysis.pulse_frequency ? record.assessment_before_dislysis.pulse_frequency : "" }}
+                          </div>次/分
+                      </div>
+                      入室方式
+                      <div class="inline_block under_line" style="width:80px;text-align: center;margin-right:30px;">&nbsp;
+                        <span v-if='record.receive_assessment.way == 1'>步行</span>
+                        <span v-if='record.receive_assessment.way == 2'>扶行</span>
+                        <span v-if='record.receive_assessment.way == 3'>轮椅</span>
+                        <span v-if='record.receive_assessment.way == 4'>平车</span>
+                      </div>
+                      透析频次(次/周)
+                      <div class="inline_block under_line" style="width:80px;text-align: center;">
+                        {{ record.assessment_before_dislysis.dialysis_count ? record.assessment_before_dislysis.dialysis_count : "" }}
+                      </div>
             
                     </div>
                 </div>
+                <div class="row">
+                  透析前症状
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    {{ record.assessment_before_dislysis.symptom_before_dialysis ? record.assessment_before_dislysis.symptom_before_dialysis : "" }}
+                  </div>
+                  水肿
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    {{ record.assessment_before_dislysis.edema ? record.assessment_before_dislysis.edema : "" }}
+                  </div>
+                  出血
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    {{ record.assessment_before_dislysis.is_hemorrhage == 1 && record.assessment_before_dislysis.hemorrhage ? record.assessment_before_dislysis.hemorrhage : "" }}
+                  </div>
+                  跌倒风险预防措施
+                  <div class="inline_block under_line" style="width:100px;text-align: center;">
+                    {{ record.receive_assessment.precaution ? record.receive_assessment.precaution : '' }}
+                  </div>
+                </div>
+                <div class="row">
+                  上机医生
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">{{getAdminUser(record.prescription, 'prescription_doctor')}}</span>
+                    <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.prescription, 'prescription_doctor')" />
+                    </span>
+                  </div>
+                  冲管护士
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    <span v-if="setAdminUserES(record.dialysis_order, 'washpipe_nurse') == ''">{{getAdminUser(record.dialysis_order, 'washpipe_nurse')}}</span>
+                    <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'washpipe_nurse')" />
+                    </span>
+                  </div>
+                  穿刺者
+                  <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+                    <span v-if="setAdminUserES(record.dialysis_order, 'puncture_nurse') == ''">{{getAdminUser(record.dialysis_order, 'puncture_nurse')}}</span>
+                    <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'puncture_nurse')" />
+                    </span>
+                  </div>
+                  上机护士
+                  <div class="inline_block under_line" style="width:100px;text-align: center;">
+                    <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
+                    <span v-else>
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" />
+                    </span>
+                  </div>
+                </div>
 
                 <table class="print-table" border="1">
                     <tr>
@@ -325,9 +515,9 @@
                         <td width="60">TMP</td>
                         <td width="60">电导率</td>
                         <td width="40">温度</td>
-                        <td width="60">透析液流量</td>
+                        <td width="40">透析液流量</td>
                         <td width="60">UF/hr</td>
-                        <td width="100">症状处理</td>
+                        <td width="200">病情变化处理方式及结果</td>
                         </tr>
 
 
@@ -362,14 +552,14 @@
                 <table class="print-table" border="1">
                     <tbody>
                     <tr>
-                        <td width="40" rowspan="2" style="padding-left:5px;border:none;border-right:1px solid #000;">
+                        <td width="70" rowspan="3" style="padding-left:5px;border:none;border-right:1px solid #000;">
                         透后评估
                         </td>
 
                         <td width="25" style="border:none;padding-left:5px;">
                         体温:
                         </td>
-                        <td width="30" style="text-align:left;border:none;">
+                        <td width="70" style="text-align:left;border:none;">
                         <div>
                             <span class="under_line" style="width:50px;display:inline-block;">
                             {{ record.assessment_after_dislysis.temperature ? record.assessment_after_dislysis.temperature : "" }}
@@ -378,8 +568,8 @@
                         </td>
                         <!-- <td width="10" style="border:none;"></td> -->
 
-                        <td width="25" style="border:none;padding-left:5px;">血压:</td>
-                        <td width="70" style="text-align:left;border:none;line-height: 30px;">
+                        <td width="20" style="border:none;padding-left:5px;">血压:</td>
+                        <td width="60" style="text-align:left;border:none;line-height: 30px;">
                         <div>
                             <span class="under_line" style="width:100px;display:inline-block">
                             {{ record.assessment_after_dislysis.systolic_blood_pressure ? record.assessment_after_dislysis.systolic_blood_pressure : "" }}/
@@ -387,34 +577,85 @@
                             </span>mmHg
                         </div>
                         </td>
-                        <td width="25" style="border:none;padding-left:5px">脉搏:</td>
-                        <td width="55" style="text-align:left;border:none;">
+                        <td width="10" style="border:none;padding-left:5px">脉搏:</td>
+                        <td width="80" style="text-align:left;border:none;">
                         <div>
                             <span class="under_line" style="width:50px;display:inline-block">
                             {{ record.assessment_after_dislysis.pulse_frequency ? record.assessment_after_dislysis.pulse_frequency : "" }}
                             </span>次/分
                         </div>
                         </td>
+                        <td width="50" style="border:none;padding-left:5px">透后症状:</td>
+                        <td width="100" style="text-align:left;border:none;">
+                          <div>
+                            <span class="under_line" style="width:100px;display:inline-block">
+                              {{ record.assessment_after_dislysis.symptom_after_dialysis ? record.assessment_after_dislysis.symptom_after_dialysis : "" }}
+                            </span>
+                          </div>
+                        </td>
                         
                     </tr>
                     <tr>
-                      <td width="50" style="border:none;padding-left:5px">实际置换量:</td>
+                      <td width="90" style="border:none;padding-left:5px">实际置换量:</td>
                         <td width="30" style="text-align:left;border:none;">
                         <div>
                             <span class="under_line" style="width:50px;display:inline-block">
                             {{ record.assessment_after_dislysis.actual_displacement ? record.assessment_after_dislysis.actual_displacement : "" }}
-                            </span>次/分
+                            </span>L
                         </div>
                         </td>
-                        <td width="50" style="border:none;padding-left:5px">透析器凝血:</td>
-                        <td width="110" style="text-align:left;border:none;">
+                        <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
+                        <td width="200" style="text-align:left;border:none;">
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-0度') > -1 ? true : false) : false" showValue="0"></label-box>
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false) : false" showValue="+"></label-box>
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false) : false" showValue="+ +"></label-box>
                         <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false) : false" showValue="+ + +"></label-box>
                         </td>
-                        <td width="50" style="text-align:left;border:none;"></td>
-                        <td width="110" style="text-align:left;border:none;"></td>
+                        <!-- <td width="50" style="text-align:left;border:none;"></td>
+                        <td width="110" style="text-align:left;border:none;"></td> -->
+
+                        <td width="100" style="border:none;padding-left:5px">透析期间进食:</td>
+                        <td width="50" style="text-align:left;border:none;">
+                          <div>
+                            <span class="under_line" style="width:50px;display:inline-block">
+                              <span v-if='record.assessment_after_dislysis.is_eat == 1'>是</span>
+                              <span v-if='record.assessment_after_dislysis.is_eat == 2'>否</span>
+                            </span>
+                          </div>
+                        </td>
+                        <td width="70" style="border:none;padding-left:5px">透析进食:</td>
+                        <td width="50" style="text-align:left;border:none;">
+                          <div>
+                            <span class="under_line" style="width:50px;display:inline-block">
+                              {{ record.assessment_after_dislysis.is_eat == 1 && record.assessment_after_dislysis.dialysis_during ? record.assessment_after_dislysis.dialysis_during : '' }}
+                            </span>ml
+                          </div>
+                        </td>
+                    </tr>
+                    <tr style="height:30px;line-height:30px;">
+                      <td width="20" style="border:none;padding-left:5px;">内瘘:</td>
+                      <td width="150" colspan="3" style="text-align:left;border:none;">
+                        <div>
+                          <span class="under_line" style="width:150px;display:inline-block;">
+                            {{ record.assessment_after_dislysis.internal_fistula ? record.assessment_after_dislysis.internal_fistula : "" }}
+                          </span>
+                        </div>
+                      </td>
+                      <td width="50" style="border:none;padding-left:5px">下机护士:</td>
+                      <td width="100" style="text-align:left;border:none;">
+                        <div>
+                          <span class="under_line" style="width:100px;display:inline-block">
+                            <span v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">{{getAdminUser(record.dialysis_order, 'finish_nurse')}}</span>
+                            <span v-else>
+                              <img class="es-img" style="height:30px;" :src="setAdminUserES(record.dialysis_order, 'finish_nurse')" />
+                            </span>
+                          </span>
+                        </div>
+                      </td>
+                      <td width="10" style="text-align:left;border:none;"></td>
+                      <td width="110" style="text-align:left;border:none;"></td>
+                      <!-- <td width="110" style="text-align:left;border:none;"></td> -->
+                      <!-- <td width="110" style="text-align:left;border:none;"></td> -->
                     </tr>
                     </tbody>
                 </table>
@@ -422,7 +663,7 @@
                 <table class="print-table" border="1">
                     <tr style="height:36px;text-align:left;border:none;">
                     <td style="padding-left:5px;border:none">
-                        <p style="margin-bottom:160px">
+                        <p style="margin-bottom:30px">
                             透析小结：{{ record.summer&&record.summer.dialysis_summary.length>0 ? record.summer.dialysis_summary : "" }}
                         </p>
                     </td>
@@ -436,20 +677,28 @@
                                 <img :src="setAdminUserES(record.dialysis_order, 'start_nurse')" style="height:30px;" />
                             </span>
                         </span>
-                        校对护士
+                        二核护士
                         <span style="display: inline-block;width:100px;text-align: left;">
                         &nbsp;
-                        <span v-if="setAdminUserES(record.check, 'modifier') == ''">
-                            {{getAdminUser(record.check, 'modifier') ? getAdminUser(record.check, 'modifier') : ""}}
+                        <span v-if="record.check != null ? record.dialysis_order.start_nurse != record.check.modifier : false">
+                            <span v-if="setAdminUserES(record.check, record.check == null ? 0 : 'modifier') == ''">
+                            {{ getAdminUser(record.check, record.check == null ? 0 : 'modifier') }}
+                            </span>
+                            <img style="height:30px;" :src="setAdminUserES(record.check, record.check == null ? 0 : 'modifier')" alt srcset v-else />
+                        </span>
+                        <span v-else>
+                            <span v-if="setAdminUserES(record.check, record.check == null ? 0 : 'creater') == ''">
+                            {{ getAdminUser(record.check, "creater") }}
+                            </span>
+                            <img style="height:30px;" :src="setAdminUserES(record.check, record.check == null ? 0 : 'creater')" alt srcset v-else />
                         </span>
-                        <img style="height:30px;" :src="setAdminUserES(record.check, 'modifier')" alt srcset v-else />
                         </span>
                         医生签名
                         <span style="display: inline-block;width:100px;text-align: left;">
                         &nbsp;
-                        <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
+                        <span v-if="setAdminUserES(record.summer, record.summer ? (record.summer.modifier ? 'modifier' : 'creater') : false) == ''">{{getAdminUser(record.summer, record.summer ? (record.summer.modifier ? 'modifier' : 'creater') : false)}}</span>
                         <span v-else>
-                            <img class="es-img" style="height:30px;" :src="setAdminUserES(record.prescription, 'creater')" />
+                            <img class="es-img" style="height:30px;" :src="setAdminUserES(record.summer, record.summer ? (record.summer.modifier ? 'modifier' : 'creater') : false)" />
                         </span>
                         </span>
                         
@@ -630,9 +879,9 @@ export default {
             var delghTwo = 0
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 14
+              this.records[recordIndex].advices.length < 16
             ) {
-              delghTwo = 14 - this.records[recordIndex].advices.length
+              delghTwo = 16 - this.records[recordIndex].advices.length
             } else {
               delghTwo = 0
             }
@@ -743,6 +992,12 @@ export default {
       })
   },
   methods: {
+    dialysateFormulationName(id) {
+      if (id in this.dialysateFormulationOptions) {
+        return this.dialysateFormulationOptions[id].name
+      }
+      return ''
+    },
     getNewNumber(name, number) {
       if (name.indexOf('区') > -1) {
         return (

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -701,6 +701,23 @@ export default {
         this.search_mode = 2;
       } else {
         this.search_mode = 1;
+        var date = new Date();
+        this.time = date;
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var day = date.getDate();
+        if (month < 10) {
+          month = "0" + month;
+        }
+        if (day < 10) {
+          day = "0" + day;
+        }
+        var nowDate = year + "-" + month + "-" + day;
+        var date = new Date(nowDate + " 00:00:00");
+        this.listQuery.schedul_time = date.getTime();
+        this.getAllZone();
+        this.getSchedualPatientList();
+        this.getTemplateInfo();
       }
       this.$store.dispatch('SetSearchMode', this.search_mode)
     },

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -81,8 +81,8 @@
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30  &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

@@ -87,7 +87,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
@@ -97,7 +97,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"

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

@@ -160,6 +160,7 @@
                   template_id == 27 ||
                   template_id == 29 ||
                   template_id == 30 ||
+                  template_id == 31 ||
                   org_id == 9555)
             "
           >
@@ -196,6 +197,7 @@
                 template_id != 27 &&
                 template_id != 29 &&
                 template_id != 30 &&
+                template_id != 31 &&
                 org_id!=9555
             "
           >
@@ -213,7 +215,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -224,7 +226,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -512,12 +514,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
@@ -525,7 +527,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || org_id == 9555) " >
+            v-if=" isShow('超滤量') && (template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 29 || template_id == 30 || template_id == 31 || org_id == 9555) " >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
@@ -533,7 +535,7 @@
 
           <el-col
             :span="8"
-            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && org_id !=9555" >
+            v-if=" isShow('超滤量') && template_id != 6 && template_id !=9 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id!=27 && template_id!=29 && template_id!=30 && template_id!=31 && org_id !=9555" >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -21,30 +21,30 @@
         </div>
       </div>
       <div class="row">
-        <div class="inline_block" style="margin-right:10px;">
+        <div class="inline_block" style="margin-right:5px;">
             日期 <div class="inline_block under_line" style="width:50px">{{ queryParams.xtdate.slice(0,4) }}</div>年
             <div class="inline_block under_line" style="width:50px">{{ queryParams.xtdate.slice(5,7) }}</div>月
             <div class="inline_block under_line" style="width:50px">{{ queryParams.xtdate.slice(8,11) }}</div>日
         </div>
-        <div class="inline_block" style="margin-right:10px;">
+        <div class="inline_block" style="margin-right:5px;">
           姓名
           <div class="inline_block under_line" style="width:80px;text-align: center;">
               {{ patientInfo.name ? patientInfo.name : "" }}
           </div>
         </div>
-        <div class="inline_block" style="margin-right:10px;">
+        <div class="inline_block" style="margin-right:5px;">
           性别&nbsp;&nbsp;&nbsp;&nbsp;
           <label-box :isChecked="patientInfo.gender == '男'" showValue="男" ></label-box>&nbsp;
           <label-box :isChecked="patientInfo.gender == '女'" showValue="女" ></label-box>
         </div>
-        <div class="inline_block" style="margin-right:10px;">
+        <div class="inline_block" style="margin-right:5px;">
           年龄：
           <div class="under_line" style="width: 50px;text-align: center">
               {{ getNewAge(patientInfo.id_card_no) }}
           </div>
           岁
         </div>
-        <div class="inline_block" style="margin-right:10px;">
+        <div class="inline_block" style="margin-right:5px;">
             机器编号
             <div class="inline_block under_line" style="width:80px;">
             {{ getNumber() }}

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -236,7 +236,7 @@
               预设脱水
               <div class="inline_block under_line" style="width:100px;">
                   {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : ' ' }}
-              </div>kg
+              </div>ml
           </div>
       </div>
       <div class="row">
@@ -259,7 +259,7 @@
               实际脱水
               <div class="inline_block under_line" style="width:100px;">
                   {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : " " }}
-              </div>kg
+              </div>ml
           </div>
           <div class="inline_block" style="margin-right:30px;">
               电导度