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

src/xt_pages/dialysis/signPrint.vue

@@ -12,9 +12,9 @@
             <div id="dialysisTable">
                 <div v-for="(item, index) in list" :key="index">
                     <div class="signPrint" v-for="it in item.parent_advice" style="page-break-after: always;">
-                       
+                        <div v-if="org_id==10340 || org_id ==0" style="font-size: 22px;font-weight: 500;">姓名:{{item.patient.name}}</div>  
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
-                        <div>姓名:{{item.patient.name}}</div>  
+                        <div v-if="org_id!=10340">姓名:{{item.patient.name}}</div>  
                         <div v-if="org_id == 0 || org_id==10340">身份证:{{item.patient.id_card_no}}</div>  
                         <div>
                             <div>药名:{{ it.advice_name }} 

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -483,8 +483,6 @@
                           </span>℃
                         </div>
                       </td>
-                      <!-- <td width="10" style="border:none;"></td> -->
-
                       <td width="50" style="border:none;padding-left:5px;">血压:</td>
                       <td width="120" style="text-align:left;border:none;line-height: 30px;">
                         <div>
@@ -557,28 +555,31 @@
                     <tr>
                       <td width="90" style="border:none;padding-left:5px">透析器凝血:</td>
                       <td width="220" style="text-align:left;border:none;">
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器0' ? true : false) :false" showValue="0"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器+' ? true : false) :false" showValue="+"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器++' ? true : false) :false" showValue="+ +"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器+++' ? true : false) :false" showValue="+ + +"></label-box>
-                        <!-- <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器0') > -1 ? true : false) :false" showValue="0"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+') > -1 ? true : false) :false" showValue="+"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器++')> -1 ? true : false) :false" showValue="+ +"></label-box>
-                        <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+++')> -1 ? true : false) :false" showValue="+ + +"></label-box> -->
+                        <span class="under_line" style="width:100px;display:inline-block">
+                          {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
+                        </span>
                       </td>
                       <td width="90" style="border:none;padding-left:5px">静脉管道:</td>
                       <td width="220" style="text-align:left;border:none;">
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
+                        <span class="under_line" style="width:100px;display:inline-block">
+                          {{  getintravenous(afterdialysis.intravenous_tube) }}
+                        </span>
+                        
+                        <!-- <label-box :isChecked="afterdialysis.intravenous_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.intravenous_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.intravenous_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.intravenous_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp; -->
                       </td>
                       <td width="90" style="border:none;padding-left:5px">动脉管道:</td>
                       <td width="220" style="text-align:left;border:none;">
-                        <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
+                        <span class="under_line" style="width:100px;display:inline-block">
+                          {{ getarterial(afterdialysis.arterial_tube) }}
+                        </span>
+                        
+                        <!-- <label-box :isChecked="afterdialysis.arterial_tube == 1 ? true : false" showValue="无"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 2 ? true : false" showValue="+"></label-box>&nbsp;
                         <label-box :isChecked="afterdialysis.arterial_tube == 3 ? true : false" showValue="+ +"></label-box>&nbsp;
-                        <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.arterial_tube == 4 ? true : false" showValue="+ + +"></label-box>&nbsp; -->
                       </td>
                       <td></td>
                       <!-- <td width="10" style="text-align:left;border:none;"></td>
@@ -830,7 +831,9 @@ export default {
         finish_nurse: '',
         url: ''
       },
-      displaceLiquiPartOptions: []
+      displaceLiquiPartOptions: [],
+      arterial_tube:[],
+      intravenous_tube:[],
     }
   },
   methods: {
@@ -1745,7 +1748,31 @@ export default {
       }else{
         this.$message.success('核对完成')
       }
-    }
+    },
+    getarterial(val){
+      const options = this.arterial_tube
+      if(val !=''){
+        for(let i in options){
+          if(val == options[i].id){
+            return options[i].name
+          }
+        }
+      }else{
+        return ''
+      }
+    },
+    getintravenous(val){
+      const options = this.intravenous_tube
+      if(val !=''){
+        for(let i in options){
+          if(val == options[i].id){
+            return options[i].name
+          }
+        }
+      }else{
+        return ''
+      }
+    },
   },
   watch: {
     'patientInfo.gender': function() {
@@ -1781,6 +1808,10 @@ export default {
     this.replacementWays = this.$store.getters.replacement_ways
     this.perfusionApparatus = this.$store.getters.perfusion_apparatus
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+    this.arterial_tube =  this.$store.getters.arterial_tube
+    this.intravenous_tube = this.$store.getters.intravenous_tube
+    console.log('intravenous_tube',this.intravenous_tube);
+    
 
     this.way_arr = getDataConfig('hemodialysis', 'way')
     this.consciousness_arr = getDataConfig('hemodialysis', 'consciousness')
@@ -1898,13 +1929,13 @@ export default {
   width: 50%;
 }
 
-.under_line::before {
+/* .under_line::before {
   content: "\00A0";
 }
 
 .under_line::after {
   content: "\00A0";
-}
+} */
 
 .flex {
   display: -webkit-box;

src/xt_pages/outpatientCharges/summary.vue

@@ -192,9 +192,11 @@
         <el-table-column align="center" width="60" prop="name" label="患者年龄">
           <template slot-scope="scope">{{getAge(scope.row.patient.id_card_no)}}</template>
         </el-table-column>
-        <!--<el-table-column align="center" prop="name" label="患者类型">-->
-        <!--<template slot-scope="scope"></template>-->
-        <!--</el-table-column>-->
+        <el-table-column align="center" prop="name" label="患者类型">
+          <template slot-scope="scope">
+            {{ getpatient(scope.row.patient.patient_type) }}
+          </template>
+        </el-table-column>
 
         <el-table-column align="center" width="80" prop="name" label="应收金额">
           <template slot-scope="scope">{{
@@ -716,6 +718,9 @@ export default {
       settlementObj: {},
       accounts_click_vi:false,
       org_id:'',
+      patienttypeArr:[{value:1,label:'血透患者'},{value:2,label:'慢病患者'},{value:3,label:'会员患者'},
+                        {value:4,label:'腹透患者'},{value:5,label:'CKD患者'},{value:6,label:'其他患者'}
+      ]
     }
   },
 
@@ -762,6 +767,19 @@ export default {
   },
 
   methods: {
+    // 患者类型
+    getpatient(id){
+      const options = this.patienttypeArr
+      if(id !=0&&id!=''){
+        for(let i in options){
+          if(id == options[i].value){
+            return options[i].label
+          }
+        }
+      }else{
+        return ''
+      }
+    },
     query(){
       this.getHisOrderList()
     },

src/xt_pages/outpatientTool/components/newSettlePrint.vue

@@ -30,7 +30,7 @@ import axios from 'axios'
 import { getAllDoctorList, getAllHisPatientList } from '@/api/project/project'
 import { getPrivateExpenses, getPrivateExpensesOrder, getPrivateExpensesTwo } from '@/api/his/his'
 import Print9919 from './print9919.vue'
-import printJS from "print-js";
+import print from "print-js";
 export default {
   name: 'dialysisPrintOrder',
   components: {

src/xt_pages/user/patients.vue

@@ -452,6 +452,11 @@
             <span>{{ LapsetoInfo(scope.row) }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="患者类型" align="center">
+          <template slot-scope="scope">
+            <span>{{ getpatient(scope.row.patient_type) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="转出(死亡)时间" min-width="134" align="center">
           <template slot-scope="scope">
 <!--            <span>{{getTime(scope.row.death_time)}}</span>-->
@@ -929,7 +934,10 @@
         },
         adminUserOptions:[],
         scheduleList:[],
-        patientsList:[]
+        patientsList:[],
+        patienttypeArr:[{value:1,label:'血透患者'},{value:2,label:'慢病患者'},{value:3,label:'会员患者'},
+                        {value:4,label:'腹透患者'},{value:5,label:'CKD患者'},{value:6,label:'其他患者'}
+        ]
       }
     },
     created() {
@@ -953,6 +961,19 @@
     },
 
     methods: {
+      // 患者类型
+      getpatient(id){
+        const options = this.patienttypeArr
+        if(id !=0&&id!=''){
+          for(let i in options){
+            if(id == options[i].value){
+              return options[i].label
+            }
+          }
+        }else{
+          return ''
+        }
+      },
       getExportList(){
         getExportList(this.listQuery).then(response=>{
            if(response.data.state ==1){
@@ -1769,132 +1790,132 @@
         }
 
       },
-     toExport(){
-      import('@/vendor/Export2Excel').then(excel => {
+      toExport(){
+        import('@/vendor/Export2Excel').then(excel => {
 
-        console.log("hhhh323223",this.tableData)
-        for(let i=0;i<this.tableData.length;i++){
-          if(this.tableData[i].gender == 1){
-            this.tableData[i].genders = "男"
-          }
-          if(this.tableData[i].gender == 2){
-            this.tableData[i].genders = "女"
-          }
-          this.tableData[i].age_year = this.tranAge(this.tableData[i])
-          this.tableData[i].first_dialysis_date = this.getTime(this.tableData[i].first_dialysis_date)
-          if(this.tableData[i].lapseto == 0){
-            this.tableData[i].lapesetos = ""
-          }
-          if(this.tableData[i].lapseto == 1){
-            this.tableData[i].lapesetos = "留治"
-          }
-          if(this.tableData[i].lapseto == 2){
-            this.tableData[i].lapesetos = "转归"
-          }
-           if(this.tableData[i].source == 0){
-             this.tableData[i].sources = ""
-          }
-          if(this.tableData[i].source == 1){
-             this.tableData[i].sources = "门诊"
-          }
-           if(this.tableData[i].source == 2){
-             this.tableData[i].sources = "住院"
-          }
-         if(this.tableData[i].is_infectious == 0){
-             this.tableData[i].is_infectiouss = ""
-          }
-          if(this.tableData[i].is_infectious == 1){
-             this.tableData[i].is_infectiouss = "阴性"
-          }
-          if(this.tableData[i].is_infectious == 2){
-             this.tableData[i].is_infectiouss = "阳性"
+          console.log("hhhh323223",this.tableData)
+          for(let i=0;i<this.tableData.length;i++){
+            if(this.tableData[i].gender == 1){
+              this.tableData[i].genders = "男"
+            }
+            if(this.tableData[i].gender == 2){
+              this.tableData[i].genders = "女"
+            }
+            this.tableData[i].age_year = this.tranAge(this.tableData[i])
+            this.tableData[i].first_dialysis_date = this.getTime(this.tableData[i].first_dialysis_date)
+            if(this.tableData[i].lapseto == 0){
+              this.tableData[i].lapesetos = ""
+            }
+            if(this.tableData[i].lapseto == 1){
+              this.tableData[i].lapesetos = "留治"
+            }
+            if(this.tableData[i].lapseto == 2){
+              this.tableData[i].lapesetos = "转归"
+            }
+            if(this.tableData[i].source == 0){
+              this.tableData[i].sources = ""
+            }
+            if(this.tableData[i].source == 1){
+              this.tableData[i].sources = "门诊"
+            }
+            if(this.tableData[i].source == 2){
+              this.tableData[i].sources = "住院"
+            }
+          if(this.tableData[i].is_infectious == 0){
+              this.tableData[i].is_infectiouss = ""
+            }
+            if(this.tableData[i].is_infectious == 1){
+              this.tableData[i].is_infectiouss = "阴性"
+            }
+            if(this.tableData[i].is_infectious == 2){
+              this.tableData[i].is_infectiouss = "阳性"
+            }
+
+            this.tableData[i].ctime = this.getTime(this.tableData[i].created_time)
           }
 
-          this.tableData[i].ctime = this.getTime(this.tableData[i].created_time)
-        }
+          const tHeader = ['姓名', '性别', '身份证号码','年龄','透析号','首次治疗时间','本人电话','患者来源','治疗状态','传染病','家庭住址','工作单位',"登记时间","家属电话","上家透析医院"]
+          const filterVal = ['name', 'genders', 'id_card_no','age_year','dialysis_no','first_dialysis_date','phone','sources','lapesetos','is_infectiouss','home_address','work_unit','ctime','home_telephone','first_dialysis_hospital']
+          console.log("table",this.tableData)
 
-        const tHeader = ['姓名', '性别', '身份证号码','年龄','透析号','首次治疗时间','本人电话','患者来源','治疗状态','传染病','家庭住址','工作单位',"登记时间","家属电话","上家透析医院"]
-        const filterVal = ['name', 'genders', 'id_card_no','age_year','dialysis_no','first_dialysis_date','phone','sources','lapesetos','is_infectiouss','home_address','work_unit','ctime','home_telephone','first_dialysis_hospital']
-        console.log("table",this.tableData)
+          const data = this.formatJson(filterVal, this.tableData)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '患者名单'
+          })
+          this.downloadLoading = false
+      })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
 
-        const data = this.formatJson(filterVal, this.tableData)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: '患者名单'
-        })
-        this.downloadLoading = false
-     })
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]));
-    },
+      toExportOne(){
+        import('@/vendor/Export2Excel').then(excel => {
+
+          console.log("hhhh323223",this.scheduleList)
+          for(let i=0;i<this.scheduleList.length;i++){
+            this.scheduleList[i].name = ""
+            this.scheduleList[i].wort_unit = ""
+              this.scheduleList[i].name = this.GetPatientName(this.scheduleList[i].patient_id)
+              this.scheduleList[i].wort_unit = this.GetPatientWorkUnit(this.scheduleList[i].patient_id)
+          }
 
-    toExportOne(){
-      import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['姓名', '工作单位']
+          const filterVal = ['name', 'wort_unit']
+          console.log("table",this.scheduleList)
 
-        console.log("hhhh323223",this.scheduleList)
-        for(let i=0;i<this.scheduleList.length;i++){
-          this.scheduleList[i].name = ""
-          this.scheduleList[i].wort_unit = ""
-            this.scheduleList[i].name = this.GetPatientName(this.scheduleList[i].patient_id)
-            this.scheduleList[i].wort_unit = this.GetPatientWorkUnit(this.scheduleList[i].patient_id)
+          const data = this.formatJson(filterVal, this.scheduleList)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '今日透析记录'
+          })
+          this.downloadLoading = false
+      })
+      },
+      tranAge(val) {
+        if(val.birthday){
+          var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
+          return jsGetAge(birth, '-');
         }
+      },
+      toOpen(id){
+        this.$router.push({path:"/patients/patient/"+id})
+        this.$router.push({path:'/patient/patient/'+id+'/lapsoSummary'})
+        // getPatientAllagic(id).then(response=>{
+        //   if(response.data.state == 1){
+        //     var list =  response.data.data.list
+        //     this.patieintDialogVisible=  true
+        //     this.patientAllgicList = list
+        //   }
+        // })
+      },
+      GetPatientName(id){
+        var name = ""
+        for(let i=0;i<this.patientsList.length;i++){
+            if(id == this.patientsList[i].id){
+              name = this.patientsList[i].name
+            }
+        }
+        return name
+      },
+      GetPatientWorkUnit(id){
+        console.log("HHAHAHAH",this.patientsList)
+        var work_unit =""
+        for(let i=0;i<this.patientsList.length;i++){
+            if(id == this.patientsList[i].id){
+              work_unit = this.patientsList[i].work_unit
+            }
+        }
+        return work_unit
+      },
+      toJiaoBen(){
+        getPatientLapeso().then(response=>{
 
-        const tHeader = ['姓名', '工作单位']
-        const filterVal = ['name', 'wort_unit']
-        console.log("table",this.scheduleList)
-
-        const data = this.formatJson(filterVal, this.scheduleList)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: '今日透析记录'
         })
-        this.downloadLoading = false
-     })
-    },
-    tranAge(val) {
-      if(val.birthday){
-        var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
-        return jsGetAge(birth, '-');
       }
-    },
-    toOpen(id){
-      this.$router.push({path:"/patients/patient/"+id})
-      this.$router.push({path:'/patient/patient/'+id+'/lapsoSummary'})
-      // getPatientAllagic(id).then(response=>{
-      //   if(response.data.state == 1){
-      //     var list =  response.data.data.list
-      //     this.patieintDialogVisible=  true
-      //     this.patientAllgicList = list
-      //   }
-      // })
-    },
-    GetPatientName(id){
-       var name = ""
-       for(let i=0;i<this.patientsList.length;i++){
-          if(id == this.patientsList[i].id){
-             name = this.patientsList[i].name
-          }
-       }
-       return name
-    },
-    GetPatientWorkUnit(id){
-      console.log("HHAHAHAH",this.patientsList)
-      var work_unit =""
-      for(let i=0;i<this.patientsList.length;i++){
-          if(id == this.patientsList[i].id){
-            work_unit = this.patientsList[i].work_unit
-          }
-       }
-       return work_unit
-    },
-    toJiaoBen(){
-      getPatientLapeso().then(response=>{
-
-      })
-    }
    
 
     }