Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/patient.js

@@ -169,7 +169,7 @@ export function createCourseOfDiseaseRecord(patient_id, content, record_time, ti
   return request({
     url: '/api/patient/course/create',
     method: 'post',
-    params: params
+    data: params
   })
 }
 
@@ -186,7 +186,7 @@ export function modifyCourseOfDiseaseRecord(patient_id, content, record_time, id
   return request({
     url: '/api/patient/course/modify',
     method: 'post',
-    params: params
+    data: params
   })
 }
 

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

@@ -294,7 +294,7 @@
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 32)" >
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -305,7 +305,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id !=32)" >
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -22,8 +22,8 @@
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29" width="92px" > 置换率(L/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 32)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id!=32)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -137,14 +137,23 @@
               }}L
             </span>
           </td>
-          <td style="text-align:left;" colspan="2">
+          <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
               <label-box :isChecked="anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>
             </span>
           </td>
-          <td style="text-align:left;" colspan="1">
+          <td style="text-align:left;" colspan="2">
             <span style="display:inline-block;margin-left:15px;">
-              肝素首剂:
+              <span v-if="prescription.anticoagulant == 2">肝素首剂:</span>
+              <span v-if="prescription.anticoagulant == 3">低分子肝素首剂:</span>
+              <span v-if="prescription.anticoagulant == 4">阿加曲班肝素首剂:</span>
+              <span v-if="prescription.anticoagulant == 5">枸橼酸钠肝素首剂:</span>
+              <span v-if="prescription.anticoagulant == 6">低分子肝素钙首剂:</span>
+              <span v-if="prescription.anticoagulant == 7">低分子肝素钠首剂:</span>
+              <span v-if="prescription.anticoagulant == 8">依诺肝素首剂:</span>
+              <span v-if="prescription.anticoagulant == 9">达肝素首剂:</span>
+              <span v-if="prescription.anticoagulant == 10">体外抗凝肝素首剂:</span>
+              
               {{
               prescription.anticoagulant_shouji
               ? prescription.anticoagulant_shouji
@@ -850,7 +859,8 @@
               <label-box showValue="0级" :isChecked="afterdialysis.cruor.indexOf('透析器-0级') > -1"></label-box>
               <label-box showValue="1级" :isChecked="afterdialysis.cruor.indexOf('透析器-1级') > -1"></label-box>
               <label-box showValue="2级" :isChecked="afterdialysis.cruor.indexOf('透析器-2级') > -1"></label-box>
-              <label-box showValue="3级" :isChecked="afterdialysis.cruor.indexOf('透析器-3级') > -1"></label-box>
+              <label-box showValue="3级" :isChecked="afterdialysis.cruor.indexOf('透析器-3级') > -1"></label-box>&nbsp;&nbsp;
+              {{ getCruor(afterdialysis.cruor) }}
             </span>
           </td>
         </tr>
@@ -1252,6 +1262,25 @@ export default {
     }
   },
   methods: {
+    getCruor(cruor){
+      if(cruor.indexOf(',') == -1){
+        let str = cruor
+        if(['透析器-0级','透析器-1级','透析器-2级','透析器-3级'].indexOf(str) == -1){
+          return str
+        }
+      }else if(cruor.indexOf(',') > -1){
+        let str = cruor
+        if(['透析器-0级','透析器-1级','透析器-2级','透析器-3级'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['透析器-0级','透析器-1级','透析器-2级','透析器-3级'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
+    },
     getAdminUser(id) {
       if (id == 0) {
         return ''

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -688,7 +688,7 @@
                     <td width="20">钙</td>
                     <td width="180">
                       (
-                        <label-box :isChecked="false" showValue="1.25"></label-box>
+                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('低钙') > -1 ? true : false" showValue="1.25"></label-box>
                         <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : false" showValue="1.5"></label-box>
                         <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('高钙') > -1 ? true : false" showValue="1.75"></label-box>
                       )
@@ -698,7 +698,7 @@
 
                     <td width="160">
                       (
-                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : false" showValue="2.0"></label-box>
+                        <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : prescription.dialysate_formulation_name.indexOf('高钙') > -1 ? true : prescription.dialysate_formulation_name.indexOf('低钙') > -1 ? true : false" showValue="2.0"></label-box>
                         <label-box :isChecked="false" showValue="3.0mmol/L"></label-box>
                       )
                     </td>