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

src/api/patient.js

@@ -276,13 +276,11 @@ export function code(id) {
   })
 }
 
-export function GetCoursePrintData(id) {
+export function GetCoursePrintData(params) {
   return request({
     url: '/api/print/course',
     method: 'Get',
-    params: {
-      id: id
-    }
+    params: params
   })
 }
 
@@ -552,11 +550,11 @@ export function deleteSummary(params) {
   })
 }
 
-export function createHospitalSummary(params) {
+export function createHospitalSummary(data) {
   return request({
     url: '/api/patient/hospitalsummary',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: data
   })
 }
 
@@ -576,11 +574,11 @@ export function getHospitalSummaryDetail(id, params) {
   })
 }
 
-export function updateHospitalSummary(params) {
+export function updateHospitalSummary(data) {
   return request({
     url: '/api/patient/updatehospitalsummary',
-    method: 'get',
-    params: params
+    method: 'post',
+    data: data
   })
 }
 

src/xt_pages/data/components/addDrugs.vue

@@ -654,7 +654,7 @@
       },
       comfirm: function(formName) {
         this.$refs[formName].validate((valid) => {
-          // console.log(valid)
+           console.log(valid)
           if (valid) {
             this.$emit('dialog-comfirm', this.getValue())
           }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -723,7 +723,7 @@ export default {
           this.total = response.data.data.total;
           // console.log(response.data.data)
           for (let i = 0; i < response.data.data.schedule.length; i++) {
-            if (response.data.data.schedule[i].patient.id > 0) {
+            if (response.data.data.schedule[i].patient&&response.data.data.schedule[i].patient.id > 0) {
               const SchedualPatientsTable = {
                 bp: []
               };
@@ -760,11 +760,8 @@ export default {
               }
 
               SchedualPatientsTable.bp = [];
-              for (
-                let a = 0;
-                a < response.data.data.schedule[i].monitoring_record.length;
-                a++
-              ) {
+              if(response.data.data.schedule[i].monitoring_record && response.data.data.schedule[i].monitoring_record.length > 0){
+                for (let a = 0;a < response.data.data.schedule[i].monitoring_record.length;a++) {
                 const bp = {};
                 bp["value"] =
                   response.data.data.schedule[i].monitoring_record[
@@ -775,8 +772,10 @@ export default {
                     a
                   ].diastolic_blood_pressure.toString();
 
-                SchedualPatientsTable.bp.push(bp);
+                 SchedualPatientsTable.bp.push(bp);
+               }
               }
+             
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
               console.log("中国222222",this.SchedualPatientsTableData)

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

@@ -512,7 +512,7 @@
             align="center"
             label="KT/V"
             width="140"
-            v-if="isShow('KT/V') && org_id == 9987"
+            v-if="isShow('KT/V') && (org_id == 9987 || org_id ==10215) "
           >
            <template slot-scope="scope">
               {{ scope.row.ktv ? scope.row.ktv : ""  }}

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -38,7 +38,7 @@
           <th v-if="isShow('血压监测')" width="92px">血压监测</th>
           <!-- <th v-if="isShow('血压监测部位')" width="92px">血压监测部位</th>
           <th v-if="isShow('并发症')" width="92px">并发症</th> -->
-          <th v-if="isShow('KT/V') && org_id == 9987" width="92px">KT/V</th>
+          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215)" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -85,7 +85,7 @@
           <th v-if="isShow('尿素监测')" width="92px">{{monitor.urea_monitoring ? monitor.urea_monitoring : ""}}</th>
           <th v-if="isShow('血浓量')" width="92px">{{monitor.blood_thickness ? monitor.blood_thickness : ""}}</th>
           <th v-if="isShow('血压监测')" width="92px">{{monitor.blood_monitor ? monitor.blood_monitor : ""}}</th>
-          <td v-if="isShow('KT/V') && org_id == 9987">{{ monitor.ktv?monitor.ktv:""}}</td>
+          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>
           <td v-if="isShow('结果')">{{ monitor.result }}</td>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -667,12 +667,15 @@
         }
       },
       setMonthPrescription(month_prescriptions) {
+        console.log("~~~~~~~~")
         this.month_prescriptions = []
 
         let drug_month_prescriptions = {
           advices: []
         }
         let drug_ids = []
+        let drug_ids2 = []
+
         let project_month_prescriptions = {
           project: []
 
@@ -693,6 +696,9 @@
                 price: month_prescriptions[i].advices[a].price
 
               }
+              if(month_prescriptions[i].advices[a].drug_id == 1280){
+                drug_ids2.push(obj)
+              }
               drug_ids.push(obj)
               drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
             }
@@ -726,18 +732,10 @@
         const obj1 = {}
         const obj2 = {}
 
-        drug_ids = drug_ids.reduce((cur, next) => {
-          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        project_ids = project_ids.reduce((cur, next) => {
-          obj1[next.price] ? '' : obj1[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        additions_ids = additions_ids.reduce((cur, next) => {
-          obj2[next.price] ? '' : obj2[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+        drug_ids = this.unique(drug_ids)
+        project_ids = this.unique(project_ids)
+        additions_ids = this.unique(additions_ids)
+
 
         let drugs = []
         let projects = []
@@ -747,7 +745,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
-            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
+            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id ==  drug_month_prescriptions.advices[a].drug_id) {
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
@@ -775,7 +773,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-            if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
 
               if (project_month_prescriptions.project[a].type == 2) {
                 obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
@@ -3194,7 +3192,6 @@
         if (this.dayorMonth == 'day') {
           this.$emit('day')
         } else if (this.dayorMonth == 'month') {
-          console.log('~~~~~~')
           let form = {
             id: this.patientInfo.id,
             his_patient_id: this.hisPatientInfo.id
@@ -3213,7 +3210,22 @@
       },
       clearSelection() {
         this.$refs.tabProjectTeam.clearSelection()
-      }
+      },unique(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      },
     },
     mounted() {
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -318,6 +318,7 @@
     },
     data() {
       return {
+        current_data:null,
         drugs: [],
         allDrugs: [],
         advices_template: [],
@@ -598,6 +599,7 @@
             this.admin_info = response.data.data.info
 
             if (this.patientTableData.length > 0) {
+              this.current_data = this.patientTableData[0]
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
               this.oldCurrentRow = this.patientTableData[0]
               this.getPatientInfo(this.patientTableData[0])
@@ -703,18 +705,10 @@
         const obj1 = {}
         const obj2 = {}
 
-        drug_ids = drug_ids.reduce((cur, next) => {
-          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        project_ids = project_ids.reduce((cur, next) => {
-          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        additions_ids = additions_ids.reduce((cur, next) => {
-          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+        drug_ids = this.unique(drug_ids)
+        project_ids = this.unique(project_ids)
+        additions_ids = this.unique(additions_ids)
+
 
         let drugs = []
         let projects = []
@@ -724,7 +718,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
-            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
+            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id ==  drug_month_prescriptions.advices[a].drug_id) {
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
@@ -751,7 +745,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-            if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
               if (project_month_prescriptions.project[a].type == 2) {
                 obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
@@ -1038,6 +1032,7 @@
             this.admin_info = response.data.data.info
 
             if (this.patientTableData.length > 0) {
+              this.current_data = this.patientTableData[0]
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
               this.oldCurrentRow = this.patientTableData[0]
               this.getPatientInfo(this.patientTableData[0])
@@ -1419,9 +1414,25 @@
           }
         })
 
+      },unique(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
       },
 
       choosePatient(val) {
+        this.current_data = val
         if (this.titleType == '电子病历') {
 
           if (this.$refs.child.watchSign > 2) {
@@ -4010,6 +4021,7 @@
         }
       }, changeDay() {
         this.current_tab = 'day'
+        this.getPatientInfo(this.current_data)
 
       }, changeMonth(val) {
         this.current_tab = 'month'

src/xt_pages/user/courseOfDisease.vue

@@ -218,7 +218,9 @@
         selectingRows: [],
         table_current_index: -1,
         edit_current_id: 0,
-        edit_title: ''
+        edit_title: '',
+        ids:"",
+        idArr:[],
       }
     },
     created() {
@@ -366,6 +368,14 @@
       },
 
       didSelectionChange: function(selectRows) {
+       
+        var arr = []
+        for(let i=0;i<selectRows.length;i++){
+           arr.push(selectRows[i].id)
+        }
+        var newArr = arr.join(',') 
+        this.ids = newArr
+        console.log("select23322332",this.ids)
         this.selectingRows = selectRows
       },
       deleteAction: function() {
@@ -422,12 +432,17 @@
         row.index = rowIndex
       }, onRowClick(row, event, column) {
         this.table_current_index = row.index
-      },print(){
-        if (this.table_current_index == -1) {
+      },
+      print(){
+        // if (this.table_current_index == -1) {
+        //   this.$message.error('请选择要打印的病程')
+        //   return
+        // }
+        if(this.ids.length == 0){
           this.$message.error('请选择要打印的病程')
           return
         }
-        this.$router.push({ path: "/course/print?id="+this.records[this.table_current_index].id});
+        this.$router.push({ path: "/course/print?ids="+this.ids+"&patient_id="+this.patient_id});
       }
     }
   }

src/xt_pages/user/coursePrint.vue

@@ -24,35 +24,39 @@
             </div>
 
             <div style="flex:1;text-align: center;">
-              床位：
-              <div  style="width: 120px;text-align: left;display:inline-block;">{{patient.DialysisSchedule&&patient.DialysisSchedule.device_number?patient.DialysisSchedule.device_number.number:''}}</div>
+              透析号：
+                <div  style="width: 120px;text-align: left;display:inline-block;">
+                  {{patient.dialysis_no?patient.dialysis_no:"/"}}
+                </div>
             </div>
 
             <div  style="flex:1;text-align: center;">
               住院号：
-              <div style="width: 100px;text-align: left;display:inline-block;" v-if="patient.admission_number">
-                {{patient.admission_number}}
-              </div>
-              <div style="width: 100px;;display:inline-block;" v-else>
-                {{'/'}}
+              <div style="width: 100px;text-align: left;display:inline-block;">
+                 {{patient.admission_number?patient.admission_number:"/"}}
               </div>
+           
             </div>
 
           </div>
-          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;">
+          <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;" v-for="(item,index) in this.record" :key="index">
             <div class="inline_block">
-              <div>{{getTime(record.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
+              <div>{{getTime(item.record_time,'{y}-{m}-{d} {h}:{i}')}}</div>
             </div>
             <div class="inline_block" style="margin-left: 30px">
-              <div>{{record.title}}</div>
+              <div>{{item.title}}</div>
+            </div>
+
+             <div class="inline_block" style="width:100%;">
+              <div v-html="item.content" class="printP">{{item.content}}</div>
             </div>
           </div>
 
-          <div class="row" style="padding: 2px 0;line-height:24px;">
+          <!-- <div class="row" style="padding: 2px 0;line-height:24px;">
             <div class="inline_block" style="width:100%;">
-              <div v-html="record.content" class="printP">{{record.content}}</div>
+              <div v-html="item.content" class="printP">{{item.content}}</div>
             </div>
-          </div>
+          </div> -->
 
         </div>
       </div>
@@ -81,7 +85,7 @@
 
         loading: false,
         orgname: '',
-        record: {},
+        record:[],
         patient: {}
       }
     },
@@ -92,16 +96,22 @@
     },
     mounted() {
       this.loading = true
-      var id = this.$route.query.id
-      if (id == 0) {
-        this.$router.back(-1)
-        return
+      var ids = this.$route.query.ids
+      var patient_id = parseInt(this.$route.query.patient_id)
+      var params = {
+          ids:ids,
+          patient_id:patient_id,
       }
-      GetCoursePrintData(id).then(rs => {
+      console.log("para2333223233223",params)
+      GetCoursePrintData(params).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           this.record = resp.data.record
-          this.record.content = resp.data.record.content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
+          console.log("h2232323223",this.record)
+          // for(let i=0;i<this.record.length;i++){
+          //   this.record[i].content = this.record[i].content.replace(new RegExp('<p>','g'),"<div>").replace(new RegExp('</p>','g'),"</div>")
+          // }
+          console.log("h2232323223",this.record)
           this.patient = resp.data.patient
 
           this.loading = false

src/xt_pages/user/hospitalSummary.vue

@@ -7,7 +7,7 @@
         <div>
                     <span style="margin-left: 10px;float:right;">
                         <el-button type="primary" icon="el-icon-circle-plus-outline" size="small"
-                                   @click="show_dialog = true">新增</el-button>
+                                   @click="addAction">新增</el-button>
 
                         <el-button type="primary" icon="el-icon-edit-outline" size="small"
                                    @click="toEdit">修改</el-button>
@@ -77,7 +77,7 @@
                    {{getDoctor(hosDetail.doctor)}}
                 </div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">记录日期:
-                  <span v-if="hosDetail.record_time > 0">{{getTime(hosDetail.record_time)}}</span> 
+                  <span v-if="hosDetail.record_date > 0">{{getTime(hosDetail.record_date)}}</span> 
                 </div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">病案号:
                    {{hosDetail.sick_personnel}}
@@ -98,22 +98,22 @@
                    {{hosDetail.pathology}}
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">入院诊断:
-                   {{hosDetail.admitting_diagnosis}}
+                   <span v-html="hosDetail.admitting_diagnosis"></span> 
                  </div>
                   <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院诊断:
-                   {{hosDetail.discharge_diagnosis}}
+                   <span v-html="hosDetail.discharge_diagnosis"></span>
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">入院时病情:
-                   {{hosDetail.diagnosis_admission}}
+                   <span v-html="hosDetail.diagnosis_admission"></span>
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">诊断经过:
-                   {{hosDetail.treatment}}
+                   <span v-html="hosDetail.treatment"></span> 
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院时病情:
-                   {{hosDetail.illness_discharge}}
+                   <span v-html="hosDetail.illness_discharge"></span> 
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">出院医嘱:
-                   {{hosDetail.discharge_advice}}
+                    <span v-html="hosDetail.discharge_advice"></span>
                  </div>
                
               </div>
@@ -442,8 +442,8 @@
 
                 <div class="textarea_panel">
                     <keep-alive>
-                      <editor ref="editorEight"
-                              id="editorEight"
+                      <editor ref="editorSixty"
+                              id="editorSixty"
                               style="width: 800px"
                               v-bind:r_content="form.diagnosis_admission">
                       </editor>
@@ -479,8 +479,8 @@
 
                <div class="textarea_panel">
                     <keep-alive>
-                      <editor ref="editorElement"
-                              id="editorElement"
+                      <editor ref="editorThirty"
+                              id="editorThirty"
                               style="width: 800px"
                               v-bind:r_content="form.illness_discharge">
                       </editor>
@@ -583,8 +583,8 @@
         form:{
           id:0,
           title:"",
-          admission_time:new Date(),
-          discharge_time:new Date(),
+          admission_time:this.getTime(new Date()),
+          discharge_time:this.getTime(new Date()),
           sick_personnel:"",
           xray:"",
           admitting_diagnosis_id:"",
@@ -599,7 +599,7 @@
           illness_discharge:"",
           dean:"",
           doctor:"",
-          record_date:new Date(),
+          record_date:this.getTime(new Date()),
           discharge_advice_id:"",
           discharge_advice:"",
           connecticut:"",
@@ -612,13 +612,14 @@
        docList:[],
        doctorList:[],
        hosDetail:{},
+       ids:"",
       }
     },
     created() {
      
-     
+ 
       this.patient_id = this.$route.params && this.$route.params.id
-      console.log("患者2332323",this.patient_id)
+      console.log("患者2332323",this.$store.getters.configlist.admitting_diagnosis)
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
@@ -673,61 +674,140 @@
 
        },
       changeCurrentRecordTwo(row){
-        this.form.id = row.id 
-        this.getHospitalSummaryDetail(row.id)
+       
+        this.form.id = 0
+        if(row!=null){
+          this.form.id = row.id 
+          this.getHospitalSummaryDetail(row.id)
+        }
       },
       selectSummary(row){
-       console.log("row322323",row)
+        var arr = []
+        for(let i=0;i<row.length;i++){
+          arr.push(row[i].id)
+        }
+       var ids = arr.join(",")
+       this.ids = ids
       },
       changeAmittDiagnosis(content){
+        
         this.form.admitting_diagnosis = content
       },
       changeDischargeDiagnosis(content){
+       
          this.form.discharge_diagnosis = content
       },
       changeDiagnosisAdmission(content){
+      
        this.form.diagnosis_admission = content
       },
       changeTreatment(content){
+       
         this.form.treatment = content
       },
       changeillnessDisCharge(content){
+      
         this.form.illness_discharge = content
       },
       changeDischargeAdvice(content){
+      
         this.form.discharge_advice = content
       },
       createAction(){
+         console.log("hh23h",this.templates)
+         var admitting_diagnosis_id = ""
+         var discharge_diagnosis_id = ""
+         var diagnosis_admission_id = ""
+         var treatment_id = ""
+         var illness_discharge_id=""
+         var discharge_advice_id= ""
+         
+         if(this.templates!=undefined){
+            for(let i=0;i<this.templates.length;i++){
+            if(this.form.admitting_diagnosis_id == this.templates[i].content){
+            
+                admitting_diagnosis_id = this.templates[i].title
+              }
+          }
+         }
+       
+         if(this.templatesOne!=undefined){
+          for(let i=0;i<this.templatesOne.length;i++){
+           if(this.form.discharge_diagnosis_id == this.templatesOne[i].content){
+              discharge_diagnosis_id = this.templatesOne[i].title
+            }
+          }
+         }
          
+         if(this.templatesTwo!=undefined){
+          for(let i=0;i<this.templatesTwo.length;i++){
+            if(this.form.diagnosis_admission_id == this.templatesTwo[i].content){
+                diagnosis_admission_id = this.templatesTwo[i].title
+              }
+          }
+         }
+        
+        if(this.templatesThree!=undefined){
+         for(let i=0;i<this.templatesThree.length;i++){
+           if(this.form.treatment_id == this.templatesThree[i].content){
+              treatment_id = this.templatesThree[i].title
+            }
+         }
+        }
+        
+        if(this.templatesFour!=undefined){
+          for(let i=0;i<this.templatesFour.length;i++){
+           if(this.form.illness_discharge_id == this.templatesFour[i].content){
+              illness_discharge_id = this.templatesFour[i].title
+            }
+         }
+        }
+         
+        if(this.templatesFive!=undefined){
+         for(let i=0;i<this.templatesFive.length;i++){
+           if(this.form.discharge_advice_id == this.templatesFive[i].content){
+              discharge_advice_id = this.templatesFive[i].title
+            }
+         }
+        }
+
+       
+         if(this.form.doctor == ""){
+            this.form.doctor = 0
+         }
+         if(this.form.dean == ""){
+           this.form.dean = 0
+         }
+         console.log("hhj232322323",this.form.admitting_diagnosis_id)
          var params = {
           patient_id:parseInt(this.patient_id),
           title:this.form.title,
-          admission_time:this.getTime(this.form.admission_time),
-          discharge_time:this.getTime(this.form.discharge_time),
+          admission_time:this.form.admission_time,
+          discharge_time:this.form.discharge_time,
           sick_personnel:this.form.sick_personnel,
           xray:this.form.xray,
-          admitting_diagnosis_id:this.form.admitting_diagnosis_id,
-          admitting_diagnosis:this.form.admitting_diagnosis,
-          discharge_diagnosis:this.form.discharge_diagnosis,
-          discharge_diagnosis_id:this.form.discharge_diagnosis_id,
-          diagnosis_admission_id:this.form.diagnosis_admission_id,
-          diagnosis_admission:this.form.diagnosis_admission,
-          illness_discharge:this.form.illness_discharge,
-          illness_discharge_id:this.form.illness_discharge_id,
-          discharge_advice_id:this.form.discharge_advice_id,
-          discharge_advice:this.form.discharge_advice,
-          treatment_id:this.form.treatment_id,
-          treatment:this.form.treatment,
+          admitting_diagnosis_id:admitting_diagnosis_id,
+          admitting_diagnosis:this.$refs.editor.content,
+          discharge_diagnosis:this.$refs.editorOne.content,
+          discharge_diagnosis_id:discharge_diagnosis_id,
+          diagnosis_admission_id:diagnosis_admission_id,
+          diagnosis_admission:this.$refs.editorTwo.content,
+          illness_discharge:this.$refs.editorFive.content,
+          illness_discharge_id:illness_discharge_id,
+          discharge_advice_id:discharge_advice_id,
+          discharge_advice:this.$refs.editorSix.content,
+          treatment_id:treatment_id,
+          treatment:this.$refs.editorFour.content,
           dean:this.form.dean,
           doctor:this.form.doctor,
-          record_date:this.getTime(this.form.record_date),
+          record_date:this.form.record_date,
           connecticut:this.form.connecticut,
           nuclear_magnetic_resonance:this.form.nuclear_magnetic_resonance,
           ultrasound:this.form.ultrasound,
           pathology:this.form.pathology,
          }
          console.log("oaram2322323",params)
-         
+        
          createHospitalSummary(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
@@ -800,6 +880,7 @@
         getHospitalSummaryDetail(id).then(response=>{
            if(response.data.state == 1){
              var detail = response.data.data.detail
+            
              this.hosDetail = detail
            }
         })
@@ -808,6 +889,13 @@
         getHospitalSummaryDetail(id).then(response=>{
            if(response.data.state == 1){
              var detail = response.data.data.detail
+             console.log("detial323232232323322323",detail)
+             if(detail.doctor == 0){
+               this.form.doctor = ""
+             }
+             if(detail.dean == 0){
+               this.form.dean = ""
+             }
              this.form.id = detail.id
              this.form.title = detail.title
              this.form.patient_id = detail.patient_id
@@ -831,11 +919,10 @@
              this.form.illness_discharge = detail.illness_discharge
              this.form.discharge_advice_id = detail.discharge_advice_id
              this.form.discharge_advice = detail.discharge_advice
-             this.form.record_time = detail.record_time
+             this.form.record_time = this.getTime(detail.record_time)
+             this.form.record_date = this.getTime(detail.record_date)
              this.form.dean = detail.dean_id
              this.form.doctor = detail.doctor
-             this.form.record_date = detail.record_date
-             this.hosDetail = detail
              this.edit_show_dialog = true
            }
         })
@@ -844,7 +931,70 @@
         this.getHospitalSummaryDetailOne(this.form.id)
       },
       updateAction(){
-         console.log("hhhahdf2332332",this.form.admission_time)
+         var admitting_diagnosis_id = this.form.admitting_diagnosis_id
+         var discharge_diagnosis_id = this.form.discharge_diagnosis_id
+         var diagnosis_admission_id = this.form.diagnosis_admission_id
+         var treatment_id = this.form.treatment_id
+         var illness_discharge_id= this.form.illness_discharge_id
+         var discharge_advice_id= this.form.discharge_advice_id
+
+         if(this.templates!=undefined){
+            for(let i=0;i<this.templates.length;i++){
+            if(this.form.admitting_diagnosis_id == this.templates[i].content){
+            
+                admitting_diagnosis_id = this.templates[i].title
+              }
+          }
+         }
+        
+         if(this.templatesOne!=undefined){
+          for(let i=0;i<this.templatesOne.length;i++){
+           if(this.form.discharge_diagnosis_id == this.templatesOne[i].content){
+              discharge_diagnosis_id = this.templatesOne[i].title
+            }
+          }
+         }
+
+         if(this.templatesTwo!=undefined){
+          for(let i=0;i<this.templatesTwo.length;i++){
+            if(this.form.diagnosis_admission_id == this.templatesTwo[i].content){
+                diagnosis_admission_id = this.templatesTwo[i].title
+              }
+          }
+         }
+        
+        if(this.templatesThree!=undefined){
+           for(let i=0;i<this.templatesThree.length;i++){
+           if(this.form.treatment_id == this.templatesThree[i].content){
+              treatment_id = this.templatesThree[i].title
+            }
+         }
+        }
+      
+        if(this.templatesFour!=undefined){
+            for(let i=0;i<this.templatesFour.length;i++){
+           if(this.form.illness_discharge_id == this.templatesFour[i].content){
+              illness_discharge_id = this.templatesFour[i].title
+            }
+         }
+        }
+
+       if(this.templatesFive!=undefined){
+         for(let i=0;i<this.templatesFive.length;i++){
+           if(this.form.discharge_advice_id == this.templatesFive[i].content){
+              discharge_advice_id = this.templatesFive[i].title
+            }
+         }
+       }
+       
+
+      
+        if(this.form.doctor == ""){
+            this.form.doctor = 0
+         }
+         if(this.form.dean == ""){
+           this.form.dean = 0
+         }
          var params = {
           id:this.form.id,
           patient_id:parseInt(this.patient_id),
@@ -853,18 +1003,18 @@
           discharge_time:this.form.discharge_time,
           sick_personnel:this.form.sick_personnel,
           xray:this.form.xray,
-          admitting_diagnosis_id:this.form.admitting_diagnosis_id,
-          admitting_diagnosis:this.form.admitting_diagnosis,
-          discharge_diagnosis:this.form.discharge_diagnosis,
-          discharge_diagnosis_id:this.form.discharge_diagnosis_id,
-          diagnosis_admission_id:this.form.diagnosis_admission_id,
-          diagnosis_admission:this.form.diagnosis_admission,
-          illness_discharge:this.form.illness_discharge,
-          illness_discharge_id:this.form.illness_discharge_id,
-          discharge_advice_id:this.form.discharge_advice_id,
-          discharge_advice:this.form.discharge_advice,
-          treatment_id:this.form.treatment_id,
-          treatment:this.form.treatment,
+          admitting_diagnosis_id:admitting_diagnosis_id,
+          admitting_diagnosis:this.$refs.editorTen.content,
+          discharge_diagnosis:this.$refs.editorSeven.content,
+          discharge_diagnosis_id:discharge_diagnosis_id,
+          diagnosis_admission_id:diagnosis_admission_id,
+          diagnosis_admission:this.$refs.editorSixty.content,
+          illness_discharge:this.$refs.editorThirty.content,
+          illness_discharge_id:illness_discharge_id,
+          discharge_advice_id:discharge_advice_id,
+          discharge_advice:this.$refs.editorTwelve.content,
+          treatment_id:treatment_id,
+          treatment:this.$refs.editorNight.content,
           dean:this.form.dean,
           doctor:this.form.doctor,
           record_date:this.getTime(this.form.record_date),
@@ -872,30 +1022,36 @@
           nuclear_magnetic_resonance:this.form.nuclear_magnetic_resonance,
           ultrasound:this.form.ultrasound,
           pathology:this.form.pathology,
+          record_date:this.form.record_date,
          }
-        console.log("param2332233223232323",params)
-     
+        console.log("比你强2332322323232",params)
+        
         updateHospitalSummary(params).then(response=>{
           if(response.data.state == 1){
             var detail = response.data.data.detail
             this.edit_show_dialog = false
+            // this.$refs.monthlyPlanTable.setCurrentRow(detail)
             this.getlist()
           }
         }) 
       },
-      deleteAction(id,index){
+      deleteAction(){
+          if(this.ids.length == 0){
+            this.$message.error("请勾选需要删除的数据")
+            return false
+          }
           this.$confirm('确认删除吗?', '删除', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
             type: 'warning'
          }).then(() => {
             var params = {
-              id:this.form.id,
+              ids:this.ids,
             }
             deleteHospitalSummary(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg
-                  this.tableData.splice(index, 1);
+                  this.getlist()
                   this.$message.success("删除成功")
               } else {
                   this.$message.error("删除失败")
@@ -903,6 +1059,32 @@
             })
           }).catch(() => {
           }) 
+      },
+      addAction(){
+        this.form.title = ""
+        this.form.sick_personnel = ""
+        this.form.xray = ""
+        this.form.admitting_diagnosis = ""
+        this.form.discharge_diagnosis = ""
+        this.form.diagnosis_admission = ""
+        this.form.illness_discharge = ""
+        this.form.discharge_advice = ""
+        this.form.treatment = ""
+        this.form.connecticut = ""
+        this.form.nuclear_magnetic_resonance = ""
+        this.form.ultrasound = ""
+        this.form.pathology = ""
+        this.form.admitting_diagnosis_id = ""
+        this.form.discharge_diagnosis_id = ""
+        this.form.illness_discharge_id = ""
+        this.form.discharge_advice_id  =""
+        this.form.treatment_id = "" 
+        this.form.dean = ""
+        this.form.doctor = ""
+        this.form.admission_time = this.getTime(new Date())
+        this.form.admission_time = this.getTime(new Date()),
+        this.form.discharge_time = this.getTime(new Date()),
+        this.show_dialog = true
       }
     },
     watch: {

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -7,200 +7,197 @@
     <div class="dialysis-print-order">
       <div class="order-yy-name"></div>
       <div class="order-title">{{ orgname }}出院小结</div>
+      <div style="margin-float:right">病案号:{{hosDetail.sick_personnel}}</div>
       <div>
         <table class="print-table" border="1" style="margin-top: 10px;">
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               姓名:
             </td>
-             <td style="text-align:center;width:170px" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{patient.name}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               性别:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 <span v-if="patient.gender == 1">男</span>
                 <span v-if="patient.gender == 2">女</span>
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               年龄:
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                 {{getNewAge(patient.id_card_no)}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               婚姻:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                 <span v-if="patient.marital_status == 0">未婚</span>
+                 <span v-if="patient.marital_status == 1">已婚</span>
+                 <span v-if="patient.marital_status == 2">未婚</span>
+                 <span v-if="patient.marital_status == 3">离异</span>
+                 <span v-if="patient.marital_status == 4">丧偶</span>
               </span>
             </td>
-             <td style="text-align:center;" colspan="1">
-              职业:
+             <td style="text-align:center;width:50px" colspan="1">
+              职业: 
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+               {{getProfession(patient.profession)?getProfession(patient.profession):''}}
               </span>
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               电话:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{patient.phone}}
               </span>
             </td>
           </tr>
+
           <tr>
             <td style="text-align:center;" colspan="1">
-              入院时间:
+              住址:
             </td>   
             <td style="text-align:center;" colspan="11">
             
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{patient.home_address}}
               </span>
             </td>   
           </tr>
           <tr>
+            <td style="text-align:center;width:170px" colspan="1">
+              入院时间:
+            </td>
             <td style="text-align:center;width:170px" colspan="2">
+              <span style="display:inline-block;margin-left:10px;">
+                {{getTime(hosDetail.admission_time)}}
+              </span>
+            </td>
+            <td style="text-align:center;width:100px" colspan="2">
               出院时间:
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:100px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{getTime(hosDetail.discharge_time)}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="2">
+            <td style="text-align:center;width:100px"  colspan="1">
               住院天数:
             </td>
-            <td style="text-align:center;" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-              
+               {{getTimeDay(hosDetail.admission_time,hosDetail.discharge_time)}}
+               
               </span>
             </td>
-            <td style="text-align:center;" colspan="2">
+            <td style="text-align:center;width:50px" colspan="2">
               转归:
             
             </td>
-            <td style="text-align:center;" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                <span v-if="patient.lapseto == 1">留治</span>
+                <span v-if="patient.lapseto == 2">转归</span>
               </span>
             </td>
             
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               检查号:
             </td>
-             <td style="text-align:center;" colspan="1">
-              <span style="display:inline-block;margin-left:10px;">
-              
-              </span>
-            </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="2">
               X线:
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-              
+                {{hosDetail.xray}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               CT:
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{hosDetail.connecticut}}
               </span>
             </td>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:50px" colspan="1">
               MRI:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{hosDetail.nuclear_magnetic_resonance}}
               </span>
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               超声:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{hosDetail.ultrasound}}
               </span>
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               病理:
             </td>
-             <td style="text-align:center;" colspan="1">
+             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{hosDetail.pathology}}
               </span>
             </td>
           </tr>
           <tr>
             <td style="text-align:center;" colspan="1">
-              入院时间:
+              入院诊断:
               <span style="display:inline-block;margin-left:10px;">
                
               </span>
             </td>   
             <td style="text-align:center;" colspan="11">
               <span style="display:inline-block;margin-left:10px;">
-               
+                <span v-html="hosDetail.admitting_diagnosis"></span>
               </span>
             </td>   
           </tr>
           <tr>
             <td style="text-align:center;width:170px" colspan="1">
-              入院诊断:
-              <span style="display:inline-block;margin-left:10px;">
-               
-              </span>
+              出院诊断:
             </td>
              <td style="text-align:center;width:170px" colspan="11">
-              入院诊断:
+             
               <span style="display:inline-block;margin-left:10px;">
-               
+               <span v-html="hosDetail.discharge_diagnosis"></span>  
               </span>
             </td>
             
           </tr>
            <tr>
             <td style="text-align:center;width:170px" colspan="1">
-              出院诊断:
+              入院时病情:
             </td>
            <td style="text-align:center;width:170px" colspan="11">
             
               <span style="display:inline-block;margin-left:10px;">
-               
-              </span>
-            </td>
-            
-          </tr>
-           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
-              入院时病情:
-             
-            </td>
-            <td style="text-align:center;width:170px" colspan="11">
-              <span style="display:inline-block;margin-left:10px;">
-               
+                 <span v-html="hosDetail.diagnosis_admission"></span>
               </span>
             </td>
             
           </tr>
+        
           <tr>
             <td style="text-align:center;width:170px" colspan="1">
               诊断经过:
@@ -208,7 +205,7 @@
             </td>
             <td style="text-align:center;width:170px" colspan="11">
               <span style="display:inline-block;margin-left:10px;">
-               
+               <span v-html="hosDetail.treatment"></span> 
               </span>
             </td>
             
@@ -216,14 +213,11 @@
           <tr>
             <td style="text-align:center;width:170px" colspan="1">
               出院时病情:
-              <span style="display:inline-block;margin-left:10px;">
-               
-              </span>
             </td>
             <td style="text-align:center;width:170px" colspan="11">
             
               <span style="display:inline-block;margin-left:10px;">
-               
+               <span v-html="hosDetail.illness_discharge"></span> 
               </span>
             </td>
           
@@ -232,14 +226,10 @@
           <tr>
             <td style="text-align:center;width:170px" colspan="1">
               出院医嘱:
-              <span style="display:inline-block;margin-left:10px;">
-               
-              </span>
             </td>
             <td style="text-align:center;width:170px" colspan="11">
-              出院医嘱:
               <span style="display:inline-block;margin-left:10px;">
-               
+                <span v-html="hosDetail.discharge_advice"></span> 
               </span>
             </td>
             
@@ -252,22 +242,18 @@
             </td>
             <td style="text-align:center;width:170px" colspan="2">
               上级签名:
-              <span style="display:inline-block;margin-left:10px;">
-               
-              </span>
             </td>
             <td style="text-align:center;width:170px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{getDoctor(hosDetail.dean_id)}}
               </span>
             </td>
            <td style="text-align:center;width:170px" colspan="2">
               住院医师签名:
             </td>
              <td style="text-align:center;width:170px" colspan="2">
-             
               <span style="display:inline-block;margin-left:10px;">
-               
+                 {{getDoctor(hosDetail.doctor)}}
               </span>
             </td>
           </tr>
@@ -287,8 +273,9 @@ import { jsGetAge, uParseTime } from '@/utils/tools'
 import LabelBox from '../dialysis/printItem/LabelBox'
 import CheckBox from '../dialysis/batch_print/option_check_box'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import {getHospitalSummaryDetail} from "@/api/patient"
-  import { getAllDoctorList } from "@/api/device"
+import {getHospitalSummaryDetail,getPatientInfo} from "@/api/patient"
+import { getAllDoctorList } from "@/api/device"
+import { getDataConfig } from "@/utils/data";
 export default {
   name: 'dialysisPrintOrderOne',
   components: {
@@ -305,6 +292,7 @@ export default {
      hosDetail:{},
      patient:{},
      doctorList:[],
+    educationOptions:[],
     }
   },
   methods: {
@@ -313,16 +301,13 @@ export default {
       var timestr = uParseTime(times, '{y}年{m}月{d}日')
       return timestr
     },
-    getTime(value, temp) {
-      if (value == 0) {
-        return ''
-      }
-      if (value != undefined) {
-        return uParseTime(value, temp)
-      }
-      return ''
+    getTime(val) {
+       if(val == "" || val == undefined){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
     },
-   
     printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
@@ -385,9 +370,33 @@ export default {
         }
        })
      },
+     getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+             name = this.doctorList[i].user_name
+          }
+        }
+        return name
+    },
+    getProfession(id){
+      var name = ""
+      for(let i=0;i<this.educationOptions.length;i++){
+          if(id == this.educationOptions[i].id){
+              name = this.educationOptions[i].name
+          }
+      }
+      return name
+    },
+    getTimeDay(start,end){
+      var count = ""
+      count = (end-start)/86400
+      return count
+    }
   },
  
   created() {
+    this.educationOptions = getDataConfig("patient", "education_types");
     var xtuser = this.$store.getters.xt_user
     this.orgname = xtuser.org.org_name
     var id = this.$route.query.id