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

@@ -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/router/modules/dialysis.js

@@ -975,6 +975,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/seventythree',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_seventythree'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_seventythree',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/xt_pages/dialysis/batch_print/batch_print_order_seventyone.vue

@@ -8,7 +8,7 @@
         icon="el-icon-printer"
         @click="printThisPage"
         type="primary"
-      >打印71
+      >打印
       </el-button>
     </div>
     <div class="app-container">
@@ -314,11 +314,11 @@
                 </div>
                 <div style="flex: 1;">
                   医师签名
-                  <span class="under-line" style="display: inline-block;width: 50%;" v-if="setAdminUserES(record.prescription,'prescription_doctor') == ''">
-                    {{ getAdminUser(record.prescription, 'prescription_doctor')}}
+                  <span class="under-line" style="display: inline-block;width: 50%;" v-if="setAdminUserES(record.prescription,'creater') == ''">
+                    {{ getAdminUser(record.prescription, 'creater')}}
                   </span>
                   <span class="under-line" style="display: inline-block;width: 50%;" v-else>
-                    <img style="height:30px;" :src="setAdminUserES(record.prescription,'prescription_doctor')" alt srcset />
+                    <img style="height:30px;" :src="setAdminUserES(record.prescription,'creater')" alt srcset />
                   </span>
                 </div>
               </div>
@@ -332,7 +332,7 @@
                 <div style="flex: 1;">
                   透 (滤) 器
                   <span class="under-line" style="display: inline-block;width: 50%;" >
-                    
+
                     {{  record.prescription && record.prescription.dialysis_dialyszers
                         ? record.prescription.dialysis_dialyszers : "/"
                     }}
@@ -343,8 +343,8 @@
                 <div style="flex: 1;">
                   灌流器
                   <span class="under-line" style="display: inline-block;width: 50%;">
-                    {{  record.prescription && record.prescription.dialysis_irrigation 
-                      ? record.prescription.dialysis_irrigation : "/" 
+                    {{  record.prescription && record.prescription.dialysis_irrigation
+                      ? record.prescription.dialysis_irrigation : "/"
                     }}
                   </span>
                 </div>
@@ -388,7 +388,7 @@
                 <div style="flex: 1;">
                   穿刺针
                   <span class="under-line" style="display: inline-block;width: 50%;">
-                    {{ record.assessment_before_dislysis && record.assessment_before_dislysis.puncture_needle 
+                    {{ record.assessment_before_dislysis && record.assessment_before_dislysis.puncture_needle
                       ? record.assessment_before_dislysis.puncture_needle : "/" }}
                   </span>
                 </div>
@@ -523,7 +523,7 @@
                       {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "/" }}
                     </span>
                   </td>
-        
+
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}
@@ -540,7 +540,7 @@
                       {{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}
                     </span>
                   </td>
-        
+
                   <td>
                     <span v-if="getTime(monitor.operate_time) != ''">
                       {{
@@ -718,8 +718,8 @@
                     <div style="flex:1">
                       医师签名
                       <div class="under-line" style="display: inline-block;width: 50%;">
-                        <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">{{getAdminUser(record.prescription, 'prescription_doctor')}}</span>
-                        <img class="es-img" :src="setAdminUserES(record.prescription, 'prescription_doctor')" alt="" srcset="" v-else style="height: 30px;">
+                        <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
+                        <img class="es-img" :src="setAdminUserES(record.prescription, 'creater')" alt="" srcset="" v-else style="height: 30px;">
                       </div>
                     </div>
                     <div style="flex:1">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -444,7 +444,7 @@
           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >批量打印71</el-button>
+          >批量打印</el-button>
       </template>
       <template v-if="this.template_id == 72">
         <el-button
@@ -455,6 +455,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 73">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -2218,6 +2227,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/seventyone" });
       }else if (this.template_id == 72) {
         this.$router.push({ path: "/dialysis/print/batch/seventytwo" });
+      }else if (this.template_id == 73) {
+        this.$router.push({ path: "/dialysis/print/batch/seventythree" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/NavIgation.vue

@@ -603,18 +603,6 @@ export default {
         return [item.groupno];
       });
 
-
-      // var strLength = 0
-      // var arr = []
-      // if(this.his_doctor_advices!=undefined && this.his_doctor_advices.length > 0){
-      //   for(let i=0;i<this.his_doctor_advices.length;i++){
-      //     if (this.his_doctor_advices[i].execution_state == 2) {
-      //      arr.push(this.his_doctor_advices[i]);
-      //    }
-      //   }
-      //   strLength = arr.length
-      // }
-      // console.log("232332323232323223",arrOne.length + strLength);
       return sorted.length
 
     },
@@ -695,7 +683,7 @@ export default {
     },
     showAssessmentBefore: function() {
      
-      console.log("透前评估进入23232323我我哦",this.record_date)
+      // console.log("透前评估进入23232323我我哦",this.record_date)
       this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment,this.record_date);
     },
     showDoubleCheck: function() {

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -98,8 +98,14 @@
           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
-            <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
+            <span v-if="org_id !=10599">
+              {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
+            </span>
+            <span v-if="org_id==10599">
+              <span v-if="scope.row.dialysis_prescription==null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}</span>
+              <span v-if="scope.row.dialysis_prescription!=null"> {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_prescription)}}</span>
+            </span>
+          
             <!-- {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}} -->
           </template>
 

src/xt_pages/dialysis/details/consumable/dialysisGoodPrint.vue

@@ -42,8 +42,14 @@
                 <td>{{item.patient.dialysis_no}}</td>
                 <td v-for="(it,index) in rowList" :key="index">
                   <!-- {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}} -->
