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

src/api/patient.js

     method:"Get",
     params:params,
   })
+}
+
+export function addDeathSummary(data){
+  
+  return request({
+    url:"/api/patient/adddeathsummary",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getPatientDeathSummary(params){
+ 
+  return request({
+    url:"/api/patient/getpatientdeathsummary",
+    method:"get",
+    params:params,
+  })
+}
+
+export function deletePatientDeathSummary(params){
+
+  return request({
+    url:"/api/patient/deletepatientdeathsummary",
+    method:"get",
+    params:params
+  })
 }

src/router/modules/patient.js

       noCache: true
     }
   },
+  {
+    path: '/patient/patient/:id/deathSummary',
+    component: () => import('@/xt_pages/user/deathSummary'),
+    hidden: true,
+    is_menu: false,
+    name: 'deathSummary',
+    meta: {
+      title: 'deathSummary',
+      noCache: true
+    }
+  },
   {
     path: '/patients/course',
     component: () => import('@/xt_pages/user/courseOfDisease'),

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
+              if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
+                 this.dialysisPrescription.target_ultrafiltration = 0
+             }
+
             }
 
             if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
               if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)>0){
                 this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
+                if(this.dialysisPrescription.prescription_water == "NaN"){
+                     this.dialysisPrescription.prescription_water = 0
+                }
+
               }
 
             }
 
              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
 
+             if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
+               this.dialysisPrescription.target_ultrafiltration = 0
+             }
+
           }
         }
 
          }
         }
 
+        if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
+           this.dialysisPrescription.target_ultrafiltration = 0
+        }
+
+        if(this.dialysisPrescription.prescription_water == "NaN"){
+           this.dialysisPrescription.prescription_water = 0
+        }
+
+
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){
           if(this.dialysisPrescription.target_ultrafiltration==0){
              this.$message.error("目标超滤量不能为空")
              return false
-         }
+          }
+         
         }
+        
+        if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
+           this.dialysisPrescription.target_ultrafiltration = 0
+          }
+
+         if(this.dialysisPrescription.prescription_water == "NaN"){
+           this.dialysisPrescription.prescription_water = 0
+         }
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){

src/xt_pages/user/components/PatientSidebar.vue

           name: '7',
           label: '转归记录',
         },
+        {
+          name: '8',
+          label: '死亡记录',
+        },
 
       ],
       name:""
         this.$router.push({path: '/patients/patient/' + this.id+ '/Informedconsent'})
       }else if(name == '7'){
         this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
+      }else if(name == '8'){
+        console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
+       this.$router.push({path:'/patient/patient/'+this.id+'/deathSummary'})
       }
 
     },
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
       }else if(patientKey == '7'){
         this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
+      }else if(patientKey == '8'){
+       this.$router.push({path:'/patient/patient/'+this.id+'/deathSummary'})
       }else if(patientKey == '4-12'){
         this.$router.push({path:'/patients/newInspection?id='+this.id})
       }

src/xt_pages/user/lapsoSummary.vue

             <el-button type="primary" @click="updatePatientLapse('form')">保存</el-button>
         </span>
         </el-dialog>
+
+
+        <el-dialog
+          title="转出提示"
+          :visible.sync="laspDialogVisible"
+          width="50%">
+          <span>
+            <div>
+              患者转出后,系统会将今日之后的排班清除，透析方案停用,长期医嘱停用,确定转出吗?如不需要清除排班,请先勾选下方选项,再点击确认。
+            </div>
+            <div>
+              <el-checkbox-group v-model="check_status">
+                   <el-checkbox v-for="city in cityList" :label="city" :key="city">{{city}}</el-checkbox>
+              </el-checkbox-group>
+            </div>
+          </span>
+          <span slot="footer" class="dialog-footer">
+          <el-button @click="laspDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="saveLapseSummary">确 定</el-button>
+         </span>
+         </el-dialog>
   
       </div>
       
     const moment = require('moment')
     import PatientSidebar from './components/PatientSidebar'
     import { savePatientLapse,getAllDoctor,deletePatientLapsoRrecord,getPatientById,getPatientLapseRecord,getPatientLapsoSummary,updatePatientLapseRecord,getPatientLapsoList} from '@/api/patient'
-  
     import { jsGetAge, uParseTime } from '@/utils/tools'
     import { getDataConfig } from '@/utils/data'
     import multiSelectBox from '../dialysis/details/dialog/MultiSelectBox'
           patient_address:"",
           start_time_one:"",
           end_time_one:"",
+          laspDialogVisible:false,
+          check_status:false,
+          cityOneList:["不清除排班","不停用方案","不停用医嘱","不清除患者绑定"],
+          cityList:["不清除排班"],
+          city_check:2, 
+          objParams:{}
         }
       },
       methods: {
             end_time:this.end_time,
             start_time_one:this.start_time_one,
             end_time_one:this.end_time_one,
+            is_check:2,
           }
+          this.objParams = params
           console.log("params=====",params)
-        savePatientLapse(params).then(response=>{
-          if(response.data.state==1){
+         if(this.lapse_type == 2 || this.lapse_type == 3){
+          this.laspDialogVisible = true
+        }else{
+          savePatientLapse(params).then(response=>{
+           if(response.data.state==1){
              var record = response.data.data.record
              this.$message.success("保存成功!")
              this.dialogVisible = false
              this.lapse_reason = ""
              this.getlist()
 
-          }
-        })
+           }
+         })
+        }
+       
+      },
+      saveLapseSummary(){
+        var is_check = 2
+        if(this.check_status == true){
+          is_check =1
+        }      
+        if(this.check_status == false){
+          is_check = 2
+        }
+        this.objParams.is_check = is_check
+        console.log("params======",this.objParams)
+        
+        savePatientLapse(this.objParams).then(response=>{
+           if(response.data.state==1){
+             var record = response.data.data.record
+             this.$message.success("保存成功!")
+             this.dialogVisible = false
+             this.remark = ""
+             this.lapse_reason = ""
+             this.getlist()
+
+           }
+         })
+
       },
       getlist(){
          var params = {
      
       },
       created() {
-        this.record_date =  moment(new Date()).format('YYYY-MM-DD')
-       
+        this.record_date =  moment(new Date()).format('YYYY-MM-DD')      
         const id = this.$route.params && this.$route.params.id
         console.log('id是设么', id)
          this.patientID = parseInt(id)