8月15日

src/store/modules/globalConfig.js

@@ -876,9 +876,9 @@ const global_config = {
         id: 13,
         name: '那屈肝素钙',
         type: 1,
-        shouji: 2,
-        weichi: 2,
-        zongliang: 2,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
         gaimingcheng: -1,
         gaijiliang: -1,
         shouji_unit: 'mg',

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -111,8 +111,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10249"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10249" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

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

@@ -109,12 +109,17 @@
           :label="item.filed_name_cn"
         >
           <template slot-scope="scope">
-             <!-- <span>{{scope.row.good_type[index].name}}</span> -->
              {{getName(scope.row.rowList[index].filed_name_cn,scope.row.dialysis_solution)}}
           </template>
 
         </el-table-column>
 
+       <el-table-column  align="center"  width="100" label="备注">
+           <template slot-scope="scope">
+            {{scope.row.dialysis_solution.remark}}
+           </template>
+        </el-table-column>
+
       </el-table>
     </div>
 
@@ -269,8 +274,8 @@
         hemodialysisPipelinesOptions:[],
         startDialogVisible:false,
         tableList:[],
-        schedule_type:"",
-        partion_type:"",
+        schedule_type:0,
+        partion_type:0,
       }
     },
     created() {
@@ -285,7 +290,7 @@
       this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
       var filedList = this.$store.getters.xt_user.fileds
       for (let i = 0; i < filedList.length; i++) {
-        if ( filedList[i].module == 1 && filedList[i].is_show == 1) {
+        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针'  || filedList[i].filed_name_cn == '穿刺针支数')) {
           this.rowList.push(filedList[i])
         }
       }
@@ -388,6 +393,7 @@
         })
       },
       statistics() {
+        
         var params = {
           schedule_type:this.schedule_type,
           partion_type:this.partion_type,
@@ -398,21 +404,32 @@
           if(response.data.state == 1){
             this.startDialogVisible = true
             var list = response.data.data.list
+            var kaliumCount = 0
+            var sodiumCount = 0
+            var calciumCount = 0
+            var glucoseCount = 0
+            var punctureNeedleCount = 0
             console.log("list232323223222wid",list)
             if(list!=null && list.length>0){
               for(let i=0;i<list.length;i++){
                  list[i].dialysis_dialyszers_arr = []
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
-                 if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
-                   list[i].dialysis_dialyszers_arr = list[i].dialysis_prescription.dialysis_dialyszers.split(",")
+                 if(list[i].dialysis_solution.dialysis_dialyszers!=""){
+                   list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
                  }
-                 if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
-                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_prescription.dialyzer_perfusion_apparatus.split(",")
+                 if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
+                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
                  }
-                 if(list[i].dialysis_prescription.dialysis_irrigation!=""){
-                   list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
+                 if(list[i].dialysis_solution.dialysis_irrigation!=""){
+                   list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
                  }
+                 kaliumCount += parseInt(list[i].dialysis_solution.kalium) 
+                 sodiumCount += parseInt(list[i].dialysis_solution.sodium)
+                 calciumCount +=parseInt(list[i].dialysis_solution.calcium)
+                 glucoseCount += parseInt(list[i].dialysis_solution.glucose)
+                 punctureNeedleCount += parseInt(list[i].dialysis_solution.puncture_needle_count)
+
               }
             }
             var dialysisDialyszersArr = []
@@ -488,7 +505,28 @@
               Arr.push(a);
             }
             console.log("newa",Arr)
-            this.tableList = Arr
+           var objfive = {name:"钾(mmol/L)",specification_name:"2.0",count:""}
+           var objsix =  {name:"钠(mmol/L)",specification_name:"1.25",count:""}
+           var objseven = {name:"钙(mmol/L)",specification_name:"1.5",count:""}
+           var objeight = {name:"葡萄糖(mmol/L)",specification_name:"无糖",count:""}
+           var objten = {name:"穿刺针支数",specification_name:"穿刺针支数",count:""}
+           
+            objfive.count = kaliumCount
+            objsix.count = sodiumCount
+            objseven.count = calciumCount
+            objeight.count = glucoseCount
+            objten.count = punctureNeedleCount
+            this.tableList.push(objfive)
+            this.tableList.push(objsix)
+            this.tableList.push(objseven)
+            this.tableList.push(objeight)
+            this.tableList.push(objten)
+            for(let i=0;i<Arr.length;i++){
+
+              this.tableList.push(Arr[i])
+            }
+            // this.tableList = Arr
+           
           }
        })
         

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

