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

src/api/patient.js

@@ -1174,4 +1174,14 @@ export function deletePatientLapsoRrecord(id,params){
     method:"get",
     params:params,
   })
+}
+
+
+export function getPatientLapsoList(params){
+
+  return request({
+    url:"/api/patient/getpatientlapselist",
+    method:"Get",
+    params:params,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -40,9 +40,15 @@
                         <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 &&
@@ -53,6 +59,13 @@
                               : 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>
@@ -133,7 +146,8 @@
                   <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.target_ultrafiltration ? record.prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
+                      <span>处方脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
                       <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
                       </div>
                     </td>
@@ -209,7 +223,7 @@
                   <tr>
                     <td rowspan="2">时间</td>
                     <td colspan="5">透析参数</td>
-                    <td colspan="2">生命体征</td>
+                    <td colspan="3">生命体征</td>
                     <td colspan="2">治疗中病情变化</td>
                   </tr>
                   <tr>
@@ -222,7 +236,7 @@
                     <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">
@@ -248,8 +262,10 @@
                           : "/"
                       }}
                     </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 }}
@@ -288,7 +304,7 @@
 
                     <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>
@@ -354,7 +370,7 @@
                 <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')}}
@@ -949,6 +965,19 @@
       }
       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/batch_print/batch_print_order_six.vue

@@ -1660,6 +1660,7 @@
                           置换液的速度<br />(ml/h)
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
+                          <td width="50" v-if=" org_id ==0 || org_id ==10164">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683  && org_id!=0">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
@@ -1877,6 +1878,14 @@
                           <td width="50" v-if="org_id == 10375"><br />
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                           </td>
+                          <td width="50" v-if="org_id == 10489 || org_id ==0"><br />
+                                   
+                                   {{
+                                     monitor_record.ultrafiltration_rate
+                                       ? monitor_record.ultrafiltration_rate
+                                       : ""
+                                   }}
+                         </td>
                           <td v-if="org_id!=10683&& org_id!=0">
                             <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
                                 {{
@@ -1902,7 +1911,7 @@
                                         ? monitor_record.ultrafiltration_rate
                                         : ""
                                     }}
-                              </td>
+                          </td>
 
                           <td
                             v-if="
@@ -2102,7 +2111,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
-                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206 || org_id == 10571 || org_id ==10600">核对护士</td>
+                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206 || org_id == 10571 || org_id ==10600 || org_id == 10489">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
 
@@ -2210,7 +2219,7 @@
                                 getTime(advice[0].execution_time, " {h}:{i}")
                               }}</span>
                             </td>
-                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206|| org_id == 10571 || org_id ==10600">
+                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206|| org_id == 10571 || org_id ==10600 || org_id ==10489">
                               <span
                                 v-if="
                                   setAdminUserES(

src/xt_pages/dialysis/doctorAdviceStaticPrint.vue

@@ -29,7 +29,7 @@
                 <td width="100">药品名称</td>
                 <td width="100">规格</td>
                 <td width="100">数量</td>
-                
+                <td width="100" v-if="org_id == 0 || org_id==10644">数量</td>
               </tr>
               </thead>
               <tbody>
@@ -41,6 +41,7 @@
                   <span v-if="config.is_open == 1">{{getHisCount(item.child,item.max_unit,item.min_unit,item.min_number)}}</span>
                   <span v-if="config.is_open != 1">{{getCount(item.child)}}</span>
                 </td>
+                <td width="100">{{item.manufacturer_name}}</td>
                </tr>
               </tbody>
             </table>
@@ -92,13 +93,16 @@
         hemodialysisPipelinesOptions:[],
         tableList:[],
         druglist:[],
-        config:{}
+        config:{},
+        org_id:0,
+        manufacturerList:[],
       }
     },
     components: {
       BreadCrumb
     },
     created() {
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
       this.getDialysisAdviceSchedudeList()
     },
     methods: {
@@ -113,7 +117,9 @@
           if(response.data.state == 1){
              var doctorList = []
              var druglist = response.data.data.drug
+
              this.druglist = druglist
+             this.manufacturerList = response.data.data.manufacturerList
              this.startdialogVisible = true
              var list = response.data.data.list
           
@@ -212,7 +218,9 @@
                       patient_id:item.patient_id,
                       min_number:item.drug.min_number,
                       max_unit:item.drug.max_unit,
-                      min_unit:item.drug.min_unit
+                      min_unit:item.drug.min_unit,
+                      manufacturer_name:this.getManufacturer(item.drug.manufacturer) ,
+                      delivery_way:item.delivery_way,
                     }
                   }
                 })
