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

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -254,6 +254,25 @@
             getDialyzer(this.record.dialyzer)
           }}</span>
         </li>
+
+        <li v-if="isShow('透析器')">
+          <label for="hzqx">透析器: </label>
+          <span id="hzqx" class="content">{{
+            getDialyzer(this.record.dialyzer)
+          }}</span>
+        </li>
+
+        <li v-if="isShow('中心静脉封管(肝素-A端)')">
+          <label for="bzh">中心静脉封管(肝素-A端): </label>
+          <span class="content" id="tzjs">{{this.record.cvc_a?this.record.cvc_a:''}}</span>
+          <span class="unit">{{this.record.cvc_a?'ml':''}}</span>
+        </li>
+        <li v-if="isShow('中心静脉封管(肝素-V端)')">
+          <label for="bzh">中心静脉封管(肝素-V端): </label>
+          <span class="content" id="tzjs">{{this.record.cvc_v?this.record.cvc_v:''}}</span>
+          <span class="unit">{{this.record.cvc_v?'ml':''}}</span>
+        </li>
+
       </ul>
     </div>
     <div class="note">

src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue

@@ -1383,7 +1383,7 @@
                   </tr> -->
                   <tr>
                     <td width="70">拔针压迫:</td>
-                    <td width="300">
+                    <td width="350">
                       <div style="display:flex;justify-content:space-between;">
                         <label-box
                           showValue="自己压迫"

src/xt_pages/workforce/components/tableWeeks.vue

@@ -259,60 +259,56 @@
         return type_name
       },
       getAdvice:function(doctor_advice) {
+        if (doctor_advice != null) {
+          let name = ""
+          for (let i = 0; i < doctor_advice.length; i++) {
 
-        let name = ""
-        for (let i = 0; i< doctor_advice.length; i++){
+            let prescribing_number = ''
+            let single_dose = ''
+            let drug_spec = ''
 
-          let prescribing_number = ''
-          let single_dose = ''
-          let drug_spec = ''
+            if (doctor_advice[i].prescribing_number > 0) {
+              prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+            }
+            if (doctor_advice[i].single_dose > 0) {
+              single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+            }
 
-          if (doctor_advice[i].prescribing_number > 0) {
-            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
-          }
-          if (doctor_advice[i].single_dose > 0) {
-            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
-          }
+            if (doctor_advice[i].drug_spec > 0) {
+              drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+            }
 
-          if (doctor_advice[i].drug_spec > 0) {
-            drug_spec =  doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
-          }
+            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) {
 
-          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"
+              for (let a = 0; a < doctor_advice[i].child.length; a++) {
 
-          if (doctor_advice[i].child.length > 0){
+                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'] = ''
+                }
 
-            for (let a = 0 ; a < doctor_advice[i].child.length; a++){
+                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'] = ''
+                }
 
-              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'] = ''
+                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"
               }
 
-              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
 
         }
-        return name
-
-
-
       }
     },
     components: {

src/xt_pages/workforce/remind_print.vue

@@ -135,9 +135,10 @@
     },
     methods: {
       getAdvice:function(doctor_advice) {
+        if (doctor_advice != null) {
 
         let name = ""
-        for (let i = 0; i< doctor_advice.length; i++){
+        for (let i = 0; i< doctor_advice.length; i++) {
 
           let prescribing_number = ''
           let single_dose = ''
@@ -151,40 +152,40 @@
           }
 
           if (doctor_advice[i].drug_spec > 0) {
-            drug_spec =  doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+            drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
           }
 
+          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"
 
-          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) {
 
-          if (doctor_advice[i].child.length > 0){
+            for (let a = 0; a < doctor_advice[i].child.length; a++) {
 
-            for (let a = 0 ; a < doctor_advice[i].child.length; a++){
-
-              if(doctor_advice[i].child[a].prescribing_number > 0){
+              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{
+              } 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{
+              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+""
+              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"
+                + doctor_advice[i].child[a].single + "\n"
             }
 
           }
+        }
+          return name
+
 
         }
-        return name
 
       },
       printAction: function() {