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

src/store/getters.js

@@ -90,7 +90,10 @@ const getters = {
   disequilibrium_syndrome_option: state => state.global_config.disequilibrium_syndrome_option,
   arterial_tube: state => state.global_config.arterial_tube,
   intravenous_tube: state => state.global_config.intravenous_tube,
-  dialyzer: state => state.global_config.dialyzer
+  dialyzer: state => state.global_config.dialyzer,
+
+  channels: state => state.global_config.channels
+
 
 }
 export default getters

src/store/modules/globalConfig.js

@@ -2120,7 +2120,26 @@ const global_config = {
         id: 4,
         name: 'A钝针'
       }
+    ],
+    channels: [
+      {
+        id: 1,
+        name: '无'
+      },
+      {
+        id: 2,
+        name: '+'
+      },
+      {
+        id: 3,
+        name: '++'
+      },
+      {
+        id: 4,
+        name: '+++'
+      }
     ]
+
   },
   mutations: {
     SET_PATIENT_TYPE: (state, patientTypes) => {

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

@@ -193,7 +193,7 @@
                      <span v-if="record.prescription.anticoagulant==3">iu</span>
                      <span v-if="record.prescription.anticoagulant==2">iu</span>
                      <span v-if="record.prescription.anticoagulant==1">mg</span>&nbsp;
-                    </span> 
+                    </span>
                   </td>
                   <td style="text-align:left;" colspan="1">
                     <span style="display:inline-block;margin-left:15px;"
@@ -337,7 +337,7 @@
                   </td>
                 </tr>
                 <tr>
-                  <td style="text-align:left;" colspan="4"> 
+                  <td style="text-align:left;" colspan="4">
                     <span style="display:inline-block;margin-left:15px;">
                      透前评估:
                       入科方式:
@@ -458,16 +458,16 @@
                 <tr>
                   <td colspan="8" style="text-align:left;">
                     <span style="display:inline-block;margin-left:15px;">中心静脉导管:</span>
-                    <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '正常')"></check-box>
-                    <check-box text="不畅" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '不畅')"></check-box>
-                    <check-box text="血流不足" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血流不足')"></check-box>
-                    (<check-box text="正接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '正接')"></check-box>/
-                    <check-box text="反接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '反接')"></check-box>)
-                    <check-box text="血栓" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血栓')"></check-box>
-                    <check-box text="缝线脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '缝线脱落')"></check-box>
-                    <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '导管脱落')"></check-box>
-                    <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '感染')"></check-box>
-                    <check-box text="破损" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '破损')"></check-box>
+                    <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '正常')"></check-box>
+                    <check-box text="不畅" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '不畅')"></check-box>
+                    <check-box text="血流不足" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '血流不足')"></check-box>
+                    (<check-box text="正接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '正接')"></check-box>/
+                    <check-box text="反接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '反接')"></check-box>)
+                    <check-box text="血栓" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '血栓')"></check-box>
+                    <check-box text="缝线脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '缝线脱落')"></check-box>
+                    <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '导管脱落')"></check-box>
+                    <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '感染')"></check-box>
+                    <check-box text="破损" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '破损')"></check-box>
                   </td>
                 </tr>
                 <tr>
@@ -583,7 +583,7 @@
                               : false
                           "
                         ></check-box>
-                         
+
                   其他:{{
                             isCheckBoxChecked(
                               record.assessment_before_dislysis,
@@ -742,7 +742,7 @@
            </span>
          </td>
         </tr>
-      </table> 
+      </table>
        <table  class="print-table" border="1">
         <tr>
           <th>时间</th>

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -147,14 +147,14 @@
                     <div class="inline_block">
                       血管通路:<br>
                       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(内瘘):
-                      <check-box text="自体内瘘" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula', '自体内瘘')"></check-box>
-                      <check-box text="人工血管内瘘" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula', '人工血管内瘘')"></check-box>
-                      <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula', '正常')"></check-box>
-                      <check-box text="震颤" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'blood_access_internal_fistula' ,'震颤')"></check-box>
-                      <check-box text="堵塞" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula', '堵塞')"></check-box>
-                      <check-box text="血肿" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula' ,'血肿')"></check-box>
-                      <check-box text="淤血" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula' ,'淤血')"></check-box>
-                      <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula' ,'感染')"></check-box>
+                      <check-box text="自体内瘘" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula', '自体内瘘')"></check-box>
+                      <check-box text="人工血管内瘘" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula', '人工血管内瘘')"></check-box>
+                      <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula', '正常')"></check-box>
+                      <check-box text="震颤" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'internal_fistula' ,'震颤')"></check-box>
+                      <check-box text="堵塞" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula', '堵塞')"></check-box>
+                      <check-box text="血肿" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula' ,'血肿')"></check-box>
+                      <check-box text="淤血" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula' ,'淤血')"></check-box>
+                      <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula' ,'感染')"></check-box>
                     </div>
                     <div class="inline_block">
                       其它：
@@ -190,9 +190,15 @@
                       <check-box text="长期" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization', 1)"></check-box>
                       <check-box text="临时" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization', 2)"></check-box>
                       &emsp;位置:
-                      <check-box text="锁骨下" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization_part', 1)"></check-box>
-                      <check-box text="颈静脉" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization_part', 2)"></check-box>
-                      <check-box text="股静脉" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization_part', 3)"></check-box>
+                      <check-box text="锁骨下" :checked=" record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','锁骨下')
+                          ? true
+                          : false"></check-box>
+                      <check-box text="颈静脉" :checked=" record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈静脉')
+                          ? true
+                          : false"></check-box>
+                      <check-box text="股静脉" :checked=" record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','股静脉')
+                          ? true
+                          : false"></check-box>
                       <div class="inline_block">
                         其它：
                         <div class="under_line" style="width: 200px;text-align: left">{{ record.assessment_before_dislysis?record.assessment_before_dislysis.venous_catheterization_part_other:''}}</div>
@@ -202,16 +208,16 @@
                   <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       中心静脉导管：
-                      <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '正常')"></check-box>
-                      <check-box text="不畅" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '不畅')"></check-box>
-                      <check-box text="血流不足" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血流不足')"></check-box>
-                      (<check-box text="正接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '正接')"></check-box>/
-                      <check-box text="反接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '反接')"></check-box>)
-                      <check-box text="血栓" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血栓')"></check-box>
-                      <check-box text="缝线脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '缝线脱落')"></check-box>
-                      <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '导管脱落')"></check-box>
-                      <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '感染')"></check-box>
-                      <check-box text="破损" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '破损')"></check-box>
+                      <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '正常')"></check-box>
+                      <check-box text="不畅" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '不畅')"></check-box>
+                      <check-box text="血流不足" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '血流不足')"></check-box>
+                      (<check-box text="正接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '正接')"></check-box>/
+                      <check-box text="反接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '反接')"></check-box>)
+                      <check-box text="血栓" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '血栓')"></check-box>
+                      <check-box text="缝线脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '缝线脱落')"></check-box>
+                      <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '导管脱落')"></check-box>
+                      <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '感染')"></check-box>
+                      <check-box text="破损" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '破损')"></check-box>
                     </div>
                     <div class="inline_block">
                       其它：
