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

src/api/patient.js

@@ -1030,4 +1030,22 @@ export function getTherapyInformed(params){
     method:"get",
     params:params
   })
+}
+
+export function saveMedicalHistory(data){
+  
+  return request({
+    url:"/api/patient/savemedicalhistory",
+    method:"post",
+    data:data
+  })
+}
+
+export function getPatientMeDicalList(params){
+  
+  return request({
+    url:"/api/patient/getpatientmedicallist",
+    method:"get",
+    params:params,
+  })
 }

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -293,6 +293,9 @@
         }, {
           value: 4,
           label: '电子凭证'
+        },{
+          value: 5,
+          label: '人脸识别'
         }],
         settlement: [
           { value: 1, label: '医保' },

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1752,7 +1752,7 @@ export default {
       }
       this.$refs.additionalCharges.hide()
 
-    }, 
+    },
     // 项目
     searchProjectAction() {
       console.log('~~~~',this.search_project_keyword)
@@ -1806,7 +1806,7 @@ export default {
       if (this.search_keyword.length == 0) {
         this.drugs = this.allDrugs
       } else {
-       
+
         let arr = []
         for (let i = 0; i < drug2.length; i++) {
           if (drug2[i].drug_name.indexOf(this.search_keyword) != -1 ||
@@ -3683,173 +3683,373 @@ export default {
       //   }
       // }
 
-      for (let i = 0; i < this.prescriptions.length; i++) {
-        if (this.prescriptions[i].name == this.editableTabsValue) {
-          var temp = this.deepClone(this.curDrugs)
-          var temp2 = this.deepClone(this.teamList)
-
-          var temp3 = this.deepClone(templateDrugs)
-          if (temp3.length > 0) {
-            for (let b = 0; b < temp3.length; b++) {
-              let obj = {
-                advice_id: 0,
-                id: temp3[b].id,
-                drug_name: temp3[b].advice_name,
-                single_dose: temp3[b].single_dose.toString(),
-                delivery_way: temp3[b].delivery_way,
-                execution_frequency: temp3[b].execution_frequency,
-                retail_price: temp3[b].drug.retail_price.toString(),
-                remark: '',
-                day: '1',
-                prescribing_number: temp3[b].prescribing_number,
-                single_dose_unit: temp3[b].drug.drug_dose_unit,
-                prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
-                medical_insurance_number: temp3[b].drug.medical_insurance_number
-              }
 
-              if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
-                obj.prescribing_number = 1
-              }
-
-              this.prescriptions[i].advices.push(obj)
+      //大丰限制用药提醒逻辑
+      var temp = this.deepClone(this.curDrugs)
+      console.log("-----~~~~")
+      console.log(temp)
+      console.log("-----~~~~")
+
+      let limit_remark = ""
+      if (temp.length > 0) {
+        for (let b = 0; b < temp.length; b++) {
+          if(temp[b].limit_remark.length > 0){
+            if(limit_remark.length == 0){
+              limit_remark = temp[b].limit_remark
+            }else{
+              limit_remark = limit_remark +  "\n" + temp[b].limit_remark
             }
-            this.curStatus = 1
+
           }
+        }
+      }
+      if((limit_remark.length > 0 && this.org_id == 10217)){
+        this.$confirm(limit_remark, '限制用药提醒', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.prescriptions.length; i++) {
+            if (this.prescriptions[i].name == this.editableTabsValue) {
+              var temp = this.deepClone(this.curDrugs)
+              var temp2 = this.deepClone(this.teamList)
 
-          let index = 0
+              var temp3 = this.deepClone(templateDrugs)
+              if (temp3.length > 0) {
+                for (let b = 0; b < temp3.length; b++) {
+                  let obj = {
+                    advice_id: 0,
+                    id: temp3[b].id,
+                    drug_name: temp3[b].advice_name,
+                    single_dose: temp3[b].single_dose.toString(),
+                    delivery_way: temp3[b].delivery_way,
+                    execution_frequency: temp3[b].execution_frequency,
+                    retail_price: temp3[b].drug.retail_price.toString(),
+                    remark: '',
+                    day: '1',
+                    prescribing_number: temp3[b].prescribing_number,
+                    single_dose_unit: temp3[b].drug.drug_dose_unit,
+                    prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
+                    medical_insurance_number: temp3[b].drug.medical_insurance_number
+                  }
 
-          if (this.curPrescriptions.advices.length > 0) {
-            index = this.curPrescriptions.advices.length
-          }
+                  if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                    obj.prescribing_number = 1
+                  }
 
-          if (temp.length > 0) {
-            for (let b = 0; b < temp.length; b++) {
-              if(temp[b].max_unit == temp[b].min_unit){
-                temp[b].retail_price = temp[b].min_price
+                  this.prescriptions[i].advices.push(obj)
+                }
+                this.curStatus = 1
               }
-              let temp_index = 0
-              if(this.org_id == 0 || this.org_id == 10206){
 
-                 temp_index  = Math.floor(Math.random() * 90 + 10);
-              }else{
-                 temp_index = b + 1
+              let index = 0
+
+              if (this.curPrescriptions.advices.length > 0) {
+                index = this.curPrescriptions.advices.length
               }
-              let obj = {
-                advice_id: 0,
-                id: temp[b].id,
-                drug_name: temp[b].drug_name,
-                single_dose: temp[b].single_dose,
-                delivery_way: temp[b].delivery_way,
-                execution_frequency: temp[b].execution_frequency,
-                retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
-                remark: '',
-                day: temp[b].drug_day ? temp[b].drug_day : 1,
-                prescribing_number: temp[b].prescribing_number,
-                single_dose_unit: temp[b].dose_unit,
-                prescribing_number_unit: temp[b].prescribing_number_unit,
-                medical_insurance_number: temp[b].medical_insurance_number,
-                drug: temp[b],
-                groupno: index + temp_index,
-                hosp_appr_flag: '1',
-                execution_state:2,
 
+              if (temp.length > 0) {
+                for (let b = 0; b < temp.length; b++) {
+                  if(temp[b].max_unit == temp[b].min_unit){
+                    temp[b].retail_price = temp[b].min_price
+                  }
+                  let temp_index = 0
+                  if(this.org_id == 0 || this.org_id == 10206){
+
+                    temp_index  = Math.floor(Math.random() * 90 + 10);
+                  }else{
+                    temp_index = b + 1
+                  }
+                  let obj = {
+                    advice_id: 0,
+                    id: temp[b].id,
+                    drug_name: temp[b].drug_name,
+                    single_dose: temp[b].single_dose,
+                    delivery_way: temp[b].delivery_way,
+                    execution_frequency: temp[b].execution_frequency,
+                    retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
+                    remark: '',
+                    day: temp[b].drug_day ? temp[b].drug_day : 1,
+                    prescribing_number: temp[b].prescribing_number,
+                    single_dose_unit: temp[b].dose_unit,
+                    prescribing_number_unit: temp[b].prescribing_number_unit,
+                    medical_insurance_number: temp[b].medical_insurance_number,
+                    drug: temp[b],
+                    groupno: index + temp_index,
+                    hosp_appr_flag: '1',
+                    execution_state:2,
+
+
+                  }
+                  if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                    obj.prescribing_number = 1
+                  }
+                  // 针对灵山圣康
+                  if(this.org_id == 0 || this.org_id ==10375){
+                    if(this.prescriptions[i]!=null){
+                      console.log("禅古this.prescriptions[i].advices.length",this.prescriptions[i].advices.length)
+                      if(this.prescriptions[i].advices.length >=5){
+
+                        this.$message.error("添加条数已经大于5条,添加失败!")
+                        return false
+                      }
+
+
+                    }
+                  }
+                  this.prescriptions[i].advices.push(obj)
+                }
+                this.curStatus = 1
 
               }
-              if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
-                obj.prescribing_number = 1
-              }
-               // 针对灵山圣康
-               if(this.org_id == 0 || this.org_id ==10375){
-                if(this.prescriptions[i]!=null){
-                  console.log("禅古this.prescriptions[i].advices.length",this.prescriptions[i].advices.length)
-                  if(this.prescriptions[i].advices.length >=5){
-
-                    this.$message.error("添加条数已经大于5条,添加失败!")
-                    return false
+
+              if (temp2.length > 0) {
+                for (let b = 0; b < temp2.length; b++) {
+                  let obj = {
+                    id: 0,
+                    project_id: temp2[b].id,
+                    project_name: temp2[b].project_name,
+                    statistical_classification: '',
+                    single_dose: temp2[b].single_dose.toString(),
+                    delivery_way: temp2[b].delivery_way,
+                    execution_frequency: temp2[b].execution_frequency,
+                    number_days: temp2[b].number_days.toString(),
+                    total: temp2[b].cus_total,
+                    price: temp2[b].price,
+                    remark: '',
+                    medical_code: temp2[b].medical_code,
+                    type: temp2[b].type,
+                    execution_state:2,
+
                   }
-                  
-                  
+
+                  if (temp2[b].type == 2){
+                    obj['project'] = temp2[b].project
+                    obj['unit'] = temp2[b].project.unit
+
+
+                  }else if(temp2[b].type == 3){
+                    obj['good_info'] = temp2[b].good_info
+                    obj['unit'] = temp2[b].good_info.packing_unit
+
+
+                  }
+                  if (temp2[b].team_id == undefined) {
+                    obj['team_id'] = 0
+                  } else {
+                    obj['team_id'] = temp2[b].team_id
+                  }
+                  if (obj.total == 0 || obj.total == undefined) {
+                    obj.total = 1
+                  }
+                  if (obj.type == 3) {
+                    obj.single_dose = 1
+                  }
+                  // 针对灵山圣康
+                  if(this.org_id == 0 || this.org_id ==10375){
+                    if(this.prescriptions[i]!=null){
+                      if(this.prescriptions[i].project.length >=5){
+                        this.$message.error("添加条数已经大于5条,添加失败!")
+                        return false
+                      }
+
+
+                    }
+                  }
+                  this.prescriptions[i].project.push(obj)
                 }
+                this.curStatus = 2
               }
-              this.prescriptions[i].advices.push(obj)
-            }
-            this.curStatus = 1
 
+              this.curPrescriptions = this.prescriptions[i]
+
+
+
+
+
+              this.$refs.multipleTable.clearSelection()
+              this.$refs.tables.clearSelection()
+              this.clearSelection()
+
+            }
           }
+          this.curDrugs = []
+          this.preDrugs = []
+          this.teamList = []
+        }).catch(() => {
+
+        })
+      }else{
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if (this.prescriptions[i].name == this.editableTabsValue) {
+            var temp = this.deepClone(this.curDrugs)
+            var temp2 = this.deepClone(this.teamList)
 
-          if (temp2.length > 0) {
-            for (let b = 0; b < temp2.length; b++) {
-              let obj = {
-                id: 0,
-                project_id: temp2[b].id,
-                project_name: temp2[b].project_name,
-                statistical_classification: '',
-                single_dose: temp2[b].single_dose.toString(),
-                delivery_way: temp2[b].delivery_way,
-                execution_frequency: temp2[b].execution_frequency,
-                number_days: temp2[b].number_days.toString(),
-                total: temp2[b].cus_total,
-                price: temp2[b].price,
-                remark: '',
-                medical_code: temp2[b].medical_code,
-                type: temp2[b].type,
-                execution_state:2,
+            var temp3 = this.deepClone(templateDrugs)
+            if (temp3.length > 0) {
+              for (let b = 0; b < temp3.length; b++) {
+                let obj = {
+                  advice_id: 0,
+                  id: temp3[b].id,
+                  drug_name: temp3[b].advice_name,
+                  single_dose: temp3[b].single_dose.toString(),
+                  delivery_way: temp3[b].delivery_way,
+                  execution_frequency: temp3[b].execution_frequency,
+                  retail_price: temp3[b].drug.retail_price.toString(),
+                  remark: '',
+                  day: '1',
+                  prescribing_number: temp3[b].prescribing_number,
+                  single_dose_unit: temp3[b].drug.drug_dose_unit,
+                  prescribing_number_unit: temp3[b].drug.prescribing_number_unit,
+                  medical_insurance_number: temp3[b].drug.medical_insurance_number
+                }
+
+                if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                  obj.prescribing_number = 1
+                }
 
+                this.prescriptions[i].advices.push(obj)
               }
+              this.curStatus = 1
+            }
 
-              if (temp2[b].type == 2){
-                obj['project'] = temp2[b].project
-                obj['unit'] = temp2[b].project.unit
+            let index = 0
 
+            if (this.curPrescriptions.advices.length > 0) {
+              index = this.curPrescriptions.advices.length
+            }
 
-              }else if(temp2[b].type == 3){
-                obj['good_info'] = temp2[b].good_info
-                obj['unit'] = temp2[b].good_info.packing_unit
+            if (temp.length > 0) {
+              for (let b = 0; b < temp.length; b++) {
+                if(temp[b].max_unit == temp[b].min_unit){
+                  temp[b].retail_price = temp[b].min_price
+                }
+                let temp_index = 0
+                if(this.org_id == 0 || this.org_id == 10206){
 
+                  temp_index  = Math.floor(Math.random() * 90 + 10);
+                }else{
+                  temp_index = b + 1
+                }
+                let obj = {
+                  advice_id: 0,
+                  id: temp[b].id,
+                  drug_name: temp[b].drug_name,
+                  single_dose: temp[b].single_dose,
+                  delivery_way: temp[b].delivery_way,
+                  execution_frequency: temp[b].execution_frequency,
+                  retail_price: temp[b].prescribing_number_unit == temp[b].max_unit ? temp[b].retail_price.toString() : temp[b].min_price.toString(),
+                  remark: '',
+                  day: temp[b].drug_day ? temp[b].drug_day : 1,
+                  prescribing_number: temp[b].prescribing_number,
+                  single_dose_unit: temp[b].dose_unit,
+                  prescribing_number_unit: temp[b].prescribing_number_unit,
+                  medical_insurance_number: temp[b].medical_insurance_number,
+                  drug: temp[b],
+                  groupno: index + temp_index,
+                  hosp_appr_flag: '1',
+                  execution_state:2,
 
+
+                }
+                if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
+                  obj.prescribing_number = 1
+                }
+                // 针对灵山圣康
+                if(this.org_id == 0 || this.org_id ==10375){
+                  if(this.prescriptions[i]!=null){
+                    console.log("禅古this.prescriptions[i].advices.length",this.prescriptions[i].advices.length)
+                    if(this.prescriptions[i].advices.length >=5){
+
+                      this.$message.error("添加条数已经大于5条,添加失败!")
+                      return false
+                    }
+
+
+                  }
+                }
+                this.prescriptions[i].advices.push(obj)
               }
-              if (temp2[b].team_id == undefined) {
-                obj['team_id'] = 0
-              } else {
-                obj['team_id'] = temp2[b].team_id
-              }
-              if (obj.total == 0 || obj.total == undefined) {
-                obj.total = 1
-              }
-              if (obj.type == 3) {
-                obj.single_dose = 1
-              }
-              // 针对灵山圣康
-              if(this.org_id == 0 || this.org_id ==10375){
-                if(this.prescriptions[i]!=null){
-                  if(this.prescriptions[i].project.length >=5){
-                    this.$message.error("添加条数已经大于5条,添加失败!")
-                    return false
+              this.curStatus = 1
+
+            }
+
+            if (temp2.length > 0) {
+              for (let b = 0; b < temp2.length; b++) {
+                let obj = {
+                  id: 0,
+                  project_id: temp2[b].id,
+                  project_name: temp2[b].project_name,
+                  statistical_classification: '',
+                  single_dose: temp2[b].single_dose.toString(),
+                  delivery_way: temp2[b].delivery_way,
+                  execution_frequency: temp2[b].execution_frequency,
+                  number_days: temp2[b].number_days.toString(),
+                  total: temp2[b].cus_total,
+                  price: temp2[b].price,
+                  remark: '',
+                  medical_code: temp2[b].medical_code,
+                  type: temp2[b].type,
+                  execution_state:2,
+
+                }
+
+                if (temp2[b].type == 2){
+                  obj['project'] = temp2[b].project
+                  obj['unit'] = temp2[b].project.unit
+
+
+                }else if(temp2[b].type == 3){
+                  obj['good_info'] = temp2[b].good_info
+                  obj['unit'] = temp2[b].good_info.packing_unit
+
+
+                }
+                if (temp2[b].team_id == undefined) {
+                  obj['team_id'] = 0
+                } else {
+                  obj['team_id'] = temp2[b].team_id
+                }
+                if (obj.total == 0 || obj.total == undefined) {
+                  obj.total = 1
+                }
+                if (obj.type == 3) {
+                  obj.single_dose = 1
+                }
+                // 针对灵山圣康
+                if(this.org_id == 0 || this.org_id ==10375){
+                  if(this.prescriptions[i]!=null){
+                    if(this.prescriptions[i].project.length >=5){
+                      this.$message.error("添加条数已经大于5条,添加失败!")
+                      return false
+                    }
+
+
                   }
-                  
-                  
                 }
+                this.prescriptions[i].project.push(obj)
               }
-              this.prescriptions[i].project.push(obj)
+              this.curStatus = 2
             }
-            this.curStatus = 2
-          }
 
-          this.curPrescriptions = this.prescriptions[i]
-       
-          
-          
-         
-         
-          this.$refs.multipleTable.clearSelection()
-          this.$refs.tables.clearSelection()
-          this.clearSelection()
+            this.curPrescriptions = this.prescriptions[i]
+
+
+
+
+
+            this.$refs.multipleTable.clearSelection()
+            this.$refs.tables.clearSelection()
+            this.clearSelection()
 
+          }
         }
+        this.curDrugs = []
+        this.preDrugs = []
+        this.teamList = []
       }
-      this.curDrugs = []
-      this.preDrugs = []
-      this.teamList = []
+
+
 
     }, changeAllGoodInfoTableDataTwo(row) {
       this.teamList = row

src/xt_pages/outpatientTool/components/detail.vue

@@ -547,7 +547,8 @@ export default {
               let new_name = tempPatientsTwo[i].new_order_info[b].item_name
               if (new_name != undefined){
                 if (new_name.length != 0) {
-                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString())).toFixed(2))
+                  console.log(parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price))
+                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count) * parseFloat(tempPatientsTwo[i].new_order_info[b].price)).toFixed(2))
                 }
 
 
@@ -807,7 +808,7 @@ export default {
           // sums[index] = sums[index].toFixed(2)
           let num = 0
           data.map(item => {
-            num += item.price.toFixed(2) * item.count
+            num += item.price * item.count
           })
           sums[index] = num.toFixed(2)
         } else {

src/xt_pages/user/Informed/Informedconsent.vue

@@ -121,7 +121,7 @@
                   <therapy_informed :patient_id ="this.patientID"></therapy_informed>
                 </div>
                 <div v-if="history_show">
-                  <Medicalhistory :patient_id ="this.patientID"></Medicalhistory>
+                  <Medicalhistory :patient_id ="this.patientID" :medicalList="medicalList" ref="childThrity"></Medicalhistory>
                 </div>
                 <div v-if="show14">
                   <heal_informed :patient_id ="this.patientID"></heal_informed>
@@ -160,7 +160,7 @@ import Medicalhistory from './components/Medicalhistory'
 import heal_informed from './components/heal_informed'
 import criticalpatient_informed from './components/criticalpatient_informed'
 import criticalpatient_informed2 from './components/criticalpatient_informed2'
-import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed  } from '@/api/patient'
+import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList  } from '@/api/patient'
 export default {
 
   components: {
@@ -216,7 +216,8 @@ export default {
       filterList:{},
       profundaPrint:{},
       arterOvenousPrint:{},
-      highRiskPrint:{}
+      highRiskPrint:{},
+      medicalList:{}
     }
 
   },
@@ -236,12 +237,24 @@ export default {
         this.patient =patient
       }
     })
+   },
+   getPatientMeDicalList(){
+      var params = {
+         patient_id:this.patientID,
+      }
+     getPatientMeDicalList(params).then(response=>{
+        if(response.data.state ==1){
+          var list= response.data.data.list
+          this.medicalList = list
+          this.$refs.childThrity.show(list)
+        }
+     })
    },
     rowClick(row, column, event){
-      // console.log('1111',row);
+     console.log('1111',row);
       // console.log('2222',column);
       // console.log('3333',event);
-
+       
         if(row.value==1){
           this.face_show=true
           this.filter_show=false,
@@ -475,6 +488,7 @@ export default {
           this.show14=false,
           this.show15=false,
           this.show16=false
+          this.getPatientMeDicalList()
         }
         if(row.value==14){
           this.filter_show=false

src/xt_pages/user/Informed/components/Medicalhistory.vue

@@ -17,7 +17,7 @@
           <h2 style="text-align: center;margin-bottom: 20px;">门诊血液透析治疗病历首页</h2>
           <div style="display: flex;padding: 10px 5px">
             <div style="flex: 1;">门诊号<span class="unile">{{ patient.admission_number }}</span></div>
-            <div style="flex: 1;">住院号 <span class="unile">{{ patient.admission_number }}</span></div>
+            <div style="flex: 1;">透析号 <span class="unile">{{ patient.dialysis_no }}</span></div>
             <div style="flex: 1.5;">首次治疗日期 <span class="unile">{{getTime(patient.first_dialysis_date) }}</span></div>
           </div>
           <div style="display: flex;padding: 10px 5px">
@@ -35,40 +35,39 @@
           </div>
           <div style='padding: 10px 5px'>
             <div>
-              现住址(详填) <span class="unile2">{{ sheng ? sheng:' ' }}</span> 省 <span class="unile2">{{ shi? shi:' ' }}</span>市
-              <span class="unile2">{{ xian ?xian:'' }}</span>县(区)<span class="unile2">{{ jie?jie:'' }}</span>乡(镇、街道)<span class="unile2">{{ hao?hao:'' }}</span>村（门牌号）
+              现住址(详填) <span class="unile2">{{ patient.home_address }}</span>
             </div>
-            <div style="flex: 1;">邮编<span class="unile2"></span></div>
+            <!-- <div style="flex: 1;">邮编<span class="unile2"></span></div> -->
           </div>
           <div style='padding: 10px 5px'>
             <div>
-              户口住址(详填) <span class="unile2"></span>省<span class="unile2"></span>市<span class="unile2"></span>县(区)<span class="unile2"></span>乡(镇、街道)<span class="unile2"></span>村（门牌号）
+              家庭住址<span class="unile2">{{ patient.home_address }}</span>
             </div>
-            <div style="flex: 1;">邮编<span class="unile2"></span></div>
+            <!-- <div style="flex: 1;">邮编<span class="unile2"></span></div> -->
           </div>
           <div style="display: flex;padding: 10px 5px">
             <div style="flex: 1;">
-              电话<span class="unile">{{ patient.home_telephone }}</span>
+              本人电话<span class="unile">{{ patient.home_telephone }}</span>
             </div>
-            <div style="flex: 1;">
+            <!-- <div style="flex: 1;">
               手机<span class="unile">{{ patient.phone }}</span>
-            </div>
+            </div> -->
             <div style="flex: 1.5;">
-              亲属联系方式<span class="unile"></span>
+              亲属联系方式<span class="unile">{{ patient.relative_phone }}</span>
             </div>
           </div>
           <div style="padding: 10px 5px">
-            工作单位<span class="unile"></span>
+            工作单位<span class="unile">{{ patient.work_unit }}</span>
           </div>
-          <div style="padding: 10px 5px">
+          <!-- <div style="padding: 10px 5px">
             地址<span class="unile2"></span> 省(市)<span class="unile2"></span>路<span class="unile2"></span>号
-          </div>
+          </div> -->
           <div style="padding: 10px 5px">
             诊断：<span class="unile">{{ patient.diagnose }}</span>
           </div>
-          <div style="padding: 10px 5px">
+          <!-- <div style="padding: 10px 5px">
             合并症或并发症 <span class="unile"></span>
-          </div>
+          </div> -->
           <div V-html="content"></div>
           <div v-html="content"></div>
           <!-- <div>
@@ -141,7 +140,7 @@
     </div>
     <!-- 编辑 -->
     <el-dialog
-      title="提示"
+      title="新增"
       :visible.sync="dialogVisible"
       width="60%">
         <div>
@@ -150,7 +149,7 @@
             <div style="flex: 1;">门诊号
               <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.admission_number }}</span>
             </div>
-            <div style="flex: 1;">住院号 
+            <div style="flex: 1;">透析号 
               <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.admission_number }}</span>
             </div>
             <div style="flex: 1;">姓名：
@@ -172,12 +171,47 @@
               <span v-if="sex==2">女</span>
             </div>
           </div> -->
+          <div style="display: flex;padding: 10px 5px">
+            <div style="flex: 1;">
+              身份证号
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.id_card_no }} </span>
+            </div>
+          </div>
+          <div style='padding: 10px 5px'>
+            <div>
+              现住址(详填)<span style="display: inline-block;border-bottom: 1px solid black;width: 60%;"> </span>
+            
+            </div>
+            
+          </div>
+          <div style='padding: 10px 5px'>
+            <div>
+              家庭住址<span style="display: inline-block;border-bottom: 1px solid black;width: 60%;"> </span>
+            
+            </div>
+           
+          </div>
+          <div style="display: flex;padding: 10px 5px">
+            <div style="flex: 1;">
+              本人电话
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;"> </span>
+            </div>
+          
+            <div style="flex: 1.5;">
+              亲属联系方式
+              <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;"> </span>
+            </div>
+          </div>
+          <div style="padding: 10px 5px">
+            工作单位
+            <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;"> </span>
+          </div>
           <div style="padding: 10px 5px">诊断：
             <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;">{{ patient.diagnose }}</span>
           </div>
-          <div style="padding: 10px 5px">合并症或并发症 
+          <!-- <div style="padding: 10px 5px">合并症或并发症 
             <span style="display: inline-block;border-bottom: 1px solid black;width: 60%;"></span>
-          </div>
+          </div> -->
           <keep-alive>
             <editor ref="editor"
                     id="editor"
@@ -188,17 +222,18 @@
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+          <el-button type="primary" @click="saveMedicalHistory">保 存</el-button>
         </span>
     </el-dialog>
   </div>
 </template>
 <script>
 
-import { getPatientDetailInformedconsent  } from '@/api/patient'
+import { getPatientDetailInformedconsent,saveMedicalHistory  } from '@/api/patient'
 import print from "print-js";
 import Editor from '@/components/Editor'
 import { uParseTime } from '@/utils/tools'
+
 const content=`<div>
             <table border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
               <tr>
@@ -267,7 +302,10 @@ export default{
   props: {
     patient_id: {
         type: Number,
-      }
+      },
+    medicalList:{
+      type:Object,
+    }
   },
   components:{
     Editor
@@ -288,11 +326,25 @@ export default{
     }
   },
   created(){
+    if(this.medicalList!=null && this.medicalList.id >0){
+        this.content = ""
+        this.content = this.medicalList.content
+      }
     this.getlist()
     // this.number = 1233444
     // }
   },
   methods:{
+    show(val){
+       if(val!=null){
+        console.log("valw233223",val)
+         if(val.content!=""){
+           this.content = ""
+           this.content = val.content
+         }
+         
+       }
+    },
     getlist(){
       // console.log("owwwwwwwwwwwwwwwwwww",this.patient_id)
       getPatientDetailInformedconsent(this.patient_id).then(response=>{
@@ -351,6 +403,23 @@ export default{
     // 编辑
     bianji(){
       this.dialogVisible = true
+    },
+    saveMedicalHistory(){
+      console.log("adfadfaf")
+      var params = {
+          content:this.$refs.editor.content,
+          patient_id:this.patient_id,
+       }
+       console.log("paramsm2222",params)
+      saveMedicalHistory(params).then(response=>{
+        if(response.data.state ==1){
+           var medicalHistory  = response.data.data.medicalHistory
+           this.$message.success("保存成功!")
+           this.dialogVisible =false
+           this.$emit("getPatientMeDicalList","");
+          
+        }
+      })
     }
   },
   computed:{