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

src/xt_pages/dialysis/components/allSummary.vue

@@ -81,11 +81,11 @@
                 <span v-if="scope.row.mode_id == 15">HD前置换</span>
                 <span v-if="scope.row.mode_id == 16">HD后置换</span>
                 <span v-if="scope.row.mode_id == 17">HDF前置换</span>
-                <span v-if="scope.row.mode_id == 18"> HDF后置换</span> 
+                <span v-if="scope.row.mode_id == 18"> HDF后置换</span>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="address" :label="item.type_name" v-for="(item,index) in tableName" :key="index">
-               <template slot-scope="scope"> 
+               <template slot-scope="scope">
                    <!-- {{getCount(scope.row.patient.id,item.good_id)?getCount(scope.row.patient.id,item.good_id):""}} -->
                      {{scope.row.good_type[index].name}}
                </template>
@@ -245,13 +245,13 @@ export default {
           //   }
           //   if(this.selected_date!=''){
           //     this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-          //   } 
+          //   }
            const params ={
               start_time:this.start_time,
               scheduleType: this.scheduleType,
               partitionType:this.partitionType,
               limit:this.limit,
-              page:this.page, 
+              page:this.page,
               keyword:this.search_input,
             }
           getCollectList(params).then(response=>{
@@ -260,22 +260,22 @@ export default {
                this.tableData = schedule
                var total = response.data.data.total
                this.total = total
-               var consumables = response.data.data.consumables
-               this.consuMables = consumables
+              //  var consumables = response.data.data.consumables
+              //  this.consuMables = consumables
                var prescription =  response.data.data.prescription
                this.prescriptionList = prescription
                var reducelist =  response.data.data.reducelist
                this.reduceList = reducelist
               var good_type = response.data.data.good_type
-               console.log("godd_type",good_type)
+               // console.log("godd_type",good_type)
               this.tableName = good_type
               this.allGoodInfo = response.data.data.dialysis_goods
-              console.log("1111111",response.data.data.dialysis_goods)
+              // console.log("1111111",response.data.data.dialysis_goods)
               this.list = []
               this.good_types = []
               this.allGoodInfo = []
               this.good_types.push("姓名")
-           
+
              for (let a = 0; a <  response.data.data.good_type.length; a++){
                 this.good_types.push(response.data.data.good_type[a].type_name)
               }
@@ -299,7 +299,7 @@ export default {
 
 
              console.log("2222222",arr)
-            
+
 
               let newObj = {
                 "patient_id":response.data.data.dialysis_goods[i].patient_id,
@@ -311,10 +311,10 @@ export default {
                 "good_user_detail":response.data.data.dialysis_goods[i].good_user_detail,
                 "last_good_user_detail":response.data.data.dialysis_goods[i].last_good_user_detail,
               }
-             
+
               this.list.push(newObj)
               }
-              
+
             for (let a = 0; a <  this.list.length; a++){
               for (let b = 0; b <  this.list[a].good_type.length; b++){
                 if(this.list[a].good_type[b].id > 0){
@@ -334,7 +334,7 @@ export default {
           //   }
           //   if(this.selected_date!=''){
           //     this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-          //   } 
+          //   }
            const params = {
               startime:this.start_time
            }
@@ -360,26 +360,26 @@ export default {
           //   }
           //   if(this.selected_date!=''){
           //     this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-          //   } 
+          //   }
            const params ={
               start_time:this.start_time,
               scheduleType: this.scheduleType,
               partitionType:this.partitionType,
               limit:this.limit,
-              page:this.page, 
+              page:this.page,
               keyword:this.search_input,
             }
           getCollectList(params).then(response=>{
              if(response.data.state == 1){
-               var schedule = response.data.data.schedule      
+               var schedule = response.data.data.schedule
                this.tableData = schedule
-               var total = response.data.data.total      
+               var total = response.data.data.total
                this.total = total
-               var consumables = response.data.data.consumables       
+               var consumables = response.data.data.consumables
                this.consuMables = consumables
-               var prescription =  response.data.data.prescription        
+               var prescription =  response.data.data.prescription
                this.prescriptionList = prescription
-               var reducelist =  response.data.data.reducelist          
+               var reducelist =  response.data.data.reducelist
                this.reduceList = reducelist
                 var good_type = response.data.data.good_type
                console.log("godd_type",good_type)
@@ -390,7 +390,7 @@ export default {
               this.good_types = []
               this.allGoodInfo = []
               this.good_types.push("姓名")
-           
+
              for (let a = 0; a <  response.data.data.good_type.length; a++){
                 this.good_types.push(response.data.data.good_type[a].type_name)
               }
@@ -414,7 +414,7 @@ export default {
 
 
              console.log("2222222",arr)
-            
+
 
               let newObj = {
                 "patient_id":response.data.data.dialysis_goods[i].patient_id,
@@ -426,10 +426,10 @@ export default {
                 "good_user_detail":response.data.data.dialysis_goods[i].good_user_detail,
                 "last_good_user_detail":response.data.data.dialysis_goods[i].last_good_user_detail,
               }
-             
+
               this.list.push(newObj)
               }
-              
+
             for (let a = 0; a <  this.list.length; a++){
               for (let b = 0; b <  this.list[a].good_type.length; b++){
                 if(this.list[a].good_type[b].id > 0){
@@ -438,7 +438,7 @@ export default {
 
               }
               }
-              console.log("list22222",this.list) 
+              console.log("list22222",this.list)
              }
           })
         },
@@ -472,60 +472,83 @@ export default {
           if(this.prescriptionList[i].patient_id == id){
              anticoagulant = this.prescriptionList[i].anticoagulant
           }
-        } 
+        }
        return anticoagulant
      },
      getAnticoagulantShouji(id){
        var shouji = ""
        for(let i=0;i<this.prescriptionList.length;i++){
-         if(this.prescriptionList[i].patient_id == id){
+         if(this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_shouji!=0 ){
             shouji = "("+this.prescriptionList[i].anticoagulant_shouji
           }
-        } 
+        }
        return shouji
      },
      getAnticoagulantWeichi(id){
         var weichi = ""
         for(let i=0;i<this.prescriptionList.length;i++){
-         if(this.prescriptionList[i].patient_id == id){
+         if(this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_weichi!=0){
             weichi = "("+this.prescriptionList[i].anticoagulant_weichi
-        } 
+        }
        return weichi
       }
      },
      getAnticoagulantZongliang(id){
        var zongliang = ""
        for(let i=0;i<this.prescriptionList.length;i++){
-         if(this.prescriptionList[i].patient_id == id){
+         if(this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_zongliang!=0){
             zongliang = "("+this.prescriptionList[i].anticoagulant_zongliang
           }
-        } 
+        }
        return zongliang
      },
-      getGoodUserInfo(good_type_id,good_user,last_good_user) {
-        if (good_user != null && good_user.length > 0) {
-          let desc = ""
-          for (let b = 0; b < good_user.length; b++){
-            if(good_type_id == good_user[b].good_type_id)
-              desc = desc + "\n" + good_user[b].info.specification_name +"*" +good_user[b].count
-          }
-         
+      // getGoodUserInfo(good_type_id,good_user,last_good_user) {
+      //   if (good_user != null && good_user.length > 0) {
+      //     let desc = ""
+      //     for (let b = 0; b < good_user.length; b++){
+      //       if(good_type_id == good_user[b].good_type_id)
+      //         desc = desc + "\n" + good_user[b].info.specification_name +"*" +good_user[b].count
+      //     }
 
-          return desc
-        } else if (good_user != null && good_user.length <= 0) {
-          if (last_good_user != null && last_good_user.length > 0) {
-            let desc = ""
-            for (let b = 0; b < last_good_user.length; b++){
-              if(good_type_id == last_good_user[b].good_type_id)
-                desc = desc+ "\n" + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
-            }
-          
 
-            return desc
+      //     return desc
+      //   } else if (good_user != null && good_user.length <= 0) {
+      //     if (last_good_user != null && last_good_user.length > 0) {
+      //       let desc = ""
+      //       for (let b = 0; b < last_good_user.length; b++){
+      //         if(good_type_id == last_good_user[b].good_type_id)
+      //           desc = desc+ "\n" + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
+      //       }
+
+
+      //       return desc
+
+      //     }
+      //     return ""
+      //   }
+      // },
 
+       getGoodUserInfo(good_type_id, good_user, last_good_user, good_user_detail, last_good_user_detail) {
+        if (good_user != null && good_user.length > 0) {
+          let desc = ""
+          for (let b = 0; b < good_user.length; b++) {
+            if (good_type_id == good_user[b].good_type_id)
+              desc = desc + " " + good_user[b].info.specification_name + "*" + good_user[b].count
           }
-          return ""
+          return desc
+          // } else if (good_user.length <= 0) {
+          //   if (last_good_user != null && last_good_user.length > 0) {
+          //     let desc = ""
+          //     for (let b = 0; b < last_good_user.length; b++){
+          //       if(good_type_id == last_good_user[b].good_type_id)
+          //         desc = desc + " " + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
+          //     }
+          //     return desc
+          //
+          //   }
+          //   return ""
         }
+        return ""
       },
     }
 }

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -56,17 +56,19 @@
             </el-table-column>
             <el-table-column align="center" fixed  label="姓名" width="80">
                <template slot-scope="scope">
-                   {{scope.row.patient.name?scope.row.patient.name:""}}
+                   <!-- {{scope.row.patient.name?scope.row.patient.name:""}} -->
+                   {{scope.row.name?scope.row.name:""}}
                </template>
             </el-table-column>
             <el-table-column align="center"  label="透析模式" width="90">
                 <template slot-scope="scope">
-                   {{scope.row.treatment_mode.name?scope.row.treatment_mode.name:""}}
+                   <!-- {{scope.row.treatment_mode.name?scope.row.treatment_mode.name:""}} -->
+                   {{scope.row.mode_id}}
                 </template>
             </el-table-column>
             <el-table-column align="center" :label="'上次透后体重\n(kg)'" width="110">
                 <template slot-scope="scope">
-                  {{getLastWeight(scope.row.patient.id)?getLastWeight(scope.row.patient.id):""}}
+                  {{getLastWeight(scope.row.patient_id)?getLastWeight(scope.row.patient_id):""}}
                 </template>
             </el-table-column>
             <el-table-column align="center" :label="'透前体重\n(kg)'" width="100">
@@ -256,11 +258,72 @@ export default {
           getDialysisParameters(params).then(response=>{
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
-                // console.log("schedule",schedule)
+            
                 this.tableData = schedule
                 var total = response.data.data.total
-
                 this.total = total
+                var patient = response.data.data.patient
+                 for(let i=0;i<patient.length;i++){
+                  if(patient[i].mode_id == 1){
+                    patient[i].mode_id = "HD"
+                  }
+                  if(patient[i].mode_id == 2){
+                     patient[i].mode_id = "HDF"
+                  }
+                  if(patient[i].mode_id == 3){
+                     patient[i].mode_id = "HD+HP"
+                  }
+                  if(patient[i].mode_id == 4){
+                     patient[i].mode_id = "HP"
+                  }
+                  if(patient[i].mode_id == 5){
+                     patient[i].mode_id = "HF"
+                  }
+                  if(patient[i].mode_id == 6){
+                     patient[i].mode_id = "SCUF"
+                  }
+                  if(patient[i].mode_id == 7){
+                     patient[i].mode_id = "IUF"
+                  }
+                  if(patient[i].mode_id == 8){
+                     patient[i].mode_id = "HFHD"
+                  }
+                  if(patient[i].mode_id == 9){
+                     patient[i].mode_id = "HFHD+HP"
+                  }
+                  if(patient[i].mode_id == 10){
+                     patient[i].mode_id = "PHF"
+                  }
+                  if(patient[i].mode_id == 11){
+                    patient[i].mode_id = "HFR"
+                  }
+                  if(patient[i].mode_id == 12){
+                     patient[i].mode_id = "HDF+HP"
+                  }
+                  if(patient[i].mode_id == 13){
+                     patient[i].mode_id = "CRRT"
+                  }
+                  if(patient[i].mode_id == 14){
+                     patient[i].mode_id = "腹水回输"
+                  }
+                  if(patient[i].mode_id == 15){
+                     patient[i].mode_id = "HD前置换"
+                  }
+                  if(patient[i].mode_id == 16){
+                     patient[i].mode_id = "HD后置换"
+                  }
+                  if(patient[i].mode_id == 17){
+                     patient[i].mode_id = "HDF前置换"
+                  }
+                  if(patient[i].mode_id == 18){
+                     patient[i].mode_id = "HDF后置换"
+                  }
+                  if(patient[i].mode_id == 19){
+                     patient[i].mode_id = "IUF+HD"
+                  }
+                }
+                this.tableData = patient
+                console.log("patient2222",patient)
              }
           })
         },
@@ -292,15 +355,78 @@ export default {
           getDialysisParameters(params).then(response=>{
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
-                console.log("schedule",schedule)
-                this.tableData = schedule
+              
+                // this.tableData = schedule
                 var total = response.data.data.total
                 this.total = total
                 var prescription =  response.data.data.prescription
+            
                 this.prescriptionList = prescription
                 var dialysbefor = response.data.data.dialysbefor
                 this.dialysisBefor = dialysbefor
-                console.log("dialysbefor",dialysbefor)
+                
+                var patient = response.data.data.patient
+                 for(let i=0;i<patient.length;i++){
+                  if(patient[i].mode_id == 1){
+                    patient[i].mode_id = "HD"
+                  }
+                  if(patient[i].mode_id == 2){
+                     patient[i].mode_id = "HDF"
+                  }
+                  if(patient[i].mode_id == 3){
+                     patient[i].mode_id = "HD+HP"
+                  }
+                  if(patient[i].mode_id == 4){
+                     patient[i].mode_id = "HP"
+                  }
+                  if(patient[i].mode_id == 5){
+                     patient[i].mode_id = "HF"
+                  }
+                  if(patient[i].mode_id == 6){
+                     patient[i].mode_id = "SCUF"
+                  }
+                  if(patient[i].mode_id == 7){
+                     patient[i].mode_id = "IUF"
+                  }
+                  if(patient[i].mode_id == 8){
+                     patient[i].mode_id = "HFHD"
+                  }
+                  if(patient[i].mode_id == 9){
+                     patient[i].mode_id = "HFHD+HP"
+                  }
+                  if(patient[i].mode_id == 10){
+                     patient[i].mode_id = "PHF"
+                  }
+                  if(patient[i].mode_id == 11){
+                    patient[i].mode_id = "HFR"
+                  }
+                  if(patient[i].mode_id == 12){
+                     patient[i].mode_id = "HDF+HP"
+                  }
+                  if(patient[i].mode_id == 13){
+                     patient[i].mode_id = "CRRT"
+                  }
+                  if(patient[i].mode_id == 14){
+                     patient[i].mode_id = "腹水回输"
+                  }
+                  if(patient[i].mode_id == 15){
+                     patient[i].mode_id = "HD前置换"
+                  }
+                  if(patient[i].mode_id == 16){
+                     patient[i].mode_id = "HD后置换"
+                  }
+                  if(patient[i].mode_id == 17){
+                     patient[i].mode_id = "HDF前置换"
+                  }
+                  if(patient[i].mode_id == 18){
+                     patient[i].mode_id = "HDF后置换"
+                  }
+                  if(patient[i].mode_id == 19){
+                     patient[i].mode_id = "IUF+HD"
+                  }
+                }
+                console.log("patient",patient)
+                this.tableData = patient
              }
           })
         },
@@ -352,6 +478,7 @@ export default {
              dryWeight = this.dialysisBefor[i].dry_weight
           }
         }
+        console.log("dryweight=====",dryWeight)
        return dryWeight
      },
      getSysBloodPressure(id){
@@ -361,6 +488,7 @@ export default {
              sysBloodPressure = this.dialysisBefor[i].systolic_blood_pressure
           }
         }
+        console.log("sysBloodPressure=====",sysBloodPressure)
         return sysBloodPressure
      },
      getTargetUltrafiltration(id){
@@ -370,6 +498,7 @@ export default {
              targetUltrafiltration = this.prescriptionList[i].target_ultrafiltration
           }
         }
+        console.log("targetUltrafiltration",targetUltrafiltration)
         return targetUltrafiltration
      },
      getBloodFlowVolume(id){

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -344,6 +344,16 @@
           >打印</el-button
         >
       </template>
+       <template v-if="org_template_info.template_id == 25">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -544,6 +554,11 @@
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 24"
           ></DialysisPrintOrderTwentyFour>
+          <DialysisPrintOrderTwentyFive
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 25"
+          >
+          </DialysisPrintOrderTwentyFive>
         </div>
       </el-container>
     </div>
@@ -587,10 +602,11 @@ import DialysisPrintOrderTwentyOne from "./template/DialysisPrintOrderTwentyOne"
 import DialysisPrintOrderTwentyTwo from "./template/DialysisPrintOrderTwentyTwo";
 import DialysisPrintOrderTwentyThree from "./template/DialysisPrintOrderTwentyThree";
 import DialysisPrintOrderTwentyFour from "./template/DialysisPrintOrderTwentyFour";
-
+import DialysisPrintOrderTwentyFive from "./template/DialysisPrintOrderTwentyFive";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwentyFive,
     DialysisPrintOrderTwentyFour,
     DialysisPrintOrderTwentyThree,
     DialysisPrintOrderTwentyTwo,
@@ -615,6 +631,7 @@ export default {
     DialysisPrintOrderSeven,
     DialysisPrintOrderEight,
     DialysisPrintOrderNine,
+
     LabelBox,
     BreadCrumb
   },
@@ -851,7 +868,7 @@ export default {
           style: style,
           scanStyles: false
         });
-      } else if (this.org_template_info.template_id == 9) {
+      } else if (this.org_template_info.template_id == 9 ||  this.org_template_info.template_id==25) {
         printJS({
           printable: "dialysis-print-box",
           type: "html",
@@ -949,7 +966,14 @@ export default {
           style: style,
           scanStyles: false
         });
-      } 
+      }else if (this.org_template_info.template_id == 25) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style5,
+          scanStyles: false
+        });
+      }
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);