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_nine.vue

@@ -1423,19 +1423,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>
@@ -1498,12 +1498,24 @@
                       <td width="40">肝素:</td>
                       <td width="30">A端</td>
                       <td width="30">
-                        <div class="under-line">&nbsp;</div>
+                        <div class="under-line">
+                          <div class="under-line">&nbsp;{{
+                            afterdialysis.cvc_a
+                            ? afterdialysis.cvc_a
+                            : ""
+                            }}</div>
+                        </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">
+                          <div class="under-line">&nbsp;{{
+                            afterdialysis.cvc_v
+                            ? afterdialysis.cvc_v
+                            : ""
+                            }}</div>
+                        </div>
                       </td>
                       <td width="20">ml</td>
                       <td></td>
@@ -1519,7 +1531,7 @@
                         <div style="display:flex;justify-content:space-between;">
                           <label-box
                             :isChecked="
-                              afterdialysis.complications_index.indexOf('无') > -1
+                              afterdialysis.complication.indexOf('无') > -1
                                 ? true
                                 : false
                             "
@@ -1527,7 +1539,7 @@
                           ></label-box>
                           <label-box
                             :isChecked="
-                              afterdialysis.complications_index.indexOf('头晕') >
+                              afterdialysis.complication.indexOf('头晕') >
                               -1
                                 ? true
                                 : false
@@ -1536,7 +1548,7 @@
                           ></label-box>
                           <label-box
                             :isChecked="
-                              afterdialysis.complications_index.indexOf('头痛') >
+                              afterdialysis.complication.indexOf('头痛') >
                               -1
                                 ? true
                                 : false
@@ -1545,7 +1557,7 @@
                           ></label-box>
                           <label-box
                             :isChecked="
-                              afterdialysis.complications_index.indexOf('呕吐') >
+                              afterdialysis.complication.indexOf('呕吐') >
                               -1
                                 ? true
                                 : false
@@ -1554,7 +1566,7 @@
                           ></label-box>
                           <label-box
                             :isChecked="
-                              afterdialysis.complications_index.indexOf(
+                              afterdialysis.complication.indexOf(
                                 '低血压'
                               ) > -1
                                 ? true
@@ -1565,7 +1577,7 @@
                           <label-box showValue="发热"></label-box>
                           <label-box
                             :isChecked="
-                              afterdialysis.complications_index.indexOf('抽搐') >
+                              afterdialysis.complication.indexOf('抽搐') >
                               -1
                                 ? true
                                 : false
@@ -1574,7 +1586,7 @@
                           ></label-box>
                           <label-box
                             :isChecked="
-                              afterdialysis.complications_index.indexOf(
+                              afterdialysis.complication.indexOf(
                                 '高血压'
                               ) > -1
                                 ? true
@@ -1584,7 +1596,7 @@
                           ></label-box>
                           <label-box
                             :isChecked="
-                              afterdialysis.complications_index.indexOf(
+                              afterdialysis.complication.indexOf(
                                 '心律失常'
                               ) > -1
                                 ? true
@@ -1641,26 +1653,26 @@
                         <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>
                         </div>
@@ -1669,10 +1681,20 @@
                       <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>
+                          <div style="display:flex;justify-content:space-between;">
+                            <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>
                         </div>
                       </td>
                       <td></td>
@@ -2057,7 +2079,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/details/dialog/AssessmentAfterDislysis.vue

@@ -473,6 +473,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_b"></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>
 
@@ -546,6 +577,7 @@ export default {
       internalFistulaTremorAcOptions: [],
       patientGoseOptions: [],
       observationContentOptions: [],
+      channels:[],
 
       isVisibiltyForCruorDialog: false,
       dialogCruorTitle: "凝血",
@@ -601,7 +633,11 @@ export default {
         intravenous_tube: "",
         dialyzer: "",
         breathing_rate: "",
-        dialysis_intakes_unit: 0
+        dialysis_intakes_unit: 0,
+        cvc_a:0,
+        cvc_b:0,
+        channel:"",
+
       }
     };
   },
@@ -1036,6 +1072,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/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>
@@ -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