Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

src/pages/main/dialog/ComputerDialog.vue

@@ -71,7 +71,7 @@
             </van-radio-group>
           </van-collapse-item>
           <van-collapse-item
-            v-if="isShowFiled('上机护士')"
+            v-if="isShowFiled('上机护士') && org_id!=10721"
             title="上机护士"
             name="3"
           >
@@ -90,6 +90,27 @@
               >
             </van-radio-group>
           </van-collapse-item>
+
+          <van-collapse-item
+            v-if="isShowFiled('上机护士') && org_id == 10721"
+            title="治疗护士"
+            name="3"
+          >
+            <template #value>
+              <div v-if="admin_map[nurse_id]">
+                {{ admin_map[nurse_id].name }}
+              </div>
+            </template>
+            <van-radio-group v-model="nurse_id">
+              <van-radio
+                :name="item.id"
+                v-for="(item, index) in admins"
+                :key="index"
+                v-if="item.status == 1"
+                >{{ item.name }}</van-radio
+              >
+            </van-radio-group>
+          </van-collapse-item>
           <van-collapse-item
             v-if="isShowFiled('穿刺者')"
             title="穿刺者"

src/pages/main/newActionBar/computer.vue

@@ -74,7 +74,7 @@
         </van-collapse-item>
 
         <van-collapse-item
-          v-if="isShowFiled('上机护士')"
+          v-if="isShowFiled('上机护士') && org_id!=10721"
           title="上机护士"
           name="3"
         >
@@ -95,6 +95,28 @@
           </van-radio-group>
         </van-collapse-item>
 
+        <van-collapse-item
+          v-if="isShowFiled('上机护士')  && org_id==10721"
+          title="治疗护士"
+          name="3"
+        >
+        <template slot="title">
+              <div><span v-if="isShow_title('上机护士')" class="warn_tip">*</span>治疗护士</div>
+          </template>
+          <template #value>
+            <div v-if="admin_map[start_nurse]">{{ admin_map[start_nurse].name }}</div>
+          </template>
+          <van-radio-group v-model="start_nurse">
+            <van-radio
+              :name="item.id"
+              v-for="(item, index) in admins"
+              :key="index"
+              v-if="item.status == 1"
+              >{{ item.name }}</van-radio
+            >
+          </van-radio-group>
+        </van-collapse-item>
+
         <van-collapse-item v-if="isShowFiled('穿刺者')" title="穿刺者" name="4">
           <template slot="title">
               <div><span v-if="isShow_title('穿刺者')" class="warn_tip">*</span>穿刺者</div>

src/pages/main/template/DialysisPrintOrdereightyone.vue

@@ -258,8 +258,8 @@
                       style="width: 70px; text-align: center"
                     >
                       <span> {{
-                        prescription.displace_liqui_value
-                          ? prescription.displace_liqui_value
+                        prescription.replacement_total
+                          ? prescription.replacement_total
                           : "/"
                       }}
                       </span>
@@ -358,7 +358,8 @@
                   <div class="inline_block" style="flex: 1">
                     上次透后体重：
                     <div class="under_line" style="width: 50px; text-align: center">
-                      {{lastWeight.weight_after?lastWeight.weight_after:"未称重"}}
+                      <span v-if="lastWeight!=null && lastWeight.weight_after>0">{{lastWeight.weight_after?lastWeight.weight_after:"未称重"}}</span> 
+                      <span v-if=" lastWeight!=null &&lastWeight.weight_after<=0">{{afterdialysis.last_after_weight?afterdialysis.last_after_weight:"未称重"}}</span> 
                     </div>
                     kg
                   </div>
@@ -381,7 +382,8 @@
                     体重增加：
                     <div class="under_line" style="width: 70px; text-align: center">
                       <span>
-                        {{ (predialysis.weight_before - lastWeight.weight_after).toFixed(2)}}
+                        <span v-if="lastWeight.weight_after>0">{{ (predialysis.weight_before - predialysis.additional_weight - lastWeight.weight_after).toFixed(2)}}</span> 
+                        <span v-if="lastWeight.weight_after<=0">{{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}</span> 
                       </span>
                     </div>
                     kg
@@ -985,9 +987,12 @@
             <td>
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                 <div class="inline_block" style="flex: 1">
-                  穿刺护士：
+                  上机护士：
+                  <!-- <span v-if="predialysis.internal_fistula!=''">111</span>
+                  <span v-if="predialysis.catheter!=''">222</span> -->
                   <div  class="under_line"
                     style="width: 90px; text-align: center"
+                    v-if="predialysis.internal_fistula!=''"
                   >
                     <span
                       style="height: 30px; display: inline-block"
@@ -1021,6 +1026,43 @@
                       v-else
                     />
                   </div>
+
+                  <div  class="under_line"
+                    style="width: 90px; text-align: center"
+                    v-if="predialysis.catheter!=''"
+                    >
+                    <span
+                      style="height: 30px; display: inline-block"
+                      v-if="
+                        setAdminUserES(
+                          dialysisOrder == null
+                            ? 0
+                            : dialysisOrder.change_nurse
+                        ) == ''
+                      "
+                    >
+                      {{
+                        getAdminUser(
+                          dialysisOrder == null
+                            ? 0
+                            : dialysisOrder.change_nurse
+                        )
+                      }}</span
+                    >
+                    <img
+                      style="height: 30px"
+                      :src="
+                        setAdminUserES(
+                          dialysisOrder == null
+                            ? 0
+                            : dialysisOrder.change_nurse
+                        )
+                      "
+                      alt=""
+                      srcset=""
+                      v-else
+                    />
+                  </div>
                 </div>
                 <div class="inline_block" style="flex: 1">
                   治疗护士：

src/pages/main/today/dialysisComputer.vue

@@ -11,11 +11,16 @@
           <label>上机床位 :</label>
           <span class="content">{{ device_number }}</span>
         </li>
-        <li v-if="isShow('上机护士')">
+        <li v-if="isShow('上机护士') && org_id!=10721">
           <label>上机护士 :</label>
           <span class="content">{{ nurse }}</span>
         </li>
 
+        <li v-if="isShow('上机护士') && org_id==10721">
+          <label>治疗护士 :</label>
+          <span class="content">{{ nurse }}</span>
+        </li>
+
         <li v-if="isShow('穿刺者')">
           <label>穿刺者 :</label>
           <span class="content">{{ puncture_nurse }}</span>
@@ -125,7 +130,8 @@ export default {
   name: 'DialysisComputer',
   data () {
     return {
-      title: '透析上机 '
+      title: '透析上机 ',
+      org_id:0,
     }
   },
   props: {
@@ -256,6 +262,9 @@ export default {
       }
       return false
     }
+  },
+  created(){
+    this.org_id = this.$store.getters.user.template_info.org_id;
   }
 }
 </script>