Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -1149,7 +1149,7 @@
                           </td>
                           <td>
                             {{monitor_record.sodium_concentration ? monitor_record.sodium_concentration : '0'}} /
-                            {{ monitor_record.temperature ? monitor_record.temperature : '0' }}
+                            {{ monitor_record.dialysate_temperature ? monitor_record.dialysate_temperature : '0' }}
                           </td>
                           <td>
                             {{ monitor_record.pulse_frequency ? monitor_record.pulse_frequency : "/" }}

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -100,7 +100,7 @@
           <td v-if="isShow('超滤量1')"> 
             {{ monitor.ultrafiltration_volume_one ? monitor.ultrafiltration_volume_one : "/" }}
           </td>
-          <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
+          <td v-if="isShow('超滤率')" >{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:'0'}}</td>
           <td v-if="isShow('超滤率2')" >{{monitor.ultrafiltration_rate_one?monitor.ultrafiltration_rate_one:'/'}}</td>
           <td v-if="isShow('钠浓度')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }} </td>
           <td v-if="isShow('钠浓度1')"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "/" }} </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -1062,7 +1062,7 @@
                         <!-- 钠浓度(mmol/L)/温度°C -->
                         <td>
                           {{ monitor.sodium_concentration ? monitor.sodium_concentration : "0" }} / 
-                          {{ monitor.temperature ? monitor.temperature : '0' }}
+                          {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '0' }}
                         </td>
 
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
@@ -3207,13 +3207,13 @@ export default {
   width: 50%;
 }
 
-.under_line::before {
+/* .under_line::before {
   content: "\00A0";
 }
 
 .under_line::after {
   content: "\00A0";
-}
+} */
 
 .flex {
   display: -webkit-box;

src/xt_pages/user/components/PatientDetail.vue

@@ -1290,7 +1290,7 @@
       <div id="print-info-box" v-else>
         <div class="print_main_content" style="font-family:SimSun;">
           <div style="font-size: 35px;font-weight: 600;text-align: center;margin-top: 30px;">
-            海拉尔普爱{{ orgname }}
+            {{ orgname }}
           </div>
           <div style="font-size: 35px;font-weight: 600;margin-bottom: 10px;text-align: center;">血液净化治疗患者首次门诊病历</div>
           <div >
@@ -1316,7 +1316,7 @@
                     {{ patientPrint.age }}岁
                   </td>
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:12%;">
-                    报销方式
+                    医保类型
                   </td>
                   <td style="padding: 5px 0px;font-size: 22px;width: 15%;">
                     {{patientPrint.reimbursement_way_id }}

src/xt_pages/user/components/PatientForm.vue

@@ -1014,43 +1014,9 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
 
-
-          <!--<el-col :span="24">-->
-          <!--<el-form-item label="传染病 : " prop="checkContagions">-->
-          <!--<el-checkbox-group v-model="form.contagions">-->
-          <!--<el-checkbox v-for="item in contagionList" v-if="item.type==2" :label="item.id" :key="item.id"-->
-          <!--:value="item.id">{{item.name}}-->
-          <!--</el-checkbox>-->
-          <!--</el-checkbox-group>-->
-          <!--</el-form-item>-->
-          <!--</el-col>-->
-          <!-- <el-col :span="24">
-            <el-form-item label="慢性病 : " prop="diseases">
-              <el-checkbox-group v-model="form.diseases">
-                <el-checkbox
-                  v-for="item in checkDisease"
-                  :label="item.id"
-                  :key="item.id"
-                  :value="item.id"
-                  >{{ item.name }}</el-checkbox
-                >
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col> -->
-
-       
-          <!-- <el-col :span="24">
-            <el-form-item>
-              <el-button
-                type="text"
-                @click="treat_info_fold = !treat_info_fold"
-              >
-                {{ treat_info_fold ? "更多治疗信息" : "收起" }}
-                <i class="el-icon--right" :class="treat_fold_icon"></i>
-              </el-button>
-            </el-form-item>
-          </el-col> -->
+          
 
           <el-row>
             <el-col :span="24" style="height:100%;">
@@ -1066,13 +1032,16 @@
               </el-form-item>
          </el-col>
         </el-row>
-
+      
+        <el-row>
           <el-col :span="24">
             <el-form-item label="登记人员 : ">
               <span>{{ adminusername }}</span>
             </el-form-item>
           </el-col>
 
+        </el-row>
+      <el-row>
          <el-col :span="6">
           <el-form-item label="主治医生 : ">
             <el-select v-model="form.doctor">
@@ -1085,7 +1054,9 @@
               </el-select>
           </el-form-item>
        </el-col>
-
+      </el-row>
+      
+       <el-row>
           <el-col :span="24" align="right" class="newCol">
             <el-form-item>
               <el-button
@@ -1122,6 +1093,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        
       </el-form>
     </div>
   </div>