Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

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

@@ -59,6 +59,7 @@
         <el-button size="small"  @click="exportList" type="primary">导出</el-button>
         <el-button size="small"  @click="toPrint" icon="el-icon-printer" type="primary">打印</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
+        <!-- <el-button size="small" type="primary" @click="statisticsOne">导出2</el-button> -->
       </div>
     </div>
   
@@ -920,6 +921,122 @@
            }
         })
       },
+
+      statisticsOne(){
+        console.log("this.list233333333333333333333",this.list)
+        import('@/vendor/Export2Excel').then(excel => { 
+        if(this.list!=null && this.list.length > 0){
+           for(let i=0;i<this.list.length;i++){
+             this.tableList[i].index = i+1
+             this.tableList[i].name = this.tableList[i].patient.name
+             this.tableList[i].mode_name = this.getModeName(this.tableList[i].mode_id)
+             this.tableList[i].anticoagulant_name = this.getAnticoagulantName(this.tableList[i].anticoagulant)
+             this.tableList[i].anticoagulant_shouji = this.tableList[i].dialysis_prescription.anticoagulant_shouji
+             this.tableList[i].anticoagulant_weichi = this.tableList[i].dialysis_prescription.anticoagulant_weichi
+             this.tableList[i].anticoagulant_zongliang = this.tableList[i].dialysis_prescription.anticoagulant_zongliang
+
+             if(this.tableList[i].assessment_befor_dislysis){
+
+             }
+             
+           }
+        }
+        const tHeader = ['序号','姓名','透析方式','抗凝剂','首剂','维持','总量','封管液','促红']
+        const filterVal = ['index', 'name','mode_name','anticoagulant_name','anticoagulant_shouji','anticoagulant_weichi','anticoagulant_zongliang']
+
+        const data = this.formatJson(filterVal, this.tableList)
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析参数统计'
+         })
+          this.downloadLoading = false
+        })  
+      },
+      getModeName(id){
+         var mode_name =""
+         if(id == 1){
+          mode_name = "HD"
+         }
+         if(id == 2){
+          mode_name = "HDF"
+         }
+         if(id == 3){
+          mode_name = "HDF"
+         }
+         if(id == 4){
+          mode_name = "HP"
+         }
+         if(id == 5){
+          mode_name = "HF"
+         }
+         if(id == 6){
+          mode_name = "SCUF"
+         }
+         if(id == 7){
+          mode_name = "IUF"
+         }
+         if(id == 8){
+          mode_name = "HFHD"
+         }
+         if(id == 9){
+          mode_name = "HFHD+HP"
+         }
+         if(id == 10){
+          mode_name = "PHF"
+         }
+         if(id ==11){
+           mode_name ="HFR"
+         }
+         if(id ==12){
+           mode_name ="HDF+HP"
+         }
+         if(id ==25){
+           mode_name ="HD高通"
+         }
+         if(id ==31){
+           mode_name ="HPD"
+         }
+         if(id ==32){
+           mode_name ="HDP"
+         }
+         if(id ==33){
+           mode_name ="HFD"
+         }
+         if(id ==34){
+           mode_name ="HDF100"
+         }
+         if(id ==35){
+           mode_name ="HDF600"
+         }
+         if(id ==36){
+           mode_name ="HDF800"
+         }
+         if(id ==37){
+           mode_name ="HDF1000"
+         }
+        
+         return mode_name
+      },
+      getAnticoagulantName(id){
+         var name = ""
+         if(id ==1){
+            name ="无肝素"
+         }
+         if(id == 2){
+            name ="普通肝素"
+         }
+         if(id ==3){
+            name ="低分子肝素"
+         }
+         if(id == 6){
+           name ="低分子肝素钙"
+         }
+         if(id == 7){
+           name ="低分子肝素钠"
+         }
+         return name
+      },
       handleScheduleDateChange(val) {
         this.query.schedule_date = val
         this.query.page = 1

src/xt_pages/outpatientCharges/invoiceTemplate/printfifteen.vue

@@ -29,12 +29,12 @@
             <div style="position: absolute;top:160px;left:80px">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
             <!-- <div style="position: absolute;top:170px;left:80px"></div> -->
             <div style="position: absolute;top:160px;left:220px">材料费 {{ list.materialCostTotal }}</div>
-           
-            <div style="position: absolute;top:200px;left:80px">医疗费总金额: </div>
-            <div style="position: absolute;top:200px;left:250px">个人现金支付: </div>
-            <div style="position: absolute;top:220px;left:80px">全自费金额: </div>
-            <div style="position: absolute;top:220px;left:250px">基金支付总额: </div>
-            <div style="position: absolute;top:240px;left:80px">个人账户支付: </div>
+
+            <div style="position: absolute;top:200px;left:80px">医疗费总金额: {{list.order.medfee_sumamt?list.order.medfee_sumamt:""}}</div>
+            <div style="position: absolute;top:200px;left:250px">个人现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:""}}</div>
+            <div style="position: absolute;top:220px;left:80px">全自费金额: {{list.order.fulamt_ownpay_amt?list.order.fulamt_ownpay_amt:""}}</div>
+            <div style="position: absolute;top:220px;left:250px">基金支付总额: {{list.order.fund_pay_sumamt?list.order.fund_pay_sumamt:""}}</div>
+            <div style="position: absolute;top:240px;left:80px">个人账户支付: {{list.order.acct_pay?list.order.acct_pay:""}}</div>
       <!-- <div style="position: absolute;top:300px;left:80px">医疗费总金额 {{ list.order.medfee_sumamt }}</div>
         <div style="position: absolute;top:300px;left:300px">个人自费 {{ list.psn_cash_money }}</div> -->
         <div>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -4301,7 +4301,7 @@ export default {
                     if (this.org_id != 10206) {
                       obj.med_type = 14
                     }else{
-                      obj.med_type = 1
+                      obj.med_type = "1"
                     }
 
                     this.prescriptions.push(obj)
@@ -4947,6 +4947,12 @@ export default {
                         if (obj.med_type == 0 || obj.med_type == '') {
                           obj.med_type = 14
 
+                        }
+                      }else{
+                        obj.med_type = parseInt(prescription.med_type)
+                        if (obj.med_type == 0 || obj.med_type == '') {
+                          obj.med_type = "1"
+
                         }
                       }
                       this.prescriptions.push(obj)

src/xt_pages/user/inspection.vue

@@ -1297,11 +1297,9 @@ export default {
             var items = this.project.inspection_reference
             console.log("时间",items)
             for (var index in items) {
-
              console.log("obj",items[index])
               // console.log("inspectionsMap",inspectionsMap[items[index].item_id])
               var item = {}
-
               for (var key in items[index]) {
                 //  console.log("key",key,items[index][key])
                 //  console.log("item[key]",item[key])
@@ -1309,11 +1307,7 @@ export default {
               }
 
               if (item.item_id > 0) {
-
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
-
-
-
                   if(this.org_id == 10121 || this.org_id ==10278 || this.org_id ==10138){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
@@ -1321,18 +1315,16 @@ export default {
                     item.value = ""
                     item.item_name = ""
                   }
-
                 } else {
-
                   item.value = inspectionsMap[items[index].item_id].inspect_value
                   item.item_name = inspectionsMap[items[index].item_id].item_name
-
                 }
               } else {
-
+                if(typeof(inspectionsMap[parseInt(items[index].id)])  == "undefined"){
+                  continue
+                }
                 item.value = inspectionsMap[items[index].id].inspect_value
                 item.item_name = inspectionsMap[items[index].id].item_name
-
               }
               // item["inspect_desc"] = inspectionsMap[items[index].id].inspect_desc
               // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type