@@ -227,10 +235,27 @@
                     }
                   }
                 }
-                console.log("hisarr",hisarr)
+               
+                if(this.org_id == 0 || this.org_id ==10644){
+                  var newArr = []
+                  var arr_one = []
+                  for(let i=0;i<hisarr.length;i++){
+                    if(hisarr[i].delivery_way.indexOf('口服')!=-1){
+                      newArr.push(hisarr[i])
+                    }
+                  }
+                  for(let i=0;i<hisarr.length;i++){
+                    if(hisarr[i].delivery_way.indexOf('口服')==-1){
+                      newArr.push(hisarr[i])
+                    }
+                  }
+                  this.tableList = []
+                  this.tableList = newArr
+              }else{
                 this.tableList = []
                 this.tableList = hisarr
               }
+              }
 
               console.log("中国人民解放军",this.tableList)
              }
@@ -302,6 +327,15 @@
       return max_str + min_str;
         
       },
+      getManufacturer(id){
+        var  manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+            if(id== this.manufacturerList[i].id){
+              manufacturer_name = this.manufacturerList[i].manufacturer_name
+            }
+        }
+        return manufacturer_name
+    }
    }
   }
 </script>

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -597,7 +597,12 @@
              <span v-if="config.is_open ==1">{{getHisCount(scope.row.child,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
            </template>
         </el-table-column>
-
+      
+        <el-table-column align="center" label="厂家">
+           <template slot-scope="scope">
+             {{scope.row.manufacturer_name}}
+           </template>
+        </el-table-column>
 
 
       </el-table>
@@ -915,6 +920,7 @@ export default {
       partion_str:"",
       keyword:"",
       tableProjectList:[],
+      manufacturerList:[]
     };
   },
   created() {
@@ -1845,8 +1851,8 @@ export default {
              var list = response.data.data.list
 
              var config = response.data.data.config
-
-             console.log("dcotor---------------",this.doctorList)
+             this.manufacturerList = response.data.data.manufacturerList
+             console.log("dcotor---------------",this.manufacturerList)
              if(list!=null && list.length > 0){
                for(let i=0;i<list.length;i++){
                 for(let j=0;j<list[i].xt_doctor_advice.length;j++){
@@ -1868,6 +1874,7 @@ export default {
                       drug_id:item.drug_id,
                       specification_name:item.advice_desc +item.drug_spec_unit,
                       patient_id:item.patient_id,
+                      delivery_way:"",
                     }
                   }
                 })
@@ -1939,7 +1946,9 @@ export default {
                       patient_id:item.patient_id,
                       min_number:item.drug.min_number,
                       max_unit:item.drug.max_unit,
-                      min_unit:item.drug.min_unit
+                      min_unit:item.drug.min_unit,
+                      delivery_way:item.delivery_way,
+                      manufacturer_name:this.getManufacturer(item.drug.manufacturer) ,
                     }
                   }
                 })
@@ -1954,10 +1963,29 @@ export default {
                     }
                   }
                 }
