Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -1696,17 +1696,17 @@
                       </div>
                       <div class="inline_block">
                         透析器凝血:
-                          <!--<check-box text="0"-->
-                                     <!--:checked="record.assessment_after_dislysis.cruor.indexOf('透析器-0度') > -1"></check-box>-->
-                          <!--<check-box text="+"-->
-                                     <!--:checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅰ度') > -1"></check-box>-->
-                          <!--<check-box text="++"-->
-                                     <!--:checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅱ度') > -1"></check-box>-->
-                          <!--<check-box text="+++"-->
-                                     <!--:checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅲ度') > -1"></check-box>-->
+                          <check-box text="0"
+                                     :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-0度') > -1"></check-box>
+                          <check-box text="+"
+                                     :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅰ度') > -1"></check-box>
+                          <check-box text="++"
+                                     :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅱ度') > -1"></check-box>
+                          <check-box text="+++"
+                                     :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅲ度') > -1"></check-box>
 
-                        <!---->
-                        <div
+
+                       <!-- <div
                           class="under_line"
                           style="width: 100px;text-align: center"
                         >
@@ -1716,7 +1716,7 @@
                               ? record.assessment_after_dislysis.cruor
                               : "/"
                           }}
-                        </div>
+                        </div>-->
                       </div>
                     </div>
                   </td>

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1898,10 +1898,13 @@
                 <div class="inline_block" style="flex:1;">
                   治疗医生：
                   <div
+
                     class="under_line"
-                    style="width: 80px;text-align: center"
+                    style="width: 120px;"
                   >
-                      <span
+                    <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">
+
+                    <span
                         v-if="
                           setAdminUserES(prescription.prescription_doctor) == ''
                         "
@@ -1922,7 +1925,7 @@
                   患者签名：
                   <div
                     class="under_line"
-                    style="width: 80px;text-align: center"
+                    style="width: 40px;text-align: center"
                   >
 
 

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -186,9 +186,9 @@
                   <check-box text="长期" :checked="predialysis.venous_catheterization == 1?true:false"></check-box>
                   <check-box text="临时" :checked="predialysis.venous_catheterization == 2?true:false"></check-box>
                   &emsp;位置:
-                  <check-box text="锁骨下" :checked="predialysis.blood_access_part_id == 1?true:false"></check-box>
-                  <check-box text="颈静脉" :checked="predialysis.blood_access_part_id == 2?true:false"></check-box>
-                  <check-box text="股静脉" :checked="predialysis.blood_access_part_id == 3?true:false"></check-box>
+                  <check-box text="锁骨下" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','锁骨下')?true:false"></check-box>
+                  <check-box text="颈静脉" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈静脉')?true:false"></check-box>
+                  <check-box text="股静脉" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','股静脉')?true:false"></check-box>
                   <div class="inline_block">
                     其它：
                     <div class="under_line" style="width: 50px;text-align: left">

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1269,12 +1269,20 @@
                   </div>
                   <div class="inline_block">
                     透析器凝血:
-                    <div
-                      class="under_line"
-                      style="width:200px;text-align:center;"
-                    >
-                      {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
-                    </div>
+                    <check-box text="0"
+                               :checked="afterdialysis.cruor.indexOf('透析器-0度') > -1"></check-box>
+                    <check-box text="+"
+                               :checked="afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1"></check-box>
+                    <check-box text="++"
+                               :checked="afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1"></check-box>
+                    <check-box text="+++"
+                               :checked="afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1"></check-box>
+                    <!--<div-->
+                      <!--class="under_line"-->
+                      <!--style="width:200px;text-align:center;"-->
+                    <!--&gt;-->
+                      <!--{{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}-->
+                    <!--</div>-->
                   </div>
                 </div>
               </td>