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

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/complete.vue

@@ -227,7 +227,7 @@ import html2canvas from "html2canvas"
         nurseList:[],
         operators:[],
         docList:[],
-        status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'未到达处方时间'},{value:3,label:'超出处方时间'}],
+        status_options:[{value:1,label:'达到透析处方时间'},{value:3,label:'未达到处方时间'},{value:2,label:'超出处方时间'}],
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
@@ -348,7 +348,7 @@ import html2canvas from "html2canvas"
                 }
               }
               console.log('111111',status_id);
-              
+
               this.status_value = status_id
               this.getdetail(status_id)
             })

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -106,7 +106,7 @@
           <td v-if="isShow('钠浓度1')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "/" }} </td>
           <td v-if="isShow('透析液温度')"> {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }} </td>
           <td v-if="isShow('透析液温度1')"> {{ monitor.dialysate_temperature_one ? monitor.dialysate_temperature_one : "/" }} </td>
-          <td v-if="isShow('置换率')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "" }} </td>
+          <td v-if="isShow('置换率')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "0" }} </td>
           <td v-if="isShow('置换率1')"> {{ monitor.replacement_rate ? monitor.replacement_rate : "/" }} </td>
           <td v-if="isShow('置换量')"> {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
           <td v-if="isShow('置换量1')"> {{ monitor.displacement_quantity_one ? monitor.displacement_quantity_one : "/" }} </td>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -155,7 +155,7 @@
                 </el-date-picker>
 
 
-                <el-select v-if="org_id != 10206" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                <el-select v-if="org_id != 10206 && org_id != 10721 && org_id != 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                            @change="changevalue">
                   <el-option
                     v-for="(item,index) in register"
@@ -175,6 +175,17 @@
                   </el-option>
                 </el-select>
 
+
+                <el-select v-if="org_id == 10721 || org_id == 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                           @change="changevalue">
+                  <el-option
+                    v-for="(item,index) in register10721"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+
                 <div style="float: right;margin-bottom:5px;margin-right:1%;">
                   <el-button
                     round
@@ -637,6 +648,15 @@ export default {
 
 
 
+      ],
+      register10721: [
+        { value: 11, label: '普通门诊' },
+        { value: 14, label: '门诊特殊病' },
+        { value: 992102, label: '透析(992102)' },
+        { value: 140104, label: '门诊慢病(140104)' },
+        { value: 140201, label: '门诊特病(140201)' },
+        { value: 1111, label: '精一' },
+        { value: 1112, label: '精二' },
       ],
       medical_care: [
         { value: 11, label: '普通门诊' },