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

src/store/modules/globalConfig.js

       {
         id: 3,
         name: '自己压迫'
+      }, {
+        id: 4,
+        name: '内瘘止血带'
       }
     ],
     tremor_noise: [{

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

           </el-col>
 
           <el-col :span="8" v-if="isShow('实际超滤量')">
-            <el-form-item label="实际超滤量(L): " v-if="this.template_id != 6">
+
+            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6 || this.template_id == 10">
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
-            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6">
+            <el-form-item label="实际超滤量(L): " v-else>
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

                 parent_id: _this.groupSelectRow.parent_id,
                 groupno: _this.groupForm.groupno
               }
+              console.log(this.groupSelectRow)
               let mode = "2"
               if (this.groupSelectRow.advice_doctor != this.$store.getters.xt_user.user.id){
                 mode = "3"
           }
           this.editRowKey++
           var item = {
+            advice_doctor:groups[index].advice_doctor,
             advice_name: groups[index].advice_name,
             advice_desc: groups[index].advice_desc,
             single_dose: '' + groups[index].single_dose,
             for (const key in childMap[item.id]) {
               this.editRowKey++
               var child = {
+                advice_doctor:childMap[item.id][key].advice_doctor,
                 advice_name: childMap[item.id][key].advice_name,
                 advice_desc: childMap[item.id][key].advice_desc,
                 single_dose: '' + childMap[item.id][key].single_dose,

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

             align="center"
             label="超滤量(L)"
             width="110"
-            v-if="isShow('超滤量') && (template_id != 6 || template_id != 10)"
+            v-if="isShow('超滤量') && template_id != 6 &&  template_id != 10"
           >
             <template slot-scope="scope">
               {{
             align="center"
             label="置换率(L/h)"
             width="120"
-            v-if="isShow('置换率') && (template_id != 6 || template_id != 10)"
+            v-if="isShow('置换率') && template_id != 6 && template_id != 10"
           >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             align="center"
             label="SpO₂(%)"
             width="100"
-            v-if="isShow('SpO₂') && (template_id != 6 || template_id != 10)"
+            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 || template_id != 10)"
+            v-if="isShow('置换量') && template_id != 6 && template_id != 10"
           >
             <template slot-scope="scope">
               {{
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤量')">
+          <el-col :span="8" v-if="isShow('超滤量') &&(template_id != 6 || template_id != 10)">
+            <el-form-item label="超滤量(ml)：">
+              <el-input v-model="form.ultrafiltration_volume"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="isShow('超滤量') && template_id != 6 && template_id != 10">
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

         <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
         <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmhg)</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('超滤量') && 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 || 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 && template_id != 10" width="92px">置换率(L/h)</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('置换量')&& 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/dialysis/template/DialysisPrintOrderTen.vue

         <div class="inline_block">
           床号：
           <div class="under_line" style="width: 50px;text-align: center;">
-            {{ '/' }}
+            {{
+            dialysisOrder &&
+            dialysisOrder.DeviceNumber &&
+            dialysisOrder.DeviceNumber.number.length > 0
+            ? dialysisOrder.DeviceNumber.number
+            : patientInfo.DialysisSchedule.device_number.number
+            }}
           </div>
         </div>
         <div class="inline_block">
             class="under_line"
             style="width: 640px;text-align: left;word-wrap: break-word;white-space: inherit;"
           >
-            {{ patientInfo.diagnose }}
+             {{ patientInfo.diagnose }}
           </div>
         </div>
       </div>
                   </td>
                   <td>
                     {{
-                    monitor.sodium_concentration
-                    ? monitor.sodium_concentration
+                    monitor.conductivity
+                    ? monitor.conductivity
                     : ''
                     }}
                   </td>

src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue

                   </tr> -->
                   <tr>
                     <td width="70">拔针压迫:</td>
-                    <td width="300">
+                    <td width="350">
                       <div style="display:flex;justify-content:space-between;">
                         <label-box
                           showValue="自己压迫"
                             afterdialysis.hemostasis_opera == 1 ? true : false
                           "
                         ></label-box>
+                        <label-box
+                          showValue="内瘘止血带"
+                          :isChecked="
+                            afterdialysis.hemostasis_opera == 4 ? true : false
+                          "
+                        ></label-box>
                       </div>
                     </td>
                     <td width="50"></td>
                         ></label-box>
                       </div>
                     </td>
-                    <td width="80"></td>
-                    <td width="60">管路:</td>
-                    <td width="220">
-                      <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>
-                    </td>
+                    <!--<td width="80"></td>-->
+                    <!--<td width="60">管路:</td>-->
+                    <!--<td width="220">-->
+                      <!--<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>-->
+                    <!--</td>-->
                     <td></td>
                   </tr>
                 </tbody>