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

src/xt_pages/hospitalStation/template/printFive.vue

@@ -228,7 +228,7 @@ export default {
       }
       getHisPatientDetail(params).then(response => {
         if (response.data.state == 1) {
-          var hisPatient = response.data.data.hisPatient
+          var hisPatient = response.data.data.hisHospitalRecord
           console.log('挂号病人', hisPatient)
           this.hisPatient = hisPatient
         }

src/xt_pages/hospitalStation/template/printFour.vue

@@ -158,7 +158,7 @@ export default {
             this.advicePrint = advicePrint
             this.prescriptions = advicePrint
             console.log("处方222222",this.prescriptions)
-            var hisPatient = response.data.data.hisPatient
+            var hisPatient = response.data.data.hisHospitalRecord
             console.log("hisPatient",hisPatient)
             this.hisPatient = hisPatient
             var projectlist =  response.data.data.projectlist
@@ -173,7 +173,7 @@ export default {
           }
        getHisPatientDetail(params).then(response=>{
           if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
+             var hisPatient =  response.data.data.hisHospitalRecord
              console.log("挂号病人",hisPatient)
              this.hisPatient = hisPatient
           }

src/xt_pages/hospitalStation/template/printOne.vue

@@ -18,7 +18,7 @@
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
               <div style="margin-bottom: 10px;">科室：{{item.info?getDepart(item.info.departments):''}}</div>
-              <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
+              <div style="margin-bottom: 10px;">医保卡号：{{""}}</div>
               <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
               <div>地址：{{item.patient.home_address}}</div>
               <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
@@ -159,8 +159,7 @@ export default {
             this.advicePrint = advicePrint
             this.prescriptions = advicePrint
             console.log("处方222222",this.prescriptions)
-            var hisPatient = response.data.data.hisPatient
-            console.log("hisPatient",hisPatient)
+            var hisPatient = response.data.data.hisHospitalRecord
             this.hisPatient = hisPatient
             var projectlist =  response.data.data.projectlist
             console.log("所有项目列表",projectlist)
@@ -174,7 +173,7 @@ export default {
           }
        getHisPatientDetail(params).then(response=>{
           if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
+             var hisPatient =  response.data.data.hisHospitalRecord
              console.log("挂号病人",hisPatient)
              this.hisPatient = hisPatient
           }

src/xt_pages/hospitalStation/template/printThree.vue

@@ -182,7 +182,7 @@ export default {
             this.getPage()
             this.prescriptions = advicePrint
             console.log("处方222222",this.prescriptions)
-            var hisPatient = response.data.data.hisPatient
+            var hisPatient = response.data.data.hisHospitalRecord
             console.log("hisPatient",hisPatient)
             this.hisPatient = hisPatient
             var projectlist =  response.data.data.projectlist
@@ -202,7 +202,7 @@ export default {
           }
        getHisPatientDetail(params).then(response=>{
           if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
+             var hisPatient =  response.data.data.hisHospitalRecord
              console.log("挂号病人",hisPatient)
              this.hisPatient = hisPatient
           }

src/xt_pages/hospitalStation/template/printTwo.vue

@@ -161,7 +161,7 @@ export default {
           }
        getHisPatientDetail(params).then(response=>{
           if(response.data.state == 1){
-             var hisPatient =  response.data.data.hisPatient
+             var hisPatient =  response.data.data.hisHospitalRecord
              console.log("挂号病人",hisPatient)
              this.hisPatient = hisPatient
           }