-                console.log("hisarr",hisarr)
+
+              if(this.org_id == 0 || this.org_id ==10644){
+                  var newArr = []
+                  var arr_one = []
+                  for(let i=0;i<hisarr.length;i++){
+                    if(hisarr[i].delivery_way.indexOf('口服')!=-1){
+                      newArr.push(hisarr[i])
+                    }
+                  }
+                  for(let i=0;i<hisarr.length;i++){
+                    if(hisarr[i].delivery_way.indexOf('口服')==-1){
+                      newArr.push(hisarr[i])
+                    }
+                  }
+                  this.tableList = []
+                  this.tableList = newArr
+              }else{
                 this.tableList = []
                 this.tableList = hisarr
               }
+                
+               
+              }
 
 
              }
@@ -1965,6 +1993,13 @@ export default {
         })
 
       },
+      arraySort(property) {
+      return function (a, b) {
+        var value1 = a[property];
+        var value2 = b[property];
+        return value1 - value2;
+      };
+     },
       toStaticOne() {
          var str = ""
          if(this.partion_type==0){
@@ -2646,7 +2681,15 @@ export default {
         }
       })
     },
-
+    getManufacturer(id){
+        var  manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+            if(id== this.manufacturerList[i].id){
+              manufacturer_name = this.manufacturerList[i].manufacturer_name
+            }
+        }
+        return manufacturer_name
+    }
 
   },
   components: {

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -8,7 +8,9 @@
         <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>
@@ -20,13 +22,23 @@
                   <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>
@@ -113,7 +125,8 @@
             <tr>
               <td colspan="2">
                 <div style="line-height:30px;">
-                 <span>计划脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
+                 <span>目标脱水量: {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} </span>L &nbsp;&nbsp;
+                 <span>处方脱水量: {{ prescription.prescription_water  ? prescription.prescription_water : "" }} </span>L &nbsp;&nbsp;
                  <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
                 </div>
               </td>
@@ -184,7 +197,7 @@
             <tr>
               <td rowspan="2">时间</td>
               <td colspan="5">透析参数</td>
-              <td colspan="2">生命体征</td>
+              <td colspan="3">生命体征</td>
               <td colspan="2">治疗中病情变化</td>
             </tr>
             <tr>
@@ -197,7 +210,7 @@
               <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>
@@ -224,8 +237,20 @@
                     : "/"
                 }}
               </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 }}
@@ -259,7 +284,7 @@
 
               <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>
@@ -307,7 +332,7 @@
           <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/dialysis/template/DialysisPrintOrderSix.vue

@@ -1260,7 +1260,8 @@
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{ prescription.kalium ? prescription.kalium : "/" }}
+                       <span v-if="org_id!=0&&org_id!=10489">{{ prescription.kalium ? prescription.kalium : "/" }}</span>  
+                       <span v-if="org_id==0||org_id==10489">{{ prescription.kalium ? prescription.kalium : "" }}</span>  
                       </div>
                       mmol/L
                     </div>
@@ -1270,7 +1271,8 @@
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{ prescription.sodium ? prescription.sodium : "/" }}
+                       <span v-if="org_id!=0&&org_id!=10489">{{ prescription.sodium ? prescription.sodium : "/" }}</span> 
+                       <span v-if="org_id==0||org_id==10489">{{ prescription.sodium ? prescription.sodium : "" }}</span>  
                       </div>
                       mmol/L
                     </div>
@@ -1280,7 +1282,8 @@
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{ prescription.calcium ? prescription.calcium : "/" }}
+                       <span v-if="org_id!=0 && org_id!=10489"> {{ prescription.calcium ? prescription.calcium : "/" }}</span>
+                       <span v-if="org_id ==0 || org_id==10489"> {{ prescription.calcium ? prescription.calcium : "" }}</span>
                       </div>
                       mmol/L
                     </div>