@@ -396,6 +396,7 @@
         startdialogVisible:false,
         schedule_type:"",
         partion_type:"",
+        tableList:[],
       }
     },
     created() {

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -290,7 +290,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="template_id != 6"
+          v-if="template_id != 6 && org_id!=10223"
           prop="checker"
           min-width="30px"
           align="center"

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2364,6 +2364,7 @@ export default {
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
+                  
 
                 }
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -1232,7 +1232,8 @@
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].unit,
-                    type: prescription.project[b].type
+                    type: prescription.project[b].type,
+                    
 
                   }
 
@@ -1243,6 +1244,7 @@
                     obj['medical_code'] = prescription.project[b].project.medical_code
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
+                  
 
                   } else if (prescription.project[b].type == 3) {
                     if(prescription.project[b].team_id > 0){
@@ -1252,6 +1254,7 @@
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['good_info'] = prescription.project[b].good_info
+                  
 
                   }
                   tempProject.push(obj)
@@ -1372,7 +1375,8 @@
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].unit,
-                      type: prescription.project[b].type
+                      type: prescription.project[b].type,
+                      
 
                     }
 
@@ -1382,6 +1386,7 @@
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['price'] = prescription.project[b].project.price
                       obj['project'] = prescription.project[b].project
+                      
 
                     } else if (prescription.project[b].type == 3) {
                       obj['statistical_classification'] = ''
@@ -1389,6 +1394,7 @@
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['price'] = prescription.project[b].good_info.packing_price
                       obj['good_info'] = prescription.project[b].good_info
+                     
                     }
                     tempProject.push(obj)
                   }
@@ -1645,7 +1651,8 @@
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                         
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -1784,8 +1791,8 @@
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].unit,
-                            type: prescription.project[b].type
-
+                            type: prescription.project[b].type,
+                           
                           }
 
                           if (prescription.project[b].type == 2) {
@@ -2136,7 +2143,9 @@
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                         
+                  
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -2266,7 +2275,8 @@
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].unit,
-                            type: prescription.project[b].type
+                            type: prescription.project[b].type,
+                           
                           }
 
                           if (prescription.project[b].type == 2) {
@@ -2608,7 +2618,8 @@
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -2737,7 +2748,8 @@
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                         
                         }
 
                         if (prescription.project[b].type == 2) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -91,7 +91,7 @@
                         </el-button>
           </div>
 
-          <div  v-if="org_id != 10340 || org_id != 0">
+          <div  v-if="org_id != 10340 && org_id != 0">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->
 <!--                       type="primary">登记-->
@@ -2883,7 +2883,7 @@ export default {
             obj['settle_accounts_type'] = 2
           }
           var that = this