-                  <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
-                  <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span>
+                  <span v-if="org_id !=10599">
+                    {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}
+                  </span>
+                  <span v-if="org_id==10599">
+                    <span v-if="item.dialysis_prescription==null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}}</span>
+                     <span v-if="item.dialysis_prescription!=null"> {{getName(item.rowList[index].filed_name_cn,item.dialysis_prescription)}}</span>
+                  </span>
+                
                 </td>
                </tr>
               </tbody>

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

@@ -1255,6 +1255,29 @@
            }
             this.assessmentBeforeDislysis.blood_access_part_opera_id = blood_id
             this.assessmentBeforeDislysis.blood_access_part_id = this.lastAssessment.blood_access_part_id
+            
+            if(this.$store.getters.xt_user.template_info.org_id == 10375  || this.$store.getters.xt_user.template_info.org_id == 10571  || this.$store.getters.xt_user.template_info.org_id == 0){
+              console.log("尽量",last_predialysis_evaluation)
+              console.log("正常",this.assessmentBeforeDislysis.blood_access_part_opera_id)
+              if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
+
+                // var blood_id = 0
+                // console.log("SHJU232323",this.blood_access_part_opera)
+                // for(let i= 0;i<this.blood_access_part_opera.length;i++){
+                //     if(last_predialysis_evaluation.blood_access_part_opera_id == this.blood_access_part_opera[i].id){
+                //       blood_id = this.blood_access_part_opera[i].name
+                //     }
+                // }
+                // console.log("blood_id-----",blood_id)
+                if(last_predialysis_evaluation.blood_access_part_opera_id >0){
+                  this.assessmentBeforeDislysis.blood_access_part_opera_id = last_predialysis_evaluation.blood_access_part_opera_id
+                }
+              
+                this.assessmentBeforeDislysis.blood_access_part_id = last_predialysis_evaluation.blood_access_part_id
+              }
+             
+            }
+
           } else {
             if (this.lastPredialysisEvaluation != null) {
                var blood_id = 0
@@ -1269,11 +1292,14 @@
           }
 
         console.log("hhahhahahah",lastAssessment)
-        if (lastAssessment !=null) {
-          this.assessmentBeforeDislysis.blood_access_part_opera_id = lastAssessment.blood_access_part_opera_id
-          this.assessmentBeforeDislysis.blood_access_part_id = lastAssessment.blood_access_part_id
+        console.log("旭哥通路---",this.assessmentBeforeDislysis.blood_access_part_opera_id)
+        // if (lastAssessment !=null) {
+        //   this.assessmentBeforeDislysis.blood_access_part_opera_id = lastAssessment.blood_access_part_opera_id
+        //   this.assessmentBeforeDislysis.blood_access_part_id = lastAssessment.blood_access_part_id
            
-        }
+        // }
+
+        
 
         } else {
           console.log("为首务2322323",this.assessmentBeforeDislysis.period)

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -904,6 +904,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 73">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1391,6 +1403,11 @@
           >
           </DialysisPrintOrderSeventyTwo>
 
+          <DialysisPrintOrderSeventythree
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 73"
+          ></DialysisPrintOrderSeventythree>
+
           <DialysisPrintOrderZero
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 199"
@@ -1487,6 +1504,7 @@ import DialysisPrintOrderSixtynine from './template/DialysisPrintOrderSixtynine'
 import DialysisPrintOrderSeventy from './template/DialysisPrintOrderSeventy'
 import DialysisPrintOrderseventyone from './template/DialysisPrintOrderseventyone'
 import DialysisPrintOrderSeventyTwo from './template/DialysisPrintOrderSeventyTwo'
+import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventythree'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1563,6 +1581,7 @@ export default {
     DialysisPrintOrderSeventy,
     DialysisPrintOrderseventyone,
     DialysisPrintOrderSeventyTwo,
+    DialysisPrintOrderSeventythree,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2225,6 +2244,14 @@ export default {
           style: style,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 73 ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+        console.log('77777',this.org_template_info.template_id);
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -7,7 +7,7 @@
             <el-table-column align="center" width="50" label="序号">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.groupno" placeholder=""></el-input>
+                        <el-input v-model="scope.row.groupno" placeholder=""  @input="getAllIndex(scope.row)"></el-input>
                     </div>
                 </template>
             </el-table-column>
@@ -682,6 +682,11 @@
           { name: '每六小时一次', count: 4 },
           { name: '每八小时一次', count: 3 }
         ]
+        if(this.efs!=null && this.efs.length >0){
+          for(let i=0;i<this.efs.length;i++){
+             arr.push(this.efs[i])
+          }
+       }
         let num = ''
         arr.map(item => {
           if (item.name == execution_frequency) {
@@ -693,6 +698,37 @@
         }
         return num
       },
+      getAllIndex(val){
+        console.log("val",val)
+        console.log("prescription.advices",this.prescription.advices)
+        var obj = {id:0,day:"",delivery_way:"",execution_frequency:""}
+        if(this.prescription.advices!=null && this.prescription.advices.length>0){
+           for(let i=0;i<this.prescription.advices.length;i++){
+            console.log("this.prescription.advices[i].groupno",this.prescription.advices[i].groupno)
+            if(parseInt(val.groupno) == parseInt(this.prescription.advices[i].groupno) && parseInt(val.id)!= parseInt(this.prescription.advices[i].id)){
+              console.log("this.prescription.advices[i]",this.prescription.advices[i])
+               obj.id = val.id
+               obj.day = this.prescription.advices[i].day
+               obj.delivery_way = this.prescription.advices[i].delivery_way
+               obj.execution_frequency = this.prescription.advices[i].execution_frequency
+               console.log("-----------------",obj)
+             }
+           }
+        }
+        console.log("-----------------",obj)
+
+        if(this.prescription.advices!=null && this.prescription.advices.length>0){
+           for(let i=0;i<this.prescription.advices.length;i++){
+            if(this.prescription.advices[i].id == parseInt(val.id)){
+              console.log("进啦")
+              this.prescription.advices[i].delivery_way = obj.delivery_way
+              this.prescription.advices[i].execution_frequency =obj.execution_frequency
+              this.prescription.advices[i].day = obj.day
+             }
+           }
+        }
+        console.log("hahhhahdhha",this.prescription.advices)
+      },
     }, mounted() {
       this.getInitData()
 

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:{