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

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1137,10 +1137,7 @@
                       </div>
                       <div class="inline_block" style="margin-left: 20px;">
                         透析器凝血：
-                        <div
-                          class="under_line"
-                          style="width: 100px"
-                        >
+                        <div class="under_line" style="width: 100px">
                           {{
                             record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.cruor
@@ -2085,7 +2082,7 @@ export default {
       });
   },
   methods: {
-   getAge: function(val) {
+    getAge: function(val) {
       val.birth = uParseTime(val.birthday, "{y}-{m}-{d}");
       if (
         this.org_template_info.template_id == 2 ||

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -268,8 +268,8 @@
           <span class="unit"> </span>
         </li>
 
-        <li v-if="isShow('内瘘皮肤情况')">
-          <label>内瘘皮肤情况: </label>
+        <li v-if="isShow('血管通路皮肤情况')">
+          <label>血管通路皮肤情况: </label>
           <span class="content">{{ internal_fistula_skin }}</span>
           <span class="unit"></span>
         </li>

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

@@ -138,18 +138,21 @@
         label="跌倒风险预防措施: "
         v-if="isShow('跌倒风险预防措施')"
       >
-        <!--<el-radio v-model="receiveTreatmentAsses.precaution" label="1">镇定剂</el-radio>-->
-        <!--<el-radio v-model="receiveTreatmentAsses.precaution" label="2">约束带</el-radio>-->
-        <!--<el-radio v-model="receiveTreatmentAsses.precaution" label="3">床栏</el-radio>-->
-        <!--<el-radio v-model="receiveTreatmentAsses.precaution" label="4">加强宣教</el-radio>-->
-
-        <el-radio
-          v-for="(item, index) in precaution_arr"
-          :key="index"
-          :label="item.id"
-          v-model="receiveTreatmentAsses.precaution"
-          >{{ item.name }}
-        </el-radio>
+        <!--        <el-radio-->
+        <!--          v-for="(item, index) in precaution_arr"-->
+        <!--          :key="index"-->
+        <!--          :label="item.id"-->
+        <!--          v-model="receiveTreatmentAsses.precaution"-->
+        <!--          >{{ item.name }}-->
+        <!--        </el-radio>-->
+        <el-checkbox-group v-model="precautionTwo">
+          <el-checkbox
+            v-for="item in precaution_arr"
+            :label="item.name"
+            :key="item.id"
+            >{{ item.name }}</el-checkbox
+          >
+        </el-checkbox-group>
       </el-form-item>
       <el-form-item
         label-width="200px"
@@ -266,10 +269,11 @@ export default {
         sick_condition_other: "",
         score: "",
         psychological_other: "",
-        precaution: "1",
+        precaution: "",
         precaution_other: "",
         admission_number: ""
-      }
+      },
+      precautionTwo: []
     };
   },
   methods: {
@@ -289,6 +293,20 @@ export default {
     show(accepts) {
       this.accepts = accepts;
       console.log("accepts", accepts);
+      var arr = [];
+      var precaution = this.accepts.precaution.split(",");
+      console.log("precaution", precaution);
+      console.log("hhh", this.precaution_arr);
+      for (let i = 0; i < precaution.length; i++) {
+        for (let j = 0; j < this.precaution_arr.length; j++) {
+          if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
+            console.log("aaaa");
+            arr.push(this.precaution_arr[j].name);
+          }
+        }
+      }
+      this.precautionTwo = arr;
+      console.log("arr", arr);
       this.getPermission();
       for (var index in this.receiveTreatmentAsses) {
         if (
@@ -313,7 +331,19 @@ export default {
       this.isVisibility = false;
     },
     handleComfirm: function() {
+      var arr = [];
+      for (let i = 0; i < this.precaution_arr.length; i++) {
+        for (let j = 0; j < this.precautionTwo.length; j++) {
+          if (this.precaution_arr[i].name == this.precautionTwo[j]) {
+            arr.push(this.precaution_arr[i].id);
+          }
+        }
+      }
+      console.log("arr", arr);
+      var obj = arr.join(",");
+      this.receiveTreatmentAsses.precaution = obj;
       let ParamsQuery = this.receiveTreatmentAsses;
+      console.log("ParamsQuery", ParamsQuery);
       ParamsQuery["patient"] = this.patient.id;
       ParamsQuery["record_date"] = this.record_date;
       console.log(this.receiver_treatment_access);
@@ -327,7 +357,7 @@ export default {
           ParamsQuery["mode"] = "3";
         }
       }
-
+      console.log("数据", this.precautionTwo);
       postAccepts(ParamsQuery).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
@@ -342,7 +372,8 @@ export default {
 
           let receive_treatment_asses_resp =
             response.data.data.receiveTreatmentAsses;
-          //prop
+
+          //pror
           var receiver_treatment_access = this.receiver_treatment_access;
           for (var index in receive_treatment_asses_resp) {
             // receiver_treatment_access[index] = receive_treatment_asses_resp[index];
@@ -436,6 +467,7 @@ export default {
     this.posture_arr = getDataConfig("hemodialysis", "posture");
     this.sick_condition_arr = getDataConfig("hemodialysis", "sick_condition");
     this.precaution_arr = getDataConfig("hemodialysis", "precaution");
+    console.log("风险", this.precaution_arr);
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
   }

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -740,30 +740,39 @@
               :isChecked="
                 receiverTreatmentAccess.danger_level == 4 ? true : false
               "
-            ></label-box
-            >跌倒风险预防措施：
+            >
+            </label-box
+            ><span>&nbsp;&nbsp;</span>跌倒风险预防措施：
             <label-box
-              showValue="镇静剂"
+              showValue="镇定剂"
               :isChecked="
-                receiverTreatmentAccess.precaution == 1 ? true : false
+                receiverTreatmentAccess.precaution.indexOf('镇定剂') > -1
+                  ? true
+                  : false
               "
             ></label-box>
             <label-box
               showValue="约束带"
               :isChecked="
-                receiverTreatmentAccess.precaution == 2 ? true : false
+                receiverTreatmentAccess.precaution.indexOf('约束带') > -1
+                  ? true
+                  : false
               "
             ></label-box>
             <label-box
               showValue="床栏"
               :isChecked="
-                receiverTreatmentAccess.precaution == 3 ? true : false
+                receiverTreatmentAccess.precaution.indexOf('床栏') > -1
+                  ? true
+                  : false
               "
             ></label-box>
             <label-box
               showValue="加强宣传"
               :isChecked="
-                receiverTreatmentAccess.precaution == 4 ? true : false
+                receiverTreatmentAccess.precaution.indexOf('加强宣传') > -1
+                  ? true
+                  : false
               "
             ></label-box>
           </td>
@@ -960,10 +969,12 @@
           </td>
         </tr>
         <tr>
-          <td style="text-align:left;">
-            置换液总量:{{ afterdialysis.actual_displacement }} L
+          <td style="text-align:left;" colspan="2">
+            <span style="display:inline-block;margin-left:15px;">
+              实际置换量:{{ afterdialysis.actual_displacement }} L
+            </span>
           </td>
-          <td style="text-align:left;" colspan="11">
+          <td style="text-align:left;" colspan="10">
             <span style="display:inline-block;margin-left:15px;">
               内瘘搏动及震颤音:
               <label-box
@@ -1685,6 +1696,20 @@ export default {
           this.schedule = schedule;
           var receiverTreatmentAccess =
             response.data.data.receiverTreatmentAccess;
+          var obj = receiverTreatmentAccess.precaution;
+          var arr = obj.split(",");
+          console.log("arr", arr);
+          var arr2 = [];
+          for (let i = 0; i < this.precautions.length; i++) {
+            for (let j = 0; j < arr.length; j++) {
+              if (this.precautions[i].id == parseInt(arr[j])) {
+                arr2.push(this.precautions[i].name);
+              }
+            }
+          }
+          var obj2 = arr2.join(",");
+          console.log("obj2", obj2);
+          receiverTreatmentAccess.precaution = obj2;
           console.log("接诊评估", receiverTreatmentAccess);
           this.receiverTreatmentAccess = receiverTreatmentAccess;
           var dialysisway = response.data.data.dialysisway;
@@ -2094,11 +2119,13 @@ export default {
     }
 
     this.ways = getDataConfig("hemodialysis", "way");
+    console.log("ways", this.ways);
     this.consciousnesses = getDataConfig("hemodialysis", "consciousness");
     this.appetites = getDataConfig("hemodialysis", "appetite");
     this.postures = getDataConfig("hemodialysis", "posture");
     this.sick_condition = getDataConfig("hemodialysis", "sick_condition");
     this.precautions = getDataConfig("hemodialysis", "precaution");
+    console.log("跌倒", this.precautions);
     this.intake = getDataConfig("hemodialysis", "intake");
     this.nutrition = getDataConfig("hemodialysis", "nutrition");
     var bloodAccess = getDataConfig("hemodialysis", "vascular_access");

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