@@ -1290,9 +1293,15 @@
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                        {{
+                       <span v-if="org_id!=0&&org_id!=10489">{{
                           prescription.bicarbonate ? prescription.bicarbonate : "/"
                         }}
+                        </span>  
+                        <span v-if="org_id == 0 || org_id == 10489">
+                          {{
+                          prescription.bicarbonate ? prescription.bicarbonate : ""
+                         }}
+                        </span>
                       </div>
                       mmol/L
                     </div>
@@ -1732,6 +1741,7 @@
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
+                        <td width="50" v-if="org_id == 0 || org_id ==10489">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">超滤量<br />(ml)</td>
                         <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
@@ -1849,11 +1859,14 @@
                         </td>
 
 
-                        <td v-if="org_id == 10375 || org_id == 0"><br />
+                        <td v-if="org_id == 10375"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
+                        <td v-if="org_id == 10489 || org_id == 0"><br />
+                          {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}
+                        </td>
                         <td v-if="org_id!=10600 && org_id!=10644  && org_id!=10683">
-                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10617"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                           <span v-if="org_id==9671 || org_id==10440 || org_id ==10617">
                               <span v-if="org_id ==10617 && monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
                               <span v-if="org_id ==10617 && monindex == monitors.length-1">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
@@ -2056,7 +2069,7 @@
                         <td style="font-size: 16px" width="10%">医生签名</td>
                         <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
                         <td style="font-size: 16px" width="10%">执行人签名</td>
-                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598">核对护士</td>
+                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598 || org_id == 10489 || org_id == 0">核对护士</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td
                           style="font-size: 16px"
@@ -2148,7 +2161,7 @@
                             />
                         </span>
                         </td>
-                        <td v-if="org_id == 10598">
+                        <td v-if="org_id == 10598 || org_id==10489 || org_id == 0">
                           <span v-if="advice!=null && advice.checker>0">
                               <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
                               <img
@@ -2165,8 +2178,8 @@
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 ||
-                            org_id ==10375 || org_id ==10571 || org_id ==10600 ">
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538  ||
+                            org_id ==10375 || org_id ==10571 || org_id ==10600">
                           <span v-if="advice!=null && advice.checker>0">
                             <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
                             <img
@@ -2292,7 +2305,7 @@
                         <td style="font-size: 16px" width="10%">医生签名</td>
 
                         <td style="font-size: 16px" width="10%">执行人签名</td>
-                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598">核对护士</td>
+                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598 || org_id == 0 || org_id == 10489">核对护士</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td
                           style="font-size: 16px"
@@ -2367,7 +2380,7 @@
                             />
                         </span>
                         </td>
-                        <td v-if="org_id == 10598">
+                        <td v-if="org_id == 10598 || org_id == 10489 || org_id == 0">
                           <span v-if="advice!=null && advice.checker>0">
                               <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
                               <img

src/xt_pages/management/components/UserForm.vue

@@ -854,7 +854,7 @@
                 <td
                   :rowspan="2"
                   style="text-align:center;min-width:40px;font-size:15px"
-                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340"
+                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340 && org_id!=0 && org_id!=10495"
                 >
                  透析机消毒液(更换)
                  
@@ -862,7 +862,7 @@
                 <td
                   :rowspan="2"
                   style="text-align:center;width:80px;font-size:15px"
-                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340"
+                  v-if="org_id!=0&&org_id!=10060&& org_id!=10340 && org_id!=10495 && org_id!=0"
                 >
                  细菌过滤器(更换)
                 </td>

src/xt_pages/user/dialysisRecord.vue

@@ -169,6 +169,7 @@
                  {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
                  {{ scope.row.prescription.dialysis_dialyszers }}
               <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{ scope.row.prescription.dialysis_irrigation }}</span>
+              <span v-if="scope.row.prescription.dialysis_strainer!=''">/{{ scope.row.prescription.dialysis_strainer }}</span>
              </template>
           </el-table-column>
 
@@ -180,19 +181,40 @@
           >
           </el-table-column>
           <el-table-column
+            v-if="org_id!=0&&org_id!=10702"
             prop="predialysis_evaluation.weight_before"
             width="110"
             align="center"
             label="透前称重(kg)"
           >
           </el-table-column>
+
+          <el-table-column
+            v-if="org_id==0 || org_id==10702"
+            prop="weight_before"
+            width="110"
+            align="center"
+            label="透前体重(kg)"
+          >
+          </el-table-column>
+          
           <el-table-column
+            v-if="org_id!=0&&org_id!=10702"
             prop="assessment_after_dislysis.weight_after"
             width="110"
             align="center"
             label="透后称重(kg)"
           >
           </el-table-column>
+
+          <el-table-column
+            v-if="org_id==0 || org_id==10702"
+            prop="weight_after"
+            width="110"
+            align="center"
+            label="透后体重(kg)"
+          >
+          </el-table-column>
           <el-table-column
             prop="predialysis_evaluation"
             width="140"
@@ -370,8 +392,11 @@
               <th>透析时长（h）</th>
               <th>透析器/灌流器</th>
               <th>干体重（kg）</th>
-              <th>透前称重（kg）</th>
-              <th>透后称重（kg）</th>
+              <th v-if="org_id!=0&&org_id!=10702">透前称重（kg）</th>
+              <th v-if="org_id!=0&&org_id!=10702">透后称重（kg）</th>
+
+              <th v-if="org_id ==0 || org_id!=10702">透前体重（kg）</th>
+              <th v-if="org_id==0 || org_id==10702">透后体重（kg）</th>
               <th>透前血压（mmhg）</th>
               <th>透后血压（mmhg）</th>
               <th>目标超滤量（L）</th>
@@ -395,8 +420,11 @@
                    <span v-if="item.prescription.dialysis_irrigation!=''">/{{ item.prescription.dialysis_irrigation }} </span>
                 </td>
                 <td>{{ item.predialysis_evaluation.dry_weight }}</td>
-                <td>{{ item.predialysis_evaluation.weight_before }}</td>
-                <td>{{ item.assessment_after_dislysis.weight_after }}</td>
+                <td v-if="org_id!=0&&org_id!=10702">{{ item.predialysis_evaluation.weight_before }}</td>
+                <td v-if="org_id!=0&&org_id!=10702">{{ item.assessment_after_dislysis.weight_after }}</td>
+
+                <td  v-if="org_id==0 || org_id==10702">{{ item.weight_before }}</td>
+                <td  v-if="org_id==0 || org_id==10702">{{ item.weight_after }}</td>
                 <td>
                   {{ item.predialysis_evaluation.systolic_blood_pressure }}/{{
                     item.predialysis_evaluation.diastolic_blood_pressure
@@ -622,6 +650,13 @@ export default {
         if (response.data.state == 1) {
           this.total = response.data.data.total;
           this.recordData = response.data.data.records;
+
+          for(let i=0;i<this.recordData.length;i++){
+               
+            this.recordData[i].weight_before = (this.recordData[i].predialysis_evaluation.weight_before - this.recordData[i].predialysis_evaluation.additional_weight).toFixed(2)
+
+            this.recordData[i].weight_after = (this.recordData[i].assessment_after_dislysis.weight_after - this.recordData[i].assessment_after_dislysis.additional_weight).toFixed(2)
+          }
           console.log("郭23232323232232323",this.recordData)
         
         }

src/xt_pages/user/lapsoSummary.vue

@@ -5,6 +5,8 @@
         <div style="display:flex;justify-content: space-between;align-items: center;margin-bottom: 12px;">
            <span style="font-weight:bold;">转归记录列表</span>
            <el-button size="medium" type="primary" @click="dialogVisible =true">新增</el-button>
+
+           <!-- <el-button size="medium" type="primary" @click="toJiaoBen">脚本</el-button> -->
         </div>
         <el-table class="oictable" :data="tableData" border style="width:100%">
         <el-table-column prop="start_time" label="日期" align="center">
@@ -22,22 +24,34 @@
         </el-table-column>
        <el-table-column prop="blood_access_part_id" label="转归分类" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.lapse_class == 1">终止透析</span>
+            <!-- <span v-if="scope.row.lapse_class == 1">终止透析</span>
             <span v-if="scope.row.lapse_class == 2">转出院外</span>
             <span v-if="scope.row.lapse_class == 3">回居住地透析</span>
             <span v-if="scope.row.lapse_class == 4">临时透析</span>
             <span v-if="scope.row.lapse_class == 5">转腹膜透析</span>
             <span v-if="scope.row.lapse_class == 6">其他</span>
-            <span v-if="scope.row.lapse_class == 7">变更透析医院</span>
+            <span v-if="scope.row.lapse_class == 7">变更透析医院</span> -->
+            <!-- <span v-if="scope.row.lapse_class == 1">留治</span>
+            <span v-if="scope.row.lapse_class == 2">转出</span>
+            <span v-if="scope.row.lapse_class == 3">死亡</span> -->
+            <span v-if="scope.row.lapse_class == 4">转出院外</span>
+            <span v-if="scope.row.lapse_class == 5">肾移植</span>
+            <span v-if="scope.row.lapse_class == 6">转腹膜透析</span>
+            <span v-if="scope.row.lapse_class == 7">出院</span>
+            <span v-if="scope.row.lapse_class == 8">好转</span>
+            <span v-if="scope.row.lapse_class == 9">放弃治疗</span>
+            <span v-if="scope.row.lapse_class == 10">其他状态</span>
+            <span v-if="scope.row.lapse_class ==11">请假</span>
+            <span v-if="scope.row.lapse_class ==12">临时透析</span>
+            <span v-if="scope.row.lapse_class ==13">回居住地透析</span>
+            <span v-if="scope.row.lapse_class ==14">变更透析医院</span>
           </template>
        </el-table-column>
         <el-table-column prop="inflow_pass" label="原因"  align="center">
            <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 }}
@@ -77,7 +91,8 @@
           style="margin-top:20px;"
           align="right"
           layout="total, sizes, prev, pager, next, jumper"
-          :total="total"></el-pagination>
+          :total="total">
+        </el-pagination>
   
         <el-dialog
             title="新增转归记录"
@@ -85,23 +100,22 @@
             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>
@@ -110,9 +124,7 @@
                       </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>
@@ -121,7 +133,7 @@
                 </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">
@@ -133,16 +145,46 @@
             </el-row>
 
 
-            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
-                <el-col :span="24">
-                    <el-form-item label="病区:"> 
-                       <el-input style="width: 200px" v-model="his_zone"></el-input> 
+            <el-row :gutter="20" v-if="lapse_type == 4">
+                <el-col :span="8">
+                    <el-form-item label="开始时间:"> 
+                      <el-date-picker
+                          v-model="start_time"
+                          type="date"
+                            value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item label="结束时间:"> 
+                      <el-date-picker
+                          v-model="end_time"
+                          type="date"
+                            value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item label="转院地区:"> 
+                      <el-input style="width: 200px" v-model="patient_address"></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-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-col :span="11">
                     <el-form-item label="床号:"> 
                         <el-input style="width: 200px" v-model="his_bed"></el-input> 
                     </el-form-item>
@@ -150,66 +192,87 @@
             </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-radio  label="2">转出院外</el-radio>
-                            <el-radio  label="3">回居住地透析</el-radio>
-                            <el-radio  label="4">临时透析</el-radio>
-                            <el-radio  label="5">转腹膜透析</el-radio>
-                            <el-radio  label="6">其他</el-radio>
-                            <el-radio  label="7">变更透析医院</el-radio>
-                            <el-radio  label="8">住院</el-radio>
-                            <el-radio  label="9">转血透科</el-radio>
+                            <el-radio  label="4">转出院外</el-radio>
+                            <el-radio  label="5">肾移植</el-radio>
+                            <el-radio  label="6">转腹膜透析</el-radio>
+                            <el-radio  label="7">出院</el-radio>
+                            <el-radio  label="8">好转</el-radio>
+                            <el-radio  label="9">放弃治疗</el-radio>
+                            <el-radio  label="10">其他状态</el-radio>
+                            <el-radio  label="11">请假</el-radio>
+                            <el-radio  label="12">临时透析</el-radio>
+                            <el-radio  label="13">回居住地透析</el-radio>
+                            <el-radio  label="14">变更透析医院</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-input style="width: 300px;height: 100px;"  type="textarea" v-model="lapse_reason"></el-input>
+            <el-row :gutter="20" v-if="lapse_class == 11">
+                <el-col :span="8">
+                    <el-form-item label="开始时间:"> 
+                      <el-date-picker
+                          v-model="start_time_one"
+                          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-date-picker
-                            v-model="record_date"
-                            type="date"
-                             value-format="yyyy-MM-dd"
-                            placeholder="选择日期">
-                         </el-date-picker>
+                <el-col :span="8">
+                    <el-form-item label="结束时间:"> 
+                      <el-date-picker
+                          v-model="end_time_one"
+                          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-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-row :gutter="20">
+                <el-col :span="23">
+                    <el-form-item label="原因:"> 
+                        <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="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>
@@ -230,35 +293,39 @@
             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">
@@ -269,65 +336,105 @@
                 </el-col>
             </el-row>
 
-            <el-row :gutter="24" v-if="lapse_type == 3 && his_type==2">
-                <el-col :span="24">
-                    <el-form-item label="病区:"> 
-                       <el-input style="width: 200px" v-model="his_zone"></el-input> 
+            <el-row :gutter="20" v-if="lapse_type == 4">
+                <el-col :span="8">
+                    <el-form-item label="开始时间:"> 
+                      <el-date-picker
+                          v-model="start_time"
+                          type="date"
+                            value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item label="结束时间:"> 
+                      <el-date-picker
+                          v-model="end_time"
+                          type="date"
+                            value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                    <el-form-item label="转院地区:"> 
+                      <el-input style="width: 200px" v-model="patient_address"></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-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-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-radio  label="1">终止透析</el-radio>
-                            <el-radio  label="2">转出院外</el-radio>
-                            <el-radio  label="3">回居住地透析</el-radio>
-                            <el-radio  label="4">临时透析</el-radio>
-                            <el-radio  label="5">转腹膜透析</el-radio>
-                            <el-radio  label="6">其他</el-radio>
-                            <el-radio  label="7">变更透析医院</el-radio>
-                            <el-radio  label="8">住院</el-radio>
-                            <el-radio  label="9">转血透科</el-radio>
+                            <el-radio  label="4">转出院外</el-radio>
+                            <el-radio  label="5">肾移植</el-radio>
+                            <el-radio  label="6">转腹膜透析</el-radio>
+                            <el-radio  label="7">出院</el-radio>
+                            <el-radio  label="8">好转</el-radio>
+                            <el-radio  label="9">放弃治疗</el-radio>
+                            <el-radio  label="10">其他状态</el-radio>
+                            <el-radio  label="11">请假</el-radio>
+                            <el-radio  label="12">临时透析</el-radio>
+                            <el-radio  label="13">回居住地透析</el-radio>
+                            <el-radio  label="14">变更透析医院</el-radio>
                       </el-radio-group>
                     </el-form-item>
                 </el-col>
             </el-row>
 
-         
+            
+            <el-row :gutter="20" v-if="lapse_class == 11">
+                <el-col :span="8">
+                    <el-form-item label="开始时间:"> 
+                      <el-date-picker
+                          v-model="start_time_one"
+                          type="date"
+                            value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
 
-            <el-row :gutter="24">
-                <el-col :span="24">
-                    <el-form-item label="原因:"> 
-                        <el-input style="width: 300px;height: 100px;"  type="textarea" v-model="lapse_reason"></el-input>
+                <el-col :span="8">
+                    <el-form-item label="结束时间:"> 
+                      <el-date-picker
+                          v-model="end_time_one"
+                          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-date-picker
-                            v-model="record_date"
-                            type="date"
-                             value-format="yyyy-MM-dd"
-                            placeholder="选择日期">
-                         </el-date-picker>
+                    <el-form-item label="原因:"> 
+                        <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
@@ -339,12 +446,22 @@
                          </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>
@@ -364,7 +481,7 @@
   <script>
     const moment = require('moment')
     import PatientSidebar from './components/PatientSidebar'
-    import { savePatientLapse,getAllDoctor,deletePatientLapsoRrecord,getPatientById,getPatientLapseRecord,getPatientLapsoSummary,updatePatientLapseRecord} from '@/api/patient'
+    import { savePatientLapse,getAllDoctor,deletePatientLapsoRrecord,getPatientById,getPatientLapseRecord,getPatientLapsoSummary,updatePatientLapseRecord,getPatientLapsoList} from '@/api/patient'
   
     import { jsGetAge, uParseTime } from '@/utils/tools'
     import { getDataConfig } from '@/utils/data'
@@ -475,9 +592,19 @@
           his_type:"1",
           his_zone:"",
           his_bed:"",
+          start_time:"",
+          end_time:"",
+          patient_address:"",
+          start_time_one:"",
+          end_time_one:"",
         }
       },
       methods: {
+        toJiaoBen(){
+           getPatientLapsoList().then(response=>{
+
+           })      
+        },
         clickuseradvicecell(row, column, cell, event) {
         },
         onTranPatient: function(tranPatient) {
@@ -548,35 +675,42 @@
           }
         })
       },
