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

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

             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">
               {{
             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">
               {{
             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 : "" }}
             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 : "" }}
             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">
               {{
             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">
               {{
             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

         <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/workforce/components/tableWeeks.vue

             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++){
 
           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

     },
     methods: {
       getAdvice:function(doctor_advice) {
-        console.log(doctor_advice)
 
         let name = ""
         for (let i = 0; i< doctor_advice.length; i++){
 
           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