@@ -602,21 +608,42 @@
                   <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       内瘘震颤和血管杂音:
-                      <check-box text="存在" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'tremor_noise', 1)"></check-box>
-                      <check-box text="减弱" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'tremor_noise', 2)"></check-box>
-                      <check-box text="不存在" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'tremor_noise', 3)"></check-box>
+                      <check-box text="正常" :checked="record.assessment_after_dislysis.internal_fistula.indexOf('正常') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="减弱" :checked="record.assessment_after_dislysis.internal_fistula.indexOf('减弱') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="不存在" :checked="record.assessment_after_dislysis.internal_fistula.indexOf('不存在') > -1
+                          ? true
+                          : false"></check-box>
                     </div>
                     <div class="inline_block">
                       &emsp;失衡综合症:
-                      <check-box text="无" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'disequilibrium_syndrome', 1)"></check-box>
-                      <check-box text="有" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'disequilibrium_syndrome', 2)"></check-box>
+                      <check-box text="无" :checked=" record.assessment_after_dislysis.complication.indexOf('无') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="有" :checked="record.assessment_after_dislysis.complication.indexOf('头晕') > -1 ||
+                          record.assessment_after_dislysis.complication.indexOf('头痛') > -1||
+                            record.assessment_after_dislysis.complication.indexOf('呕吐') > -1||
+                              record.assessment_after_dislysis.complication.indexOf('低血压') > -1
+                          ? true
+                          : false"></check-box>
                     </div>
                     <div class="inline_block">
                       （
-                      <check-box text="头晕" :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'disequilibrium_syndrome_option', '头晕')"></check-box>
-                      <check-box text="头痛" :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'disequilibrium_syndrome_option', '头痛')"></check-box>
-                      <check-box text="呕吐" :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'disequilibrium_syndrome_option', '呕吐')"></check-box>
-                      <check-box text="低血压" :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'disequilibrium_syndrome_option', '低血压')"></check-box>
+                      <check-box text="头晕" :checked=" record.assessment_after_dislysis.complication.indexOf('头晕') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="头痛" :checked="  record.assessment_after_dislysis.complication.indexOf('头痛') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="呕吐" :checked="  record.assessment_after_dislysis.complication.indexOf('呕吐') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="低血压" :checked="  record.assessment_after_dislysis.complication.indexOf('低血压') > -1
+                          ? true
+                          : false"></check-box>
                       ）
                     </div>
                   </div>
@@ -638,10 +665,18 @@
                     </div>
                     <div class="inline_block">
                       &emsp;透析器:
-                      <check-box text="0" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialyzer', 1)"></check-box>
-                      <check-box text="+" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialyzer', 2)"></check-box>
-                      <check-box text="++" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialyzer', 3)"></check-box>
-                      <check-box text="+++" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialyzer', 4)"></check-box>
+                      <check-box text="0" :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-0度') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="+" :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅰ度') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="++" :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅱ度') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="+++" :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅲ度') > -1
+                          ? true
+                          : false"></check-box>
                     </div>
                   </div>
                 </td>
