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

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1139,7 +1139,7 @@
                         透析器凝血：
                         <div
                           class="under_line"
-                          style="width: 100px;text-align: center"
+                          style="width: 100px"
                         >
                           {{
                           record.assessment_after_dislysis &&
@@ -2085,7 +2085,7 @@ export default {
       });
   },
   methods: {
-    getAge: function(val) {
+   getAge: function(val) {
       val.birth = uParseTime(val.birthday, "{y}-{m}-{d}");
       if (
         this.org_template_info.template_id == 2 ||

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -1808,17 +1808,14 @@
                       <!--</div>-->
                       <div class="inline_block">
                         透析器凝血:
-                        <div
-                          class="under_line"
-                          style="width: 100px;text-align: center"
-                        >
-                          {{
-                          record.assessment_after_dislysis &&
-                          record.assessment_after_dislysis.cruor
-                          ? record.assessment_after_dislysis.cruor
-                          : "/"
-                          }}
-                        </div>
+                        <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>
@@ -2727,11 +2724,11 @@
                         class="under_line"
                         style="width:60px;text-align: left"
                         v-if="
-                          record.prescription &&
-                            record.prescription.ultrafiltration
+                          record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.actual_ultrafiltration
                         "
                       >
-                        {{ getFloat(record.prescription.ultrafiltration) }}
+                        {{ getFloat(record.assessment_after_dislysis.actual_ultrafiltration) }}
                       </div>
                       <div class="under_line" style="width:60px;" v-else>
                         {{ "/" }}

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -1696,6 +1696,16 @@
                       </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>-->
+
+                        <!---->
                         <div
                           class="under_line"
                           style="width: 100px;text-align: center"

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -260,8 +260,8 @@
                   </div>
                   <div class="inline_block">
                     &emsp;实际超滤量:
-                    <div class="under_line" style="width:60px;text-align: left" v-if="record.prescription&&record.prescription.ultrafiltration">
-                      {{getFloat(record.prescription.ultrafiltration)}}
+                    <div class="under_line" style="width:60px;text-align: left" v-if="record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration">
+                      {{getFloat(record.assessment_after_dislysis.actual_ultrafiltration)}}
                     </div>
                     <div class="under_line" style="width:60px;" v-else>
                       {{'/'}}

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -206,7 +206,6 @@
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 10"
       ></DialysisPrintOrderTen>
-      <DialysisPrintOrder
 
     <DialysisPrintOrderNine
         v-bind:childResponse="childResponse"

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -634,7 +634,7 @@
                 <td width="220">
                   <div
                     class="under_line"
-                    style="width:200px;text-align:center;"
+                    style="width:150px;"
                   >
                     {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
                   </div>
@@ -685,27 +685,27 @@
               <tr>
                 <td width="55">并发症:</td>
                 <td width="600">
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('低血压')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('低血压')>-1?true:false"
                              showValue='低血压'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('高血压')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('高血压')>-1?true:false"
                              showValue='高血压'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('心律失常')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('心律失常')>-1?true:false"
                              showValue='心律失常'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('头晕')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('头晕')>-1?true:false"
                              showValue='头晕'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('头痛')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('头痛')>-1?true:false"
                              showValue='头痛'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('呕吐')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('呕吐')>-1?true:false"
                              showValue='呕吐'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('抽搐')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('抽搐')>-1?true:false"
                              showValue='抽搐'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('出血')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('出血')>-1?true:false"
                              showValue='出血'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('心衰')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('心衰')>-1?true:false"
                              showValue='心衰'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('腹痛')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('腹痛')>-1?true:false"
                              showValue='腹痛'></label-box>
-                  <label-box :isChecked="afterdialysis.complications_index.indexOf('无')>-1?true:false"
+                  <label-box :isChecked="afterdialysis.complication.indexOf('无')>-1?true:false"
                              showValue='无'></label-box>
 
                 </td>

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -67,9 +67,9 @@
           <div
             class="under_line"
             style="width: 70px;text-align: left"
-            v-if="patientInfo.admission_number"
+            v-if="receiverTreatmentAccess.admission_number"
           >
-            {{ patientInfo.admission_number }}
+            {{ receiverTreatmentAccess.admission_number }}
           </div>
           <div class="under_line" style="width: 70px;text-align: left" v-else>
             {{ '/' }}
@@ -1918,6 +1918,17 @@
                     />
                   </div>
                 </div>
+                <div class="inline_block" style="flex:1;">
+                  患者签名：
+                  <div
+                    class="under_line"
+                    style="width: 80px;text-align: center"
+                  >
+
+
+                  </div>
+                </div>
+
               </div>
             </td>
           </tr>

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -131,21 +131,21 @@
                   血管通路：<br>
                   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(内瘘)：
                   <check-box text="自体内瘘"
-                             :checked="predialysis.blood_access_internal_fistula.indexOf('自体内瘘')>-1?true:false"></check-box>
+                             :checked="predialysis.internal_fistula.indexOf('自体内瘘')>-1?true:false"></check-box>
                   <check-box text="人工血管内瘘"
-                             :checked="predialysis.blood_access_internal_fistula.indexOf('人工血管内瘘')>-1?true:false"></check-box>
+                             :checked="predialysis.internal_fistula.indexOf('人工血管内瘘')>-1?true:false"></check-box>
                   <check-box text="正常"
-                             :checked="predialysis.blood_access_internal_fistula.indexOf('正常')>-1?true:false"></check-box>
+                             :checked="predialysis.internal_fistula.indexOf('正常')>-1?true:false"></check-box>
                   <check-box text="震颤"
-                             :checked="predialysis.blood_access_internal_fistula.indexOf('震颤')>-1?true:false"></check-box>
+                             :checked="predialysis.internal_fistula.indexOf('震颤')>-1?true:false"></check-box>
                   <check-box text="堵塞"
-                             :checked="predialysis.blood_access_internal_fistula.indexOf('堵塞')>-1?true:false"></check-box>
+                             :checked="predialysis.internal_fistula.indexOf('堵塞')>-1?true:false"></check-box>
                   <check-box text="血肿"
-                             :checked="predialysis.blood_access_internal_fistula.indexOf('血肿')>-1?true:false"></check-box>
+                             :checked="predialysis.internal_fistula.indexOf('血肿')>-1?true:false"></check-box>
                   <check-box text="淤血"
-                             :checked="predialysis.blood_access_internal_fistula.indexOf('淤血')>-1?true:false"></check-box>
+                             :checked="predialysis.internal_fistula.indexOf('淤血')>-1?true:false"></check-box>
                   <check-box text="感染"
-                             :checked="predialysis.blood_access_internal_fistula.indexOf('感染')>-1?true:false"></check-box>
+                             :checked="predialysis.internal_fistula.indexOf('感染')>-1?true:false"></check-box>
                 </div>
                 <div class="inline_block" style="margin-left: 10px;">
                   其它：
@@ -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.venous_catheterization_part == 1?true:false"></check-box>
-                  <check-box text="颈静脉" :checked="predialysis.venous_catheterization_part == 2?true:false"></check-box>
-                  <check-box text="股静脉" :checked="predialysis.venous_catheterization_part == 3?true:false"></check-box>
+                  <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>
                   <div class="inline_block">
                     其它：
                     <div class="under_line" style="width: 50px;text-align: left">
@@ -200,22 +200,22 @@
               <div class="row" style="padding: 2px 0;line-height:19px;">
                 <div class="inline_block">
                   中心静脉导管：
-                  <check-box text="正常" :checked="predialysis.ductus_arantii.indexOf('正常')>-1?true:false"></check-box>
-                  <check-box text="不畅" :checked="predialysis.ductus_arantii.indexOf('不畅')>-1?true:false"></check-box>
+                  <check-box text="正常" :checked="predialysis.catheter.indexOf('正常')>-1?true:false"></check-box>
+                  <check-box text="不畅" :checked="predialysis.catheter.indexOf('不畅')>-1?true:false"></check-box>
                   <check-box text="血流不足"
-                             :checked="predialysis.ductus_arantii.indexOf('血流不足')>-1?true:false"></check-box>
+                             :checked="predialysis.catheter.indexOf('血流不足')>-1?true:false"></check-box>
                   (
-                  <check-box text="正接" :checked="predialysis.ductus_arantii.indexOf('正接')>-1?true:false"></check-box>
+                  <check-box text="正接" :checked="predialysis.catheter.indexOf('正接')>-1?true:false"></check-box>
                   /
-                  <check-box text="反接" :checked="predialysis.ductus_arantii.indexOf('反接')>-1?true:false"></check-box>
+                  <check-box text="反接" :checked="predialysis.catheter.indexOf('反接')>-1?true:false"></check-box>
                   )
-                  <check-box text="血栓" :checked="predialysis.ductus_arantii.indexOf('血栓')>-1?true:false"></check-box>
+                  <check-box text="血栓" :checked="predialysis.catheter.indexOf('血栓')>-1?true:false"></check-box>
                   <check-box text="缝线脱落"
-                             :checked="predialysis.ductus_arantii.indexOf('缝线脱落')>-1?true:false"></check-box>
+                             :checked="predialysis.catheter.indexOf('缝线脱落')>-1?true:false"></check-box>
                   <check-box text="导管脱落"
-                             :checked="predialysis.ductus_arantii.indexOf('导管脱落')>-1?true:false"></check-box>
-                  <check-box text="感染" :checked="predialysis.ductus_arantii.indexOf('感染')>-1?true:false"></check-box>
-                  <check-box text="破损" :checked="predialysis.ductus_arantii.indexOf('破损')>-1?true:false"></check-box>
+                             :checked="predialysis.catheter.indexOf('导管脱落')>-1?true:false"></check-box>
+                  <check-box text="感染" :checked="predialysis.catheter.indexOf('感染')>-1?true:false"></check-box>
+                  <check-box text="破损" :checked="predialysis.catheter.indexOf('破损')>-1?true:false"></check-box>
                 </div>
                 <div class="inline_block">
                   其它：
@@ -1409,6 +1409,14 @@
       }
     },
     methods: {
+      getIsCheckDataConfig(pName, cName, targetName){
+        var arr = getDataConfig(pName,cName)
+        for (let i = 0; i < arr.length; i++){
+          if (arr[i].name == targetName){
+            return arr[i].id
+          }
+        }
+      },
       getAdminUser(id) {
         if (id == 0) {
           return ''

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -2064,9 +2064,9 @@
                   <div
                     class="under_line"
                     style="width: 70px;text-align: left"
-                    v-if="getFloat(prescription.ultrafiltration)"
+                    v-if="getFloat(afterdialysis.actual_ultrafiltration)"
                   >
-                    {{ getFloat(prescription.ultrafiltration) }}
+                    {{ getFloat(afterdialysis.actual_ultrafiltration) }}
                   </div>
                   <div class="under_line" style="width: 70px;" v-else>
                     {{ "/" }}