+
       getLapseType(id){
         var name = ""
-        if(id == 1){
-          name = "终止透析"
+        if(id == 4){
+          name = "转出院外"
         }
-        if(id == 2){
+        if(id == 5){
           name = "转出院外"
         }
-        if(id == 3){
+        if(id == 6){
           name = "回居住地透析"
         }
-        if(id == 4){
+        if(id == 7){
           name = "临时透析"
         }
-        if(id == 5){
+        if(id == 8){
           name = "转腹膜透析"
         }
-        if(id == 6){
+        if(id == 9){
           name = "其他"
         }
-        if(id == 7){
+        if(id == 10){
           name = "变更透析医院"
         }
-        if(id == 8){
+        if(id == 11){
           name = "住院"
         }
-        if(id == 9){
+        if(id == 12){
           name = "转血透科"
         }
+        if(id == 13){
+          name = "回居住地透析"
+        }
+        if(id == 14){
+          name = "变更透析医院"
+        }
 
         return name
 
@@ -598,6 +732,11 @@
             his_bed:this.his_bed,
             his_type: parseInt(this.his_type),
             his_zone:this.his_zone,
+            patient_address:this.patient_address,
+            start_time:this.start_time,
+            end_time:this.end_time,
+            start_time_one:this.start_time_one,
+            end_time_one:this.end_time_one,
           }
           console.log("params=====",params)
         savePatientLapse(params).then(response=>{
@@ -642,6 +781,11 @@
              this.his_zone = lapsorecord.his_zone
              this.his_type = lapsorecord.his_type
              this.id = lapsorecord.id
+             this.patient_address = lapsorecord.patient_address
+             this.start_time =  this.getTime(lapsorecord.start_time)
+             this.end_time =  this.getTime(lapsorecord.end_time)
+             this.start_time_one =  this.getTime(lapsorecord.start_time_one)
+             this.end_time_one =  this.getTime(lapsorecord.end_time_one)
              this.editDialogVisible = true
            
           }
@@ -666,6 +810,11 @@
             his_bed:this.his_bed,
             his_type:parseInt(this.his_type),
             his_zone:this.his_zone,
+            patient_address:this.patient_address,
+            start_time:this.start_time,
+            end_time:this.end_time,
+            start_time_one:this.start_time_one,
+            end_time_one:this.end_time_one,
           }
          
         updatePatientLapseRecord(params).then(response=>{