@@ -1569,6 +1604,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
+          }
+        }
+      },
       printAction: function() {
         const style = '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}'
 

src/xt_pages/dialysis/batch_print/batch_print_order_five_one.vue

@@ -147,14 +147,14 @@
                     <div class="inline_block">
                       血管通路:<br>
                       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(内瘘):
-                      <check-box text="自体内瘘" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula', '自体内瘘')"></check-box>
-                      <check-box text="人工血管内瘘" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula', '人工血管内瘘')"></check-box>
-                      <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula', '正常')"></check-box>
-                      <check-box text="震颤" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'blood_access_internal_fistula' ,'震颤')"></check-box>
-                      <check-box text="堵塞" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula', '堵塞')"></check-box>
-                      <check-box text="血肿" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula' ,'血肿')"></check-box>
-                      <check-box text="淤血" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula' ,'淤血')"></check-box>
-                      <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'blood_access_internal_fistula' ,'感染')"></check-box>
+                      <check-box text="自体内瘘" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula', '自体内瘘')"></check-box>
+                      <check-box text="人工血管内瘘" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula', '人工血管内瘘')"></check-box>
+                      <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula', '正常')"></check-box>
+                      <check-box text="震颤" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'internal_fistula' ,'震颤')"></check-box>
+                      <check-box text="堵塞" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula', '堵塞')"></check-box>
+                      <check-box text="血肿" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula' ,'血肿')"></check-box>
+                      <check-box text="淤血" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula' ,'淤血')"></check-box>
+                      <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'internal_fistula' ,'感染')"></check-box>
                     </div>
                     <div class="inline_block">
                       其它：
@@ -190,9 +190,15 @@
                       <check-box text="长期" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization', 1)"></check-box>
                       <check-box text="临时" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization', 2)"></check-box>
                       &emsp;位置:
-                      <check-box text="锁骨下" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization_part', 1)"></check-box>
-                      <check-box text="颈静脉" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization_part', 2)"></check-box>
-                      <check-box text="股静脉" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'venous_catheterization_part', 3)"></check-box>
+                      <check-box text="锁骨下" :checked=" record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','锁骨下')
+                          ? true
+                          : false"></check-box>
+                      <check-box text="颈静脉" :checked=" record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈静脉')
+                          ? true
+                          : false"></check-box>
+                      <check-box text="股静脉" :checked=" record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','股静脉')
+                          ? true
+                          : false"></check-box>
                       <div class="inline_block">
                         其它：
                         <div class="under_line" style="width: 200px;text-align: left">{{ record.assessment_before_dislysis?record.assessment_before_dislysis.venous_catheterization_part_other:''}}</div>
@@ -202,16 +208,16 @@
                   <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       中心静脉导管：
-                      <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '正常')"></check-box>
-                      <check-box text="不畅" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '不畅')"></check-box>
-                      <check-box text="血流不足" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血流不足')"></check-box>
-                      (<check-box text="正接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '正接')"></check-box>/
-                      <check-box text="反接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '反接')"></check-box>)
-                      <check-box text="血栓" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '血栓')"></check-box>
-                      <check-box text="缝线脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '缝线脱落')"></check-box>
-                      <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '导管脱落')"></check-box>
-                      <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '感染')"></check-box>
-                      <check-box text="破损" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'ductus_arantii', '破损')"></check-box>
+                      <check-box text="正常" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '正常')"></check-box>
+                      <check-box text="不畅" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '不畅')"></check-box>
+                      <check-box text="血流不足" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '血流不足')"></check-box>
+                      (<check-box text="正接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '正接')"></check-box>/
+                      <check-box text="反接" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '反接')"></check-box>)
+                      <check-box text="血栓" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '血栓')"></check-box>
+                      <check-box text="缝线脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '缝线脱落')"></check-box>
+                      <check-box text="导管脱落" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '导管脱落')"></check-box>
+                      <check-box text="感染" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '感染')"></check-box>
+                      <check-box text="破损" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'catheter', '破损')"></check-box>
                     </div>
                     <div class="inline_block">
                       其它：
@@ -600,21 +606,42 @@
                   <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       内瘘震颤和血管杂音:
-                      <check-box text="存在" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'tremor_noise', 1)"></check-box>
-                      <check-box text="减弱" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'tremor_noise', 2)"></check-box>
-                      <check-box text="不存在" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'tremor_noise', 3)"></check-box>
+                      <check-box text="正常" :checked="record.assessment_after_dislysis.internal_fistula.indexOf('正常') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="减弱" :checked="record.assessment_after_dislysis.internal_fistula.indexOf('减弱') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="不存在" :checked="record.assessment_after_dislysis.internal_fistula.indexOf('不存在') > -1
+                          ? true
+                          : false"></check-box>
                     </div>
                     <div class="inline_block">
                       &emsp;失衡综合症:
-                      <check-box text="无" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'disequilibrium_syndrome', 1)"></check-box>
-                      <check-box text="有" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'disequilibrium_syndrome', 2)"></check-box>
+                      <check-box text="无" :checked=" record.assessment_after_dislysis.complication.indexOf('无') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="有" :checked="record.assessment_after_dislysis.complication.indexOf('头晕') > -1 ||
+                          record.assessment_after_dislysis.complication.indexOf('头痛') > -1||
+                            record.assessment_after_dislysis.complication.indexOf('呕吐') > -1||
+                              record.assessment_after_dislysis.complication.indexOf('低血压') > -1
+                          ? true
+                          : false"></check-box>
                     </div>
                     <div class="inline_block">
                       （
