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

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

         this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation ? resp.monitor.blood_oxygen_saturation : ''
         this.form.urr = resp.monitor.urr?resp.monitor.urr:''
         this.form.blood_sugar = resp.monitor.blood_sugar?resp.monitor.blood_sugar:''
+        this.form.sodium_concentration = resp.monitor.sodium_concentration?resp.monitor.sodium_concentration:''
+        this.form.conductivity = resp.monitor.conductivity?resp.monitor.conductivity:''
       })
     },
 

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

                      {{ predialysis.exposed ? predialysis.exposed : '' }}
                   </div>
                 </td>
-                <td width='10'>ml</td>
+                <td width='10'>cm</td>
                 <td width="30"></td>
 
                 <td width="95">内瘘皮肤情况:</td>
             <table class="table-box">
               <tbody>
               <tr>
-                <td width="86">活动性出血:</td>
+                <td width="80">活动性出血:</td>
                 <td width="40">
                   <div>
                     <label-box :isChecked="predialysis.is_hemorrhage == 2 ? true : false" showValue="无"></label-box>
                   </div>
                 </td>
-                <td width="380">
+                <td width="420">
                   <div>
                     <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('牙龈出血') > -1 ? true : false" showValue="牙龈出血"></label-box>
                     &nbsp;
                     <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('消化道出血') > -1 ? true : false" showValue="消化道出血"></label-box>
                     &nbsp;
-                    <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('穿刺点渗血') > -1 ? true : false" showValue="穿刺点渗血"></label-box>
+                    <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('皮下瘀斑') > -1 ? true : false" showValue="皮下瘀斑"></label-box>
                     &nbsp;
-
                     <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('女性经期') > -1 ? true : false" showValue="女性经期"></label-box>
+                    &nbsp;
+                    <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('血尿') > -1 ? true : false" showValue="血尿"></label-box>
                   </div>
                 </td>
 
               <tbody>
               <tr>
                 <td width="70">血管通路:</td>
-                <td width="480">
+                <td width="620">
                   <div>
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1 ? true : false" showValue="自体内瘘"></label-box>
                     &nbsp;
                     &nbsp;
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('直穿') > -1 ? true : false" showValue="直穿"></label-box>
                     &nbsp;
+                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
+                    &nbsp;
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉') > -1 ? true : false" showValue="颈内静脉"></label-box>
                     &nbsp;
+                    （&nbsp;<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-长期') > -1 ? true : false" showValue="长期"></label-box>&nbsp;
+                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-临时') > -1 ? true : false" showValue="临时"></label-box>&nbsp;）
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="股静脉"></label-box>
                     &nbsp;
-                    <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
-                    &nbsp;
+                    
                   </div>
                 </td>
 
                   </div>
                 </td>
                 <td width="20">Kg</td>
+                <td></td>
+                <td width="60">衣物重:</td>
+                <td width="50">
+                  <div class="under-line">
+                    &nbsp;{{ predialysis.additional_weight ? predialysis.additional_weight : 0 }}
+                  </div>
+                </td>
+                <td width="20">Kg</td>
 
                 <td></td>
                 <td width="100">计划治疗时间:</td>
             <table class="table-box">
               <tbody>
               <tr>
-                <td width="120">计划超滤总量:</td>
+                <td width="100">计划超滤总量:</td>
                 <td width="50">
                   <div class="under-line">
-                    &nbsp;{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }}
+                    &nbsp;{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : 0 }}
                   </div>
                 </td>
-                <td width="10">ml</td>
+                <td width="10">L</td>
+                <td width='70'>置换方式:</td>
+                <td width='130'>
+                  <label-box :isChecked="prescription.displace_liqui_part == 1 ? true : false" showValue="前置换"></label-box>&nbsp;
+                  <label-box :isChecked="prescription.displace_liqui_part == 2 ? true : false" showValue="后置换"></label-box>
+                </td>
                 <td width="60">置换量:</td>
                 <td width="40">
                   <div class="under-line">
                     &nbsp;{{ prescription.replacement_total ? prescription.replacement_total : "/" }}
                   </div>
                 </td>
-                <td width="20">ml</td>
-
+                <td width="20">L</td>
+                
                 <td width="80">透析方式:</td>
                 <td width="50">
                   <label-box :isChecked="prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>
                 <td width="60">
                   <label-box :isChecked="prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>
                 </td>
-                <td width="50">
-                  <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>
-                </td>
                 <td width="50">
                   <label-box :isChecked="prescription.mode_id == 4 ? true : false" showValue="HP"></label-box>
                 </td>
                 <td width="80">
                   <label-box :isChecked="prescription.mode_id == 3 ? true : false" showValue="HD+HP"></label-box>
                 </td>
