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

                         <div style="flex: 1;">
                           姓 名:{{ record.patient.name }}
                         </div>
+                        <div style="flex: 1;">
+                          年 龄:{{getNewAge(record.patient.id_card_no) }}岁
+                        </div>
                         <div style="flex: 1;">
                           性 别:{{ record.patient.gender == 1 ? "男" : "女" }}
                         </div>
+                        <div style="flex: 1;">
+                          透析号:{{ record.patient.dialysis_no }}
+                        </div>
                         <div style="flex: 1;">
                           透析机号:
                           {{ record.dialysis_order &&
                               : record.device_number.number
                           }}
                         </div>
+                        <div style="flex: 1;">
+                          透析次数:{{ record.patient.total_dialysis +
+                            record.patient.user_sys_before_count
+                              ? record.patient.total_dialysis +
+                                record.patient.user_sys_before_count
+                              : "/" }}
+                        </div>
                       </div>
                     </td>
                   </tr>
                   <tr>
                     <td colspan="2">
                       <div style="line-height:30px;">
-                      <span>计划脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
+                      <span>目标脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
+                      <span>处方脱水量: {{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
                       <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
                       </div>
                     </td>
                   <tr>
                     <td rowspan="2">时间</td>
                     <td colspan="5">透析参数</td>
-                    <td colspan="2">生命体征</td>
+                    <td colspan="3">生命体征</td>
                     <td colspan="2">治疗中病情变化</td>
                   </tr>
                   <tr>
                     <td>HR<br/>bpm</td>
                     <!-- <td>R<br/>bpm</td> -->
                     <td>BP<br/>mmHg</td>
-                    <!-- <td>SpO₂<br/>%</td> -->
+                    <td>护士签名</td>
                     <td>记录</td>
                   </tr>
                   <tr v-for="(monitor, monindex) in record.monitor_records" :key="monindex">
                           : "/"
                       }}
                     </td>
-                    <!-- <td>{{monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "/"}}</td> -->
-                    <!-- <td></td> -->
+                    <td>
+                      <span v-if="setAdminUserES(monitor, 'monitoring_nurse') == ''">{{getAdminUser(monitor, 'monitoring_nurse')}}</span>
+                      <img class="es-img" :src="setAdminUserES(monitor, 'monitoring_nurse')" alt="" srcset=""  v-else >
+                    </td>
                     <td>
                       {{ monitor.end }} {{ monitor.symptom }} &nbsp;
                       {{monitor.dispose}} &nbsp;{{ monitor.result }}
 
                     <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
                       <td style="height:30px;line-height:30px">{{ getTime(advice[0].start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-                      <td style="height:30px;line-height:30px">
+                      <td style="height:30px;line-height:30px;text-align: left;">
                         <span v-if="advice[0].parent_id > 0">---></span>
                         <span>{{ advice[0].advice_name }}</span>
                         <span v-if="advice && advice[0].advice_desc">({{ advice[0].advice_desc }}{{ advice[0].drug_spec_unit }})</span>
                 <div style="display: flex;">
                   <div style="flex: 1;"></div>
                   <div style="flex: 1;margin-top: 20px;">
-                    <div style="display: inline-block;margin-right: 20px;">
+                    <div style="display: inline-block;margin-right: 120px;">
                       <span style="display: inline-block;">医生签名:</span>
                       <span v-if=" setAdminUserES(record.prescription, 'prescription_doctor') == '' ">
                           {{ getAdminUser(record.prescription, 'prescription_doctor')}}
       }
       return displace_liqui_part_name;
       },
+      getNewAge(UUserCard) {
+        if (UUserCard != null && UUserCard != '') {
+          //获取年龄
+          var myDate = new Date();
+          var month = myDate.getMonth() + 1;
+          var day = myDate.getDate();
+          var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1;
+          if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++;
+          }
+          return age;
+        }
+      },
     }
   }
 </script>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

         <table border="1" class="table-box" style="border-collapse: collapse;text-align: center;width: 99%;font-size: 16px;">
           <tbody>
             <tr>