-                      <check-box text="头晕" :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'disequilibrium_syndrome_option', '头晕')"></check-box>
-                      <check-box text="头痛" :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'disequilibrium_syndrome_option', '头痛')"></check-box>
-                      <check-box text="呕吐" :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'disequilibrium_syndrome_option', '呕吐')"></check-box>
-                      <check-box text="低血压" :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'disequilibrium_syndrome_option', '低血压')"></check-box>
+                      <check-box text="头晕" :checked=" record.assessment_after_dislysis.complication.indexOf('头晕') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="头痛" :checked="  record.assessment_after_dislysis.complication.indexOf('头痛') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="呕吐" :checked="  record.assessment_after_dislysis.complication.indexOf('呕吐') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="低血压" :checked="  record.assessment_after_dislysis.complication.indexOf('低血压') > -1
+                          ? true
+                          : false"></check-box>
                       ）
                     </div>
                   </div>
@@ -636,10 +663,18 @@
                     </div>
                     <div class="inline_block">
                       &emsp;透析器:
-                      <check-box text="0" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialyzer', 1)"></check-box>
-                      <check-box text="+" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialyzer', 2)"></check-box>
-                      <check-box text="++" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialyzer', 3)"></check-box>
-                      <check-box text="+++" :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'dialyzer', 4)"></check-box>
+                      <check-box text="0" :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-0度') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="+" :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅰ度') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="++" :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅱ度') > -1
+                          ? true
+                          : false"></check-box>
+                      <check-box text="+++" :checked="record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅲ度') > -1
+                          ? true
+                          : false"></check-box>
                     </div>
                   </div>
                 </td>
@@ -1116,6 +1151,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
+          }
+        }
+      },
       printAction: function() {
         const style = '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}'
 

src/xt_pages/dialysis/batch_print/batch_print_order_nine.vue

@@ -1434,8 +1434,7 @@
                               >
                                 <label-box
                                   :isChecked="
-                                    record.assessment_after_dislysis
-                                      .tremor_noise == 1
+                                    record.assessment_after_dislysis.internal_fistula.indexOf('震颤-存在')>-1
                                       ? true
                                       : false
                                   "
@@ -1443,8 +1442,7 @@
                                 ></label-box>
                                 <label-box
                                   :isChecked="
-                                    record.assessment_after_dislysis
-                                      .tremor_noise == 2
+                                    record.assessment_after_dislysis.internal_fistula.indexOf('震颤-减弱')>-1
                                       ? true
                                       : false
                                   "
@@ -1452,8 +1450,7 @@
                                 ></label-box>
                                 <label-box
                                   :isChecked="
-                                    record.assessment_after_dislysis
-                                      .tremor_noise == 3
+                                    record.assessment_after_dislysis.internal_fistula.indexOf('震颤-无')>-1
                                       ? true
                                       : false
                                   "
@@ -1526,12 +1523,20 @@
                             <td width="40">肝素:</td>
                             <td width="30">A端</td>
                             <td width="30">
-                              <div class="under-line">&nbsp;</div>
+                              <div class="under-line">&nbsp;{{
+                                record.assessment_after_dislysis.cvc_a
+                                ?  record.assessment_after_dislysis.cvc_a
+                                : ""
+                                }}</div>
                             </td>
                             <td width="20">ml</td>
                             <td width="30">V端</td>
                             <td width="30">
-                              <div class="under-line">&nbsp;</div>
+                              <div class="under-line">&nbsp;{{
+                                record.assessment_after_dislysis.cvc_v
+                                ?  record.assessment_after_dislysis.cvc_v
+                                : ""
+                                }}</div>
                             </td>
                             <td width="20">ml</td>
                             <td></td>
@@ -1651,8 +1656,7 @@
                               >
                                 <label-box
                                   :isChecked="
-                                    record.assessment_after_dislysis.dialyzer ==
-                                    1
+                                    record.assessment_after_dislysis.cruor.indexOf('透析器-0度') > -1
                                       ? true
                                       : false
                                   "
@@ -1660,8 +1664,7 @@
                                 ></label-box>
                                 <label-box
                                   :isChecked="
-                                    record.assessment_after_dislysis.dialyzer ==
-                                    2
+                                   record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅰ度') > -1
                                       ? true
                                       : false
                                   "
@@ -1669,8 +1672,7 @@
                                 ></label-box>
                                 <label-box
                                   :isChecked="
-                                    record.assessment_after_dislysis.dialyzer ==
-                                    3
+                                   record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅱ度') > -1
                                       ? true
                                       : false
                                   "
@@ -1678,8 +1680,7 @@
                                 ></label-box>
                                 <label-box
                                   :isChecked="
-                                    record.assessment_after_dislysis.dialyzer ==
-                                    4
+                                    record.assessment_after_dislysis.cruor.indexOf('透析器-Ⅲ度') > -1
                                       ? true
                                       : false
                                   "
@@ -1693,10 +1694,18 @@
                               <div
                                 style="display:flex;justify-content:space-between;"
                               >
-                                <label-box showValue="无"></label-box>
-                                <label-box showValue="+"></label-box>
-                                <label-box showValue="+ +"></label-box>
-                                <label-box showValue="+ + +"></label-box>
+                                <label-box showValue="无" :isChecked="
+                            record.assessment_after_dislysis.channel == 1 ? true : false
+                          "></label-box>
+                                <label-box showValue="+" :isChecked="
+                            record.assessment_after_dislysis.channel == 2 ? true : false
+                          "></label-box>
+                                <label-box showValue="+ +" :isChecked="
+                            record.assessment_after_dislysis.channel == 3 ? true : false
+                          "></label-box>
+                                <label-box showValue="+ + +" :isChecked="
+                            record.assessment_after_dislysis.channel == 4 ? true : false
+                          "></label-box>
                               </div>
                             </td>
                             <td></td>

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -456,31 +456,25 @@
                         <check-box
                           text="锁骨下"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_before_dislysis,
-                              'venous_catheterization_part',
-                              1
-                            )
+                          record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','锁骨下')
+                          ? true
+                          : false
                           "
                         ></check-box>
                         <check-box
                           text="颈静脉"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_before_dislysis,