-                <td width="90">透析器型号:</td>
-                <td width="100">
-                  <div class="under-line">
-                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
-                  </div>
-                </td>
               </tr>
               </tbody>
             </table>
                 </td>
                 <td width="10">(</td>
                 <td width="100">
-                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : prescription.dialysate_formulation_name.indexOf('高钾') > -1 ? true : false" showValue="1.5"></label-box>
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('低钙') > -1 ? true : false" showValue="1.25"></label-box>
+                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : prescription.dialysate_formulation_name.indexOf('高钾') > -1 ? true : false" showValue="1.5"></label-box>
                 </td>
                 <td width="10">)</td>
                 <td width="10">mmol/L</td>
                 </td>
                 <td width="10">)</td>
                 <td width="10">mmol/L</td>
-                
+                <td width="90">透析器型号:</td>
+                <td width="100">
+                  <div class="under-line">
+                    &nbsp;{{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
+                  </div>
+                </td>
                 <td></td>
               </tr>
               </tbody>
                       <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="不存在"></label-box>
                     </div>
                   </td>
+                  <td width='30'></td>
+                  <td width="40">导管:</td>
+                  <td width='200'>
+                    <label-box showValue="通畅" :isChecked="afterdialysis.catheter.indexOf('通畅') > -1 ? true : false"></label-box>&nbsp;
+                    <label-box showValue="A堵塞" :isChecked="afterdialysis.catheter.indexOf('A堵塞') > -1 ? true : false"></label-box>&nbsp;
+                    <label-box showValue="V堵塞" :isChecked="afterdialysis.catheter.indexOf('V堵塞') > -1 ? true : false"></label-box>&nbsp;
+                  </td>
                   <td></td>
                 </tr>
                 </tbody>
                   <td width="90">实际超滤总量</td>
                   <td width="40">
                     <div class="under-line">
-                      &nbsp;{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }}
+                      &nbsp;{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : 0 }}
                     </div>
                   </td>
-                  <td width="10">ml</td>
+                  <td width="10">L</td>
                   <td width="20"></td>
                   <td width="90">实际治疗时间</td>
                   <td width="40">
               <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else  />
             </div>
           </td>
-          <td width="50">下机护士</td>
-          <td width="80">
-            <div class="under-line">
-              &nbsp;
-              <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
-              <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
-            </div>
-          </td>
-          <td width="50">看机护士</td>
-          <td width="80">
-            <div class="under-line">
-              &nbsp;
-              <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
-              <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
-            </div>
-          </td>
           <td width="50">穿刺护士</td>
           <td width="80">
             <div class="under-line">
           <td width="80">
             <div class="under-line">
               &nbsp;
-              <span v-if="doctor_advices[0].execution_staff != check.modifier">
+              <span v-if="(dialysisOrder==null?0:dialysisOrder.start_nurse) != check.modifier">
                 <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                 {{ getAdminUser(check == null ? 0 : check.modifier) }}
                 </span>
               </span>
             </div>
           </td>
+          <td width="50">看机护士</td>
+          <td width="80">
+            <div class="under-line">
+              &nbsp;
+              <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
+              <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
+            </div>
+          </td>
+          <td width="50">下机护士</td>
+          <td width="80">
+            <div class="under-line">
+              &nbsp;
+              <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.finish_nurse)}}</span>
+              <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.finish_nurse)" alt="" srcset="" v-else>
+            </div>
+          </td>
         </tr>
         </tbody>
       </table>
               this.doctor_advices.push(obj3)
               this.doctor_advices.push(obj3)
               this.doctor_advices.push(obj3)
+              this.doctor_advices.push(obj3)
             }
             if (this.doctor_advices.length === 1) {
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj2)
               this.doctor_advices.push(obj2)
               this.doctor_advices.push(obj2)
+              this.doctor_advices.push(obj2)
             }
             if (this.doctor_advices.length === 2) {
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj1)
               this.doctor_advices.push(obj1)
               this.doctor_advices.push(obj1)
+              this.doctor_advices.push(obj1)
             }
             if (this.doctor_advices.length === 3) {
               // eslint-disable-next-line no-redeclare
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj)
+              this.doctor_advices.push(obj)
             }
-            if (this.doctor_advices.length === 2) {
+            if (this.doctor_advices.length === 4) {
               // eslint-disable-next-line no-redeclare
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
             }
-            if (this.doctor_advices.length === 1) {
+            if (this.doctor_advices.length === 5) {
               // eslint-disable-next-line no-redeclare
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj)
               this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
-              this.doctor_advices.push(obj)
+            }
+            if (this.doctor_advices.length === 6) {
+              // eslint-disable-next-line no-redeclare
+              var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj)
             }