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

src/xt_pages/data/components/addDrugs.vue

       },
       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

           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: []
               };
               }
 
               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[
                     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/user/components/PatientSidebar.vue

               name: '1-9',
               label: '阶段小结'
             },
-            // {
-            //   name: '1-10',
-            //   label: '住院小结'
-            // },
+            {
+              name: '1-10',
+              label: '住院小结'
+            },
             {
               name: '1-3',
               label: '检验检查'

src/xt_pages/user/hospitalSummaryPrint.vue

             </td>
             <td style="text-align:center;" 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>
              <td style="text-align:center;" 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>
              <td style="text-align:center;" 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>
              <td style="text-align:center;" 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:170px" colspan="2">
               出院时间:
             </td>
             <td style="text-align:center;width:170px" 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;" colspan="1">
               住院天数:
             </td>
-            <td style="text-align:center;" colspan="2">
+            <td style="text-align:center;" 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>
-            <td style="text-align:center;" colspan="2">
+            <td style="text-align:center;" 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:170px" colspan="2">
               检查号:
-            </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">
               X线:
             </td>
             <td style="text-align:center;" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-              
+                {{hosDetail.xray}}
               </span>
             </td>
             <td style="text-align:center;" colspan="1">
             </td>
             <td style="text-align:center;" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{hosDetail.connecticut}}
               </span>
             </td>
             <td style="text-align:center;" colspan="1">
             </td>
              <td style="text-align:center;" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{hosDetail.nuclear_magnetic_resonance}}
               </span>
             </td>
              <td style="text-align:center;" colspan="1">
             </td>
              <td style="text-align:center;" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-               
+                {{hosDetail.ultrasound}}
               </span>
             </td>
              <td style="text-align:center;" colspan="1">
             </td>
              <td style="text-align:center;" 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;">
-               
+                {{hosDetail.admitting_diagnosis_id}}
               </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;">
-               
+                {{hosDetail.discharge_diagnosis_id}}
               </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;">
-               
+                 {{hosDetail.diagnosis_admission_id}}
               </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;">
-               
+                {{hosDetail.treatment}}
               </span>
             </td>
             
           <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;">
-               
+                {{hosDetail.illness_discharge}}
               </span>
             </td>
           
           <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;">
-               
+                {{hosDetail.discharge_advice}}
               </span>
             </td>
             
             </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>
 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: {
      hosDetail:{},
      patient:{},
      doctorList:[],
+    educationOptions:[],
     }
   },
   methods: {
       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}')
         }
        })
      },
+     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