-                              'venous_catheterization_part',
-                              2
-                            )
+                          record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈静脉')
+                          ? true
+                          : false
                           "
                         ></check-box>
                         <check-box
                           text="股静脉"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_before_dislysis,
-                              'venous_catheterization_part',
-                              3
-                            )
+                           record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','股静脉')
+                          ? true
+                          : false
                           "
                         ></check-box>
                         <div class="inline_block">
@@ -507,7 +501,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '正常'
                             )
                           "
@@ -517,7 +511,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '不畅'
                             )
                           "
@@ -527,7 +521,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '血流不足'
                             )
                           "
@@ -538,7 +532,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '正接'
                             )
                           "
@@ -549,7 +543,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '反接'
                             )
                           "
@@ -560,7 +554,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '血栓'
                             )
                           "
@@ -570,7 +564,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '缝线脱落'
                             )
                           "
@@ -580,7 +574,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '导管脱落'
                             )
                           "
@@ -590,7 +584,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '感染'
                             )
                           "
@@ -600,7 +594,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'ductus_arantii',
+                              'catheter',
                               '破损'
                             )
                           "
@@ -3557,6 +3551,14 @@ export default {
       })
   },
   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
+        }
+      }
+    },
     printAction: function() {
       const style =
         '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}'

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -451,28 +451,25 @@
                         <check-box
                           text="锁骨下"
                           :checked="
-                            record.assessment_before_dislysis
-                              .venous_catheterization_part == 1
-                              ? true
-                              : false
+                          record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','锁骨下')
+                          ? true
+                          : false
                           "
                         ></check-box>
                         <check-box
                           text="颈静脉"
                           :checked="
-                            record.assessment_before_dislysis
-                              .venous_catheterization_part == 2
-                              ? true
-                              : false
+                          record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈静脉')
+                          ? true
+                          : false
                           "
                         ></check-box>
                         <check-box
                           text="股静脉"
                           :checked="
-                            record.assessment_before_dislysis
-                              .venous_catheterization_part == 3
-                              ? true
-                              : false
+                           record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','股静脉')
+                          ? true
+                          : false
                           "
                         ></check-box>
                         <div class="inline_block">
@@ -2545,6 +2542,14 @@ export default {
       });
   },
   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
+        }
+      }
+    },
     printAction: function() {
       const style =
         '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';

src/xt_pages/dialysis/batch_print/batch_print_order_three.vue

@@ -1193,31 +1193,25 @@
                         <check-box
                           text="存在"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'internal_fistula_tremor_ac',
-                              1
-                            )
+                            record.assessment_after_dislysis.internal_fistula.indexOf('存在') > -1
+                              ? true
+                              : false
                           "
                         ></check-box>
                         <check-box
                           text="减弱"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'internal_fistula_tremor_ac',
-                              2
-                            )
+                            record.assessment_after_dislysis.internal_fistula.indexOf('减弱') > -1
+                              ? true
+                              : false
                           "
                         ></check-box>
                         <check-box
-                          text="无"
+                          text="不存在"
                           :checked="
-                            isCheckBoxChecked(
-                              record.assessment_after_dislysis,
-                              'internal_fistula_tremor_ac',
-                              3
-                            )
+                             record.assessment_after_dislysis.internal_fistula.indexOf('不存在') > -1
+                              ? true
+                              : false
                           "
                         ></check-box>
                       </div>

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

@@ -453,6 +453,37 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+
+
+          <el-col :span="8" v-if="isShow('中心静脉封管(肝素-A端)')">
+            <el-form-item label="中心静脉封管(肝素-A端): ">
+              <el-input v-model="form.cvc_a"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8" v-if="isShow('中心静脉封管(肝素-V端)')">
+            <el-form-item label="中心静脉封管(肝素-V端): ">
+              <el-input v-model="form.cvc_v"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShow('管路')">
+            <el-form-item label="管路: ">
+              <el-select v-model="form.channel">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option
+                  v-for="item in channels"
+                  :label="item.name"
+                  :value="item.id"
+                  :key="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+
         </el-row>
       </el-form>
 
@@ -530,6 +561,7 @@ export default {
       internalFistulaTremorAcOptions: [],
       patientGoseOptions: [],
       observationContentOptions: [],
+      channels:[],
 
       isVisibiltyForCruorDialog: false,
       dialogCruorTitle: "凝血",
@@ -585,7 +617,11 @@ export default {
         intravenous_tube: "",
         dialyzer: "",
         breathing_rate: "",
-        dialysis_intakes_unit: 0
+        dialysis_intakes_unit: 0,
+        cvc_a:0,
+        cvc_v:0,
+        channel:"",
+
       }
     };
   },