-              <td width="80" style="line-height:30px;">治疗日期: <span>{{ year }}</span>年<span>{{ months }}</span>月<span>{{ day }}</span>日</td>
+              <td width="80" style="line-height:30px;">
+                治疗日期: <span>{{ year }}</span>年<span>{{ months }}</span>月<span>{{ day }}</span>日
+              </td>
             </tr>
           </tbody>
         </table>
                   <div style="flex: 1;">
                     姓 名:{{ patientInfo.name ? patientInfo.name : "/" }}
                   </div>
+                  <div style="flex: 1;">
+                    年 龄:{{ getAge(patientInfo) }}岁
+                  </div>
                   <div style="flex: 1;">
                     性 别:{{ patientInfo.gender ? patientInfo.gender : "/" }}
                   </div>
+                  <div style="flex: 1;">
+                    透析号:{{ patientInfo.dialysis_no ? patientInfo.dialysis_no : "/" }}
+                  </div>
                   <div style="flex: 1;">
                     透析机号:
                     {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                   </div>
+                  <div style="flex: 1;">
+                    透析次数:{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count ? 
+                                patientInfo.total_dialysis + patientInfo.user_sys_before_count : "/" }}
+                  </div>
                 </div>
               </td>
             </tr>
             <tr>
               <td colspan="2">
                 <div style="line-height:30px;">
-                 <span>计划脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
+                 <span>目标脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
+                 <span>处方脱水量: {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
                  <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
                 </div>
               </td>
             <tr>
               <td rowspan="2">时间</td>
               <td colspan="5">透析参数</td>
-              <td colspan="2">生命体征</td>
+              <td colspan="3">生命体征</td>
               <td colspan="2">治疗中病情变化</td>
             </tr>
             <tr>
               <td>HR<br/>bpm</td>
               <!-- <td>R<br/>bpm</td> -->
               <td>BP<br/>mmHg</td>
-              <!-- <td>SpO₂<br/>%</td> -->
+              <td>护士签名</td>
               <!-- <td>时间</td> -->
               <td>记录</td>
             </tr>
                     : "/"
                 }}
               </td>
-              <!-- <td>{{monitor.blood_oxygen_saturation ? monitor.blood_oxygen_saturation : "/"}}</td> -->
-              <!-- <td></td> -->
+              <td>
+                <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
+                  {{
+                  getAdminUser(monitor.monitoring_nurse)
+                  }}
+                </span>
+                <span
+                  v-else
+                  style="display:flex;align-items:center;justify-content:space-around;height:36px;"
+                >
+                  <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
+                </span>
+              </td>
+              
               <td>
                 {{ monitor.end }} {{ monitor.symptom }} &nbsp;
                 {{monitor.dispose}} &nbsp;{{ monitor.result }}
 
               <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
                 <td style="height:30px;line-height:30px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-                <td style="height:30px;line-height:30px">
+                <td style="height:30px;line-height:30px;text-align: left;">
                   <span v-if="advice.parent_id > 0">---></span>
                   <span>{{ advice.advice_name }}</span>
                   <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
           <div style="display: flex;">
             <div style="flex: 1;"></div>
             <div style="flex: 1;margin-top: 20px;">
-              <div style="display: inline-block;margin-right: 20px;">
+              <div style="display: inline-block;margin-right: 120px;">
                 <span style="display: inline-block;">医生签名:</span>
                 <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
                   {{ getAdminUser(prescription.creater)}}

src/xt_pages/user/lapsoSummary.vue

            <template slot-scope="scope">
               {{ scope.row.lapse_reason }}
            </template>
-        </el-table-column>
-       
-       
+        </el-table-column> 
          <el-table-column prop="date" label="备注" align="center">
             <template slot-scope="scope">
               {{ scope.row.remark }}
           style="margin-top:20px;"
           align="right"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="total"></el-pagination>
+          :total="total">
+        </el-pagination>
   
         <el-dialog
             title="新增转归记录"
             width="65%"
             center>
           <el-form label-width="150px" :model="form" ref="form" :rules="rules" >
-            <el-row  :gutter="24">
-              <el-col :span="24">
-                <el-form-item label="透析号:" >
-                    <el-input style="width:200px" v-model="dialysis_no" :disabled="true"></el-input>
-                </el-form-item>
-                
-              </el-col>
-            </el-row>
-            <el-row  :gutter="24" >
-              <el-col :span="24">
+
+            <el-row  :gutter="20">
+              <el-col :span="11">
                  <el-form-item  label="姓名:">
                     <el-input style="width:200px" v-model="name" :disabled="true"></el-input>
                  </el-form-item>
               </el-col>