-          axios.get(process.env.BASE_API  + '/coordinate/settleAccount', {
+          axios.get("127.0.0.1:9532"  + '/coordinate/settleAccount', {
             params: obj
           })
               .then(function(response) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2366,6 +2366,7 @@
                   this.prescriptions[i].project[b].total = this.prescriptions[i].project[b].total.toString()
                   this.prescriptions[i].project[b].delivery_way = this.prescriptions[i].project[b].delivery_way.toString()
                   this.prescriptions[i].project[b].single_dose = this.prescriptions[i].project[b].single_dose.toString()
+                 
 
                 }
 
@@ -2633,6 +2634,8 @@
                   month_prescriptions[i].project[b].total = month_prescriptions[i].project[b].total.toString()
                   month_prescriptions[i].project[b].delivery_way = month_prescriptions[i].project[b].delivery_way.toString()
 
+                  
+
                 }
 
                 for (let b = 0; b < month_prescriptions[i].addition.length; b++) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1704,7 +1704,7 @@ export default {
                   unit: prescription.project[b].unit,
                   type: prescription.project[b].type,
                   execution_state: prescription.project[b].execution_state,
-
+                
 
                 }
 
@@ -1713,12 +1713,14 @@ export default {
                   obj['medical_code'] = prescription.project[b].project.medical_code
                   obj['project_name'] = prescription.project[b].project.project_name
                   obj['project'] = prescription.project[b].project
+                 
 
                 } else if (prescription.project[b].type == 3) {
                   obj['statistical_classification'] = ''
                   obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                   obj['project_name'] = prescription.project[b].good_info.good_name
                   obj['good_info'] = prescription.project[b].good_info
+                
 
                 }
                 tempProject.push(obj)
@@ -1864,6 +1866,7 @@ export default {
                     unit: prescription.project[b].unit,
                     type: prescription.project[b].type,
                     execution_state: 2,
+                    
 
                   }
 
@@ -1873,6 +1876,7 @@ export default {
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['price'] = prescription.project[b].project.price
                     obj['project'] = prescription.project[b].project
+                    
 
                   } else if (prescription.project[b].type == 3) {
                     obj['statistical_classification'] = ''
@@ -1880,6 +1884,7 @@ export default {
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['price'] = prescription.project[b].good_info.packing_price
                     obj['good_info'] = prescription.project[b].good_info
+                  
                   }
                   tempProject.push(obj)
                 }
@@ -1935,7 +1940,7 @@ export default {
 
             }
           }
-          console.log('~~~~~00000222222')
+          console.log('~~~~~00000222222',this.prescriptions)
           this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
         }
       })
@@ -2161,6 +2166,7 @@ export default {
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
+                       
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -2319,6 +2325,7 @@ export default {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
+                         
 
                         }
 
@@ -2703,7 +2710,7 @@ export default {
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
-
+                       
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -2853,7 +2860,7 @@ export default {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
-
+                         
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -3216,8 +3223,8 @@ export default {
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
-                      execution_state: prescription.project[b].execution_state
-
+                      execution_state: prescription.project[b].execution_state,
+                  
                     }
 
                     if (prescription.project[b].type == 2) {
@@ -3366,7 +3373,8 @@ export default {
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
-                        execution_state: 2
+                        execution_state: 2,
+                       
 
                       }
 
@@ -3809,8 +3817,8 @@ export default {
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
-                        execution_state: prescription.project[b].execution_state
-
+                        execution_state: prescription.project[b].execution_state,
+                       
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -3818,6 +3826,7 @@ export default {
                         obj['medical_code'] = prescription.project[b].project.medical_code
                         obj['project_name'] = prescription.project[b].project.project_name
                         obj['project'] = prescription.project[b].project
+                      
 
                       } else if (prescription.project[b].type == 3) {
                         if (prescription.project[b].team_id > 0) {
@@ -3826,6 +3835,7 @@ export default {
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                         obj['project_name'] = prescription.project[b].good_info.good_name
                         obj['good_info'] = prescription.project[b].good_info
+                       
 
                       }
                       tempProject.push(obj)
@@ -3969,6 +3979,7 @@ export default {
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
+                          
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -4436,8 +4447,8 @@ export default {
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
-                        execution_state: prescription.project[b].execution_state
-
+                        execution_state: prescription.project[b].execution_state,
+                       
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -4596,8 +4607,8 @@ export default {
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
-                          execution_state: 2
-
+                          execution_state: 2,
+                         
                         }
 
                         if (prescription.project[b].type == 2) {