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

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -595,71 +595,27 @@
               <tbody>
               <tr>
                 <td width="85">透析液配方:</td>
-                <td width="100">
-                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('普通透析液') > -1 ? true : false" showValue="普通透析液"></label-box>
-                </td>
-                <td width="10"></td>
-                <td width="50">
-                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('低钙') > -1 ? true : false" showValue="低钙"></label-box>
-                </td>
-                <td width="120">
-                  (
-                  <label class="radio-lebel-box">
-                    <!-- <span class="radio-inner">
-                    <span class="radio-fang " ></span>
-                    <input  type="radio" class="radio-no" value="1">
-                </span> -->
-                    <span> 1.25mmol/L</span>
-                  </label>
-                  )
-                </td>
-                <td width="50">
-                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('高钾') > -1 ? true : false" showValue="高钾"></label-box>
-                </td>
-                <td width="120">
-                  ( 1.5mmol/L )
+                <td width='90'>B液: 碳酸盐:</td>
+                <td width='30'>A液:</td>
+                <td width="10">钙</td>
+                <td width="10">(</td>
+                <td width="200">
+                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="1.25mmol/L"></label-box>
+                  &nbsp;
+                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="1.5mmol/L"></label-box>
+                  &nbsp;
                 </td>
+                <td width="10">)</td>
                 <td width="10">钾</td>
-                <td width="50">
-                  <div class="under-line">&nbsp;{{ prescription.kalium ? prescription.kalium : "" }}</div>
+                <td width="10">(</td>
+                <td width="200">
+                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(2.0mmol/L)') > -1 ? true : false" showValue="2.0mmol/L"></label-box>
+                  &nbsp;
+                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(3.5mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="3.5mmol/L"></label-box>
+                  &nbsp;
                 </td>
-                <td width="10">mmol/L</td>
+                <td width="10">)</td>
                 <td></td>
-
-                <!-- <td width="50">
-                  <label-box
-                    :isChecked="
-                      prescription.dialysate_formulation_name.indexOf(
-                        '低钠'
-                      ) > -1
-                        ? true
-                        : false
-                    "
-                    showValue="低钠"
-                  ></label-box>
-                </td>
-                <td width="110">
-                  (
-                  <label class="radio-lebel-box">
-                    <span> 135mmol/L</span>
-                  </label>
-                  )
-                </td>
-                <td width="50">
-                  <label-box
-                    :isChecked="
-                      prescription.dialysate_formulation_name.indexOf(
-                        '高钠'
-                      ) > -1
-                        ? true
-                        : false
-                    "
-                    showValue="高钠"
-                  ></label-box>
-                </td>
-                <td width="100">
-                  ( 145mmol/L )
-                </td> -->
               </tr>
               </tbody>
             </table>
@@ -902,8 +858,8 @@
                 <td colspan="4" style="font-size: 16px">开医嘱</td>
                 <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
               </tr> -->
-        <tr style="line-height:35px;padding:8px 5px;">
-          <td style="font-size: 16px" width="30" :rowspan="doctor_advices.length + 1">
+        <tr>
+          <td :rowspan="adviceLength" width="30" class="title-box">
             医嘱内容
           </td>
           <td style="font-size: 16px" width="10%">时间</td>
@@ -916,13 +872,13 @@
         <!-- <template v-for="group in doctor_advices" > -->
 
         <tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index">
-          <td height="40px">
+          <td height="35px">
               <span v-if="advice.start_time">
                 {{ getTime(advice.start_time, "{h}:{i}") }}
               </span>
             <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
           </td>
-          <td height="40px" colspan="2" class="advice-name" style="padding-left:7px;">
+          <td colspan="2" class="advice-name" style="padding-left:7px;">
             <span v-if="advice.parent_id > 0">---></span>
             <span>{{ advice.advice_name }}</span>
             <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
@@ -938,19 +894,19 @@
                   <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
                 </td> -->
           <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-          <td height="40px">
+          <td>
             <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
             <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
           </td>
-          <td height="40px">
+          <td>
             <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
             <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
           </td>
-          <td height="40px">
+          <td>
             <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-            <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
+            <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
           </td>
-          <td height="40px">
+          <td>
             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
           </td>
         </tr>
@@ -2057,8 +2013,8 @@ export default {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 12) {
-              var nl = 12 - this.monitors.length
+            if (this.monitors.length < 13) {
+              var nl = 13 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }
@@ -2187,6 +2143,7 @@ export default {
               var obj = { advice_name: '', start_time: '' }
               this.doctor_advices.push(obj)
             }
+            this.adviceLength = this.doctor_advices.length + 1
 
             if (this.doctor_advices.length > 0) {
               var group = this.newAdviceGroupObject()

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -564,17 +564,17 @@
                     </td>
                     <td width="10">iu</td>
                     <td width="100">
-                        <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>
+                        <label-box :isChecked="prescription.anticoagulant == '阿加曲班' ? true : false" showValue="阿加曲班"></label-box>
                     </td>
                     <td width="10">（</td>
                     <td width="60">首剂量</td>
                     <td width="60">
-                        <div class="under-line">&nbsp;{{ prescription.anticoagulant == '普通肝素' && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}</div>
+                        <div class="under-line">&nbsp;{{ prescription.anticoagulant == '阿加曲班' && prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "" }}</div>
                     </td>
                     <td width="10">mg,</td>
                     <td width="60">追加量</td>
                     <td width="60">
-                        <div class="under-line">&nbsp;{{ prescription.anticoagulant == '普通肝素' && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}</div>
+                        <div class="under-line">&nbsp;{{ prescription.anticoagulant == '阿加曲班' && prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "" }}</div>
                     </td>
                     <td width="10">mg/h</td>
                     <td width="10">）</td>