+              <el-col :span="11">
+                <el-form-item label="透析号:" >
+                    <el-input style="width:200px" v-model="dialysis_no" :disabled="true"></el-input>
+                </el-form-item>
+              </el-col>
             </el-row>
-            <el-row :gutter="24" v-if="lapseto == 1">
-                <el-col :span="24">
+
+            <el-row :gutter="20" >
+                <el-col :span="24" v-if="lapseto == 1">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
                             <el-radio  label="2">转出</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
-            </el-row>
-            <el-row :gutter="24" v-if="lapseto == 2">
-                <el-col :span="24">
+                <el-col :span="24" v-if="lapseto == 2">
                     <el-form-item label="转归类型:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_type">
                             <el-radio  label="1">转入</el-radio>
                 </el-col>
             </el-row>
 
-            <el-row :gutter="24" v-if="lapse_type == 3">
+            <el-row :gutter="20" v-if="lapse_type == 3">
                 <el-col :span="24">
                     <el-form-item label="住院/门诊:"> 
                       <el-radio-group style="padding: 10px;" v-model="his_type">
             </el-row>
 
 
-            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
-                <el-col :span="24">
+            <el-row :gutter="20" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="11">
                     <el-form-item label="病区:"> 
                        <el-input style="width: 200px" v-model="his_zone"></el-input> 
                     </el-form-item>
                 </el-col>
-            </el-row>
-
-            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
-                <el-col :span="24">
+                <el-col :span="11">
                     <el-form-item label="床号:"> 
                         <el-input style="width: 200px" v-model="his_bed"></el-input> 
                     </el-form-item>
             </el-row>
 
           
-            <el-row :gutter="24">
-                <el-col :span="24">
+            <el-row :gutter="20">
+                <el-col :span="23">
                     <el-form-item label="转归分类:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_class">
                             <el-radio  label="1">终止透析</el-radio>
                 </el-col>
             </el-row>
 
-            
-
-            <el-row :gutter="24">
-                <el-col :span="24">
+            <el-row :gutter="20">
+                <el-col :span="23">
                     <el-form-item label="原因:"> 
-                        <el-input style="width: 300px;height: 100px;"  type="textarea" v-model="lapse_reason"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-            <el-row :gutter="24">
-                <el-col :span="24">
-                    <el-form-item label="日期:"> 
-                        <el-date-picker
-                            v-model="record_date"
-                            type="date"
-                             value-format="yyyy-MM-dd"
-                            placeholder="选择日期">
-                         </el-date-picker>
+                        <el-input style="width: 300px;" :rows="2" type="textarea" v-model="lapse_reason"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
 
-            <el-row :gutter="24">
-                <el-col :span="24">
-                    <el-form-item label="操作人:"> 
-                        <el-select v-model="admin_user_id" placeholder="请选择">
-                            <el-option
-                            v-for="item in adminUserList"
-                            :key="item.admin_user_id"
-                            :label="item.user_name"
-                            :value="item.admin_user_id">
-                            </el-option>
-                         </el-select>
-                    </el-form-item>
-                </el-col>
+            <el-row :gutter="20">
+              <el-col :span="11">
+                  <el-form-item label="操作人:"> 
+                      <el-select v-model="admin_user_id" placeholder="请选择">
+                          <el-option
+                          v-for="item in adminUserList"
+                          :key="item.admin_user_id"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                        </el-select>
+                  </el-form-item>
+              </el-col>
+              <el-col :span="11">
+                  <el-form-item label="日期:"> 
+                      <el-date-picker
+                          v-model="record_date"
+                          type="date"
+                            value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                  </el-form-item>
+              </el-col>
             </el-row>
 
             <el-row :gutter="24">
                 <el-col :span="24">
                     <el-form-item label="备注:"> 
-                        <el-input style="width: 300px;height: 50px;" type="textarea" v-model="remark"></el-input>
+                        <el-input style="width: 300px;" :rows="2" type="textarea" v-model="remark"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
             width="65%"
             center>
           <el-form label-width="150px" :model="form" ref="form" :rules="rules" >