@@ -1030,6 +1066,8 @@ export default {
     this.observationContentOptions = this.$store.getters.observation_content;
     this.template_id = this.$store.getters.xt_user.template_info.template_id;
 
+    this.channels = this.$store.getters.channels
+
     var date = this.$route.query && this.$route.query.date;
     this.record_date = uParseTime(date, "{y}-{m}-{d}");
   },

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

@@ -140,7 +140,7 @@
             align="center"
             label="超滤量(ml)"
             width="110"
-            v-if="isShow('超滤量') && template_id == 6"
+            v-if="isShow('超滤量') && (template_id == 6 || template_id == 10)"
           >
             <template slot-scope="scope">
               {{
@@ -155,7 +155,7 @@
             align="center"
             label="超滤量(L)"
             width="110"
-            v-if="isShow('超滤量') && template_id != 6"
+            v-if="isShow('超滤量') && (template_id != 6 || template_id != 10)"
           >
             <template slot-scope="scope">
               {{
@@ -200,7 +200,7 @@
             align="center"
             label="置换率(ml/min)"
             width="120"
-            v-if="isShow('置换率') && template_id == 6"
+            v-if="isShow('置换率') && (template_id == 6  || template_id == 10)"
           >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
@@ -211,7 +211,7 @@
             align="center"
             label="置换率(L/h)"
             width="120"
-            v-if="isShow('置换率') && template_id != 6"
+            v-if="isShow('置换率') && (template_id != 6 || template_id != 10)"
           >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
@@ -222,7 +222,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if="isShow('置换量' && template_id == 6)"
+            v-if="isShow('置换量') && (template_id == 6 || template_id == 10)"
           >
             <template slot-scope="scope">
               {{
@@ -238,7 +238,7 @@
             align="center"
             label="SpO₂(%)"
             width="100"
-            v-if="isShow('SpO₂') && template_id != 6"
+            v-if="isShow('SpO₂') && (template_id != 6 || template_id != 10)"
           >
             <template slot-scope="scope">
               {{
@@ -254,7 +254,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if="isShow('置换量') && template_id != 6"
+            v-if="isShow('置换量') && (template_id != 6 || template_id != 10)"
           >
             <template slot-scope="scope">
               {{

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -12,16 +12,16 @@
         <th width="76px">静脉压/动脉压(mmHg)</th>
         <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
         <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmhg)</th>
-        <th v-if="isShow('超滤量') && template_id == 6" width="76px">超滤量(ml)</th>
-        <th v-if="isShow('超滤量') && template_id != 6" width="76px">超滤量(L)</th>
+        <th v-if="isShow('超滤量') && (template_id == 6 || template_id == 10)" width="76px">超滤量(ml)</th>
+        <th v-if="isShow('超滤量') && (template_id != 6 || template_id != 10)" width="76px">超滤量(L)</th>
         <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
         <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-        <th v-if="isShow('置换率')&& template_id == 6" width="92px">置换率(ml/min)</th>
-        <th v-if="isShow('置换率')&&template_id != 6" width="92px">置换率(L/h)</th>
+        <th v-if="isShow('置换率')&& (template_id == 6 || template_id == 10)" width="92px">置换率(ml/min)</th>
+        <th v-if="isShow('置换率')&& (template_id != 6 || template_id != 10)" width="92px">置换率(L/h)</th>
 
-        <th v-if="isShow('置换量')&& template_id == 6" width="92px">置换量(ml)</th>
-        <th v-if="isShow('置换量')&& template_id != 6" width="92px">置换量(L)</th>
-         <th v-if="isShow('SpO₂')&& template_id != 6" width="92px">SpO₂(%)</th>
+        <th v-if="isShow('置换量')&& (template_id == 6 || template_id == 10)" width="92px">置换量(ml)</th>
+        <th v-if="isShow('置换量')&& (template_id != 6 || template_id != 10)" width="92px">置换量(L)</th>
+         <th v-if="isShow('SpO₂')&& (template_id != 6 || template_id != 10)" width="92px">SpO₂(%)</th>
         <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
         <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
         <th v-if="isShow('病情变化')" width="92px">病情变化</th>

src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue

@@ -1413,19 +1413,19 @@
                       <div style="display:flex;justify-content:space-between;">
                         <label-box
                           :isChecked="
-                            afterdialysis.tremor_noise == 1 ? true : false
+                           afterdialysis.internal_fistula.indexOf('震颤-存在')>-1?true:false
                           "
                           showValue="存在"
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.tremor_noise == 3 ? true : false
+                            afterdialysis.internal_fistula.indexOf('震颤-减弱')>-1? true : false
                           "
                           showValue="减弱"
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.tremor_noise == 2 ? true : false
+                             afterdialysis.internal_fistula.indexOf('震颤-无')>-1 ? true : false
                           "
                           showValue="不存在"
                         ></label-box>
@@ -1488,12 +1488,20 @@
                     <td width="40">肝素:</td>
                     <td width="30">A端</td>
                     <td width="30">
-                      <div class="under-line">&nbsp;</div>
+                      <div class="under-line">&nbsp;{{
+                        afterdialysis.cvc_a
+                        ? afterdialysis.cvc_a
+                        : ""
+                        }}</div>
                     </td>
                     <td width="20">ml</td>
                     <td width="30">V端</td>
                     <td width="30">
-                      <div class="under-line">&nbsp;</div>
+                      <div class="under-line">{{
+                        afterdialysis.cvc_v
+                        ? afterdialysis.cvc_v
+                        : ""
+                        }}</div>
                     </td>
                     <td width="20">ml</td>
                     <td></td>
@@ -1509,7 +1517,7 @@
                       <div style="display:flex;justify-content:space-between;">
                         <label-box
                           :isChecked="
-                            afterdialysis.complications_index.indexOf('无') > -1
+                            afterdialysis.complication.indexOf('无') > -1
                               ? true
                               : false
                           "
@@ -1517,7 +1525,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.complications_index.indexOf('头晕') >
+                            afterdialysis.complication.indexOf('头晕') >
                             -1
                               ? true
                               : false
@@ -1526,7 +1534,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.complications_index.indexOf('头痛') >
+                            afterdialysis.complication.indexOf('头痛') >
                             -1
                               ? true
                               : false
@@ -1535,7 +1543,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.complications_index.indexOf('呕吐') >
+                            afterdialysis.complication.indexOf('呕吐') >
                             -1
                               ? true
                               : false
@@ -1544,7 +1552,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.complications_index.indexOf(
+                            afterdialysis.complication.indexOf(
                               '低血压'
                             ) > -1
                               ? true
@@ -1555,7 +1563,7 @@
                         <label-box showValue="发热"></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.complications_index.indexOf('抽搐') >
+                            afterdialysis.complication.indexOf('抽搐') >
                             -1
                               ? true
                               : false
@@ -1564,7 +1572,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.complications_index.indexOf(
+                            afterdialysis.complication.indexOf(
                               '高血压'
                             ) > -1
                               ? true
@@ -1574,7 +1582,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.complications_index.indexOf(
+                            afterdialysis.complication.indexOf(
                               '心律失常'
                             ) > -1
                               ? true
@@ -1631,25 +1639,25 @@
                       <div style="display:flex;justify-content:space-between;">
                         <label-box
                           :isChecked="
-                            afterdialysis.dialyzer == 1 ? true : false
+                            afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false
                           "
                           showValue="无"
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.dialyzer == 2 ? true : false
+                             afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false
                           "
                           showValue="+"
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.dialyzer == 3 ? true : false
+                            afterdialysis.cruor.indexOf('透析器-Ⅱ度') >  -1 ? true : false
                           "
                           showValue="+ +"
                         ></label-box>
                         <label-box
                           :isChecked="
-                            afterdialysis.dialyzer == 4 ? true : false
+                            afterdialysis.cruor.indexOf('透析器-Ⅲ度')> -1  ? true : false
                           "
                           showValue="+ + +"
                         ></label-box>
@@ -1659,10 +1667,18 @@
                     <td width="60">管路:</td>
                     <td width="220">
                       <div style="display:flex;justify-content:space-between;">
-                        <label-box showValue="无"></label-box>
-                        <label-box showValue="+"></label-box>
-                        <label-box showValue="+ +"></label-box>
-                        <label-box showValue="+ + +"></label-box>
+                        <label-box showValue="无" :isChecked="
+                            afterdialysis.channel == 1 ? true : false
+                          "></label-box>
+                        <label-box showValue="+" :isChecked="
+                            afterdialysis.channel == 2 ? true : false
+                          "></label-box>
+                        <label-box showValue="+ +" :isChecked="
+                            afterdialysis.channel == 3  ? true : false
+                          "></label-box>
+                        <label-box showValue="+ + +" :isChecked="
+                            afterdialysis.channel == 4 ? true : false
+                          "></label-box>
                       </div>
                     </td>
                     <td></td>
@@ -2038,7 +2054,7 @@
               <span v-if="advice[0].advice_desc"
                 >{{ advice[0].advice_desc }}{{ advice[0].drug_spec_unit }}</span
               >
-              
+
               <span v-if="advice[0].prescribing_number"
                 >* {{ advice[0].prescribing_number
                 }}{{ advice[0].prescribing_number_unit }}</span

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -267,7 +267,7 @@
                     <check-box
                       text="锁骨下"
                       :checked="
-                        predialysis.venous_catheterization_part == 1
+                        predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','锁骨下')
                           ? true
                           : false
                       "
@@ -275,7 +275,7 @@
                     <check-box
                       text="颈静脉"
                       :checked="
-                        predialysis.venous_catheterization_part == 2
+                        predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈静脉')
                           ? true
                           : false
                       "
@@ -283,7 +283,7 @@
                     <check-box
                       text="股静脉"
                       :checked="
-                        predialysis.venous_catheterization_part == 3
+                        predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','股静脉')
                           ? true
                           : false
                       "
@@ -2267,6 +2267,7 @@ export default {
       anticoagulantsConfit: {},
       bloodAccessParOpera: {},
       dialysateFormulationOptions: {},
+      blood_access_part:[],
 
       queryParams: {
         xtdate: '',
@@ -2326,6 +2327,14 @@ export default {
     }
   },
   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 ''
@@ -2946,6 +2955,9 @@ export default {
     this.intake_arr = getDataConfig('hemodialysis', 'intake')
     this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
 
+    this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
+
+
     this.bloodAccessParOpera = getDataConfig(
       'hemodialysis',
       'vascular_access_desc'

src/xt_pages/workforce/components/tableWeeks.vue

@@ -257,8 +257,8 @@
             break
         }
         return type_name
-      },getAdvice:function(doctor_advice) {
-        console.log(doctor_advice)
+      },
+      getAdvice:function(doctor_advice) {
 
         let name = ""
         for (let i = 0; i< doctor_advice.length; i++){
@@ -281,44 +281,38 @@
 
           name = name + doctor_advice[i].advice_name +" "+ drug_spec+" "+ prescribing_number + " "+single_dose+" " + doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency +" " + doctor_advice[i].remark +"\n"
 
-          // if (doctor_advice[i].child.length > 0){
-          //   for (let a = 0 ; a < doctor_advice[a].child.length; a++){
-          //     if(doctor_advice[i].child[a].prescribing_number > 0){
-          //       doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
-          //     }else{
-          //       doctor_advice[i].child[a]['presc'] = ''
-          //     }
-          //
-          //     if(doctor_advice[i].child[a].single_dose > 0){
-          //       doctor_advice[i].child[a]['single'] = " "+' 单次用量 '+" "+doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
-          //     }else{
-          //       doctor_advice[i].child[a]['single'] = ''
-          //     }
-          //     name = name+"▲"+doctor_advice[i].child[a].advice_name+""
-          //       + doctor_advice[i].child[a].advice_desc
-          //       + doctor_advice[i].child[a].drug_spec_unit
-          //       + doctor_advice[i].child[a].presc
-          //       + doctor_advice[i].child[a].single
-          //
-          //
-          //   }
-          //   return  doctor_advice[i].advice_name +"  "+ doctor_advice[i].advice_desc+" "
-          //     + doctor_advice[i].drug_spec_unit
-          //     + prescribing_number
-          //     + " "+single_dose+" "+ " "+doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency + doctor_advice[i].remark +name
-          //
-          // }else{
-          //
-          //
-          //
-          // }
+          if (doctor_advice[i].child.length > 0){
 
+            for (let a = 0 ; a < doctor_advice[i].child.length; a++){
 
-        }
+              if(doctor_advice[i].child[a].prescribing_number > 0){
+                doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+              }else{
+                doctor_advice[i].child[a]['presc'] = ''
+              }
+
+              if(doctor_advice[i].child[a].single_dose > 0){
+                doctor_advice[i].child[a]['single'] = " "+' 单次用量 '+" "+doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+              }else{
+                doctor_advice[i].child[a]['single'] = ''
+              }
+
+
+              name = name+"▲"+doctor_advice[i].child[a].advice_name+""
+                + doctor_advice[i].child[a].advice_desc
+                + doctor_advice[i].child[a].drug_spec_unit
+                + doctor_advice[i].child[a].presc
+                + doctor_advice[i].child[a].single+"\n"
+            }
 
 
+          }
+
+        }
         return name
 
+
+
       }
     },
     components: {

src/xt_pages/workforce/remind_print.vue

@@ -135,7 +135,6 @@
     },
     methods: {
       getAdvice:function(doctor_advice) {
-        console.log(doctor_advice)
 
         let name = ""
         for (let i = 0; i< doctor_advice.length; i++){
@@ -158,38 +157,31 @@
 
           name = name + doctor_advice[i].advice_name +" "+ drug_spec+" "+ prescribing_number + " "+single_dose+" " + doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency +" " + doctor_advice[i].remark +"\n"
 
-          // if (doctor_advice[i].child.length > 0){
-          //   for (let a = 0 ; a < doctor_advice[a].child.length; a++){
-          //     if(doctor_advice[i].child[a].prescribing_number > 0){
-          //       doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
-          //     }else{
-          //       doctor_advice[i].child[a]['presc'] = ''
-          //     }
-          //
-          //     if(doctor_advice[i].child[a].single_dose > 0){
-          //       doctor_advice[i].child[a]['single'] = " "+' 单次用量 '+" "+doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
-          //     }else{
-          //       doctor_advice[i].child[a]['single'] = ''
-          //     }
-          //     name = name+"▲"+doctor_advice[i].child[a].advice_name+""
-          //       + doctor_advice[i].child[a].advice_desc
-          //       + doctor_advice[i].child[a].drug_spec_unit
-          //       + doctor_advice[i].child[a].presc
-          //       + doctor_advice[i].child[a].single
-          //
-          //
-          //   }
-          //   return  doctor_advice[i].advice_name +"  "+ doctor_advice[i].advice_desc+" "
-          //     + doctor_advice[i].drug_spec_unit
-          //     + prescribing_number
-          //     + " "+single_dose+" "+ " "+doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency + doctor_advice[i].remark +name
-          //
-          // }else{
-          //
-          //
-          //
-          // }
+          if (doctor_advice[i].child.length > 0){
 
+            for (let a = 0 ; a < doctor_advice[i].child.length; a++){
+
+              if(doctor_advice[i].child[a].prescribing_number > 0){
+                doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+              }else{
+                doctor_advice[i].child[a]['presc'] = ''
+              }
+
+              if(doctor_advice[i].child[a].single_dose > 0){
+                doctor_advice[i].child[a]['single'] = " "+' 单次用量 '+" "+doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+              }else{
+                doctor_advice[i].child[a]['single'] = ''
+              }
+
+
+              name = name+"▲"+doctor_advice[i].child[a].advice_name+""
+                + doctor_advice[i].child[a].advice_desc
+                + doctor_advice[i].child[a].drug_spec_unit
+                + doctor_advice[i].child[a].presc
+                + doctor_advice[i].child[a].single+"\n"
+            }
+
+          }
 
         }
         return name