-            <el-row  :gutter="24">
-              <el-col :span="24">
+            <el-row  :gutter="20">
+              <el-col :span="11">
+                 <el-form-item  label="姓名:">
+                    <el-input style="width:200px" v-model="name" :disabled="true"></el-input>
+                 </el-form-item>
+              </el-col>
+              <el-col :span="11">
                 <el-form-item label="透析号:" >
                     <el-input style="width:200px" v-model="dialysis_no" :disabled="true"></el-input>
                 </el-form-item>
-                
               </el-col>
             </el-row>
-            <el-row  :gutter="24" >
-              <el-col :span="24">
-                 <el-form-item  label="姓名:">
-                    <el-input style="width:200px" v-model="name" :disabled="true"></el-input>
-                 </el-form-item>
+
+            <el-row :gutter="20">
+              <el-col :span="24" v-if="lapseto == 1">
+                  <el-form-item label="转归类型:"> 
+                      <el-radio-group style="padding: 10px;" v-model="lapse_type">
+                          <el-radio  label="2">转出</el-radio>
+                          <el-radio  label="3">死亡</el-radio>
+                          <el-radio  label="4">院内转诊</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="lapseto == 2">
+                  <el-form-item label="转归类型:"> 
+                      <el-radio-group style="padding: 10px;" v-model="lapse_type">
+                          <el-radio  label="1">转入</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
               </el-col>
-            </el-row>
-            <el-row :gutter="24">
-                <el-col :span="24">
-                    <el-form-item label="转归类型:"> 
-                        <el-radio-group style="padding: 10px;" v-model="lapse_type">
-                            <el-radio  label="2">转出</el-radio>
-                            <el-radio  label="3">死亡</el-radio>
-                            <el-radio  label="4">院内转诊</el-radio>
-                           
-                      </el-radio-group>
-                    </el-form-item>
-                </el-col>
             </el-row>
 
-            <el-row :gutter="24" v-if="lapse_type == 3">
+            <el-row :gutter="20" v-if="lapse_type == 3">
                 <el-col :span="24">
                     <el-form-item label="住院/门诊:"> 
                       <el-radio-group style="padding: 10px;" v-model="his_type">
                 </el-col>
             </el-row>
 
-            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
-                <el-col :span="24">
+            <el-row :gutter="20" v-if="lapse_type == 3 && his_type==2">
+                <el-col :span="11">
                     <el-form-item label="病区:"> 
                        <el-input style="width: 200px" v-model="his_zone"></el-input> 
                     </el-form-item>
                 </el-col>
-            </el-row>
-
-            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
-                <el-col :span="24">
+                <el-col :span="11">
                     <el-form-item label="床号:"> 
                         <el-input style="width: 200px" v-model="his_bed"></el-input> 
                     </el-form-item>
                 </el-col>
             </el-row>
 
-            <el-row :gutter="24">
+            <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="转归分类:"> 
                         <el-radio-group style="padding: 10px;" v-model="lapse_class">
                 </el-col>
             </el-row>
 
-         
-
-            <el-row :gutter="24">
+            <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="原因:"> 
-                        <el-input style="width: 300px;height: 100px;"  type="textarea" v-model="lapse_reason"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-            <el-row :gutter="24">
-                <el-col :span="24">
-                    <el-form-item label="日期:"> 
-                        <el-date-picker
-                            v-model="record_date"
-                            type="date"
-                             value-format="yyyy-MM-dd"
-                            placeholder="选择日期">
-                         </el-date-picker>
+                        <el-input style="width: 300px;" :rows="2" type="textarea" v-model="lapse_reason"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
 
-            <el-row :gutter="24">
-                <el-col :span="24">
+            <el-row :gutter="20">
+                <el-col :span="12">
                     <el-form-item label="操作人:"> 
                         <el-select v-model="admin_user_id" placeholder="请选择">
                             <el-option
                          </el-select>
                     </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                    <el-form-item label="日期:"> 
+                        <el-date-picker
+                            v-model="record_date"
+                            type="date"
+                             value-format="yyyy-MM-dd"
+                            placeholder="选择日期">
+                         </el-date-picker>
+                    </el-form-item>
+                </el-col>
             </el-row>
 
-            <el-row :gutter="24">
+            <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="备注:"> 
-                        <el-input style="width: 300px;height: 50px;" type="textarea" v-model="remark"></el-input>
+                        <el-input style="width: 300px;" :rows="2" type="textarea" v-model="remark"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>