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

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

@@ -786,6 +786,7 @@
                  list[i].dialysis_dialyszers_arr = []
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
+                 list[i].dialysis_strainer_arr =[]
                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
                  }
@@ -795,6 +796,9 @@
                  if(list[i].dialysis_solution.dialysis_irrigation!=""){
                    list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
                  }
+                 if(list[i].dialysis_solution.dialysis_strainer!=""){
+                    list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                 }
 
                 
                  if(list[i].dialysis_solution.anticoagulant == 1){
@@ -873,6 +877,8 @@
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
+
+            var dialysisStrainerArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
                dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
@@ -883,10 +889,14 @@
              for(let y=0;y<list[i].dialysis_irrigation_arr.length;y++){
               dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
              }
+             for(let p=0;p<list[i].dialysis_strainer_arr.length;p++){
+              dialysisStrainerArr.push(list[i].dialysis_strainer_arr[p])
+             }
             }
            let obj = {}
            let objOne = {}
            let objTwo = {}
+           let objThree = {}
            for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
             if(obj[dialysisDialyszersArr[i]]){
                obj[dialysisDialyszersArr[i]] +=1
@@ -921,6 +931,8 @@
               Arr.push(a);
             }
 
+         
+
            for(let i=0;i<dialysisIrrigationArr.length;i++){
             if(objTwo[dialysisIrrigationArr[i]]){
               objTwo[dialysisIrrigationArr[i]] +=1
@@ -937,6 +949,34 @@
               a.specification_name = i
               Arr.push(a);
             }
+            console.log("newa",Arr)
+
+           for (let i in objThree) {
+              let a = {};
+              a[i] = objThree[i];
+              a.name = "滤过器"
+              a.count = objThree[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+
+            for(let i=0;i<dialysisStrainerArr.length;i++){
+            if(objThree[dialysisStrainerArr[i]]){
+              objThree[dialysisStrainerArr[i]] +=1
+             }else{
+              objThree[dialysisStrainerArr[i]] = 1
+             }   
+           }
+
+           for (let i in objThree) {
+              let a = {};
+              a[i] = objThree[i];
+              a.name = "滤过器"
+              a.count = objThree[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+
 
             if(Arr.length >0){
               for(let i=0;i<Arr.length;i++){

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

@@ -141,6 +141,7 @@
                  list[i].dialysis_dialyszers_arr = []
                  list[i].dialyzer_perfusion_apparatus_arr = []
                  list[i].dialysis_irrigation_arr = []
+                 list[i].dialysis_strainer_arr =[]
                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
                  }
@@ -150,6 +151,9 @@
                  if(list[i].dialysis_solution.dialysis_irrigation!=""){
                    list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
                  }
+                 if(list[i].dialysis_solution.dialysis_strainer!=""){
+                    list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
+                 }
 
                  if(list[i].dialysis_solution.anticoagulant == 1){
                     anticoagulantList.push(list[i].dialysis_solution)
@@ -227,6 +231,7 @@
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
+            var dialysisStrainerArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
               
@@ -238,6 +243,9 @@
              for(let y=0;y<list[i].dialysis_irrigation_arr.length;y++){
               dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
              }
+             for(let p=0;p<list[i].dialysis_strainer_arr.length;p++){
+              dialysisStrainerArr.push(list[i].dialysis_strainer_arr[p])
+             }
             }
             console.log("透析器",dialysisDialyszersArr)
             console.log("透析器/灌流器",dialyzerPerfusionApparaArr)
@@ -246,6 +254,7 @@
            let obj = {}
            let objOne = {}
            let objTwo = {}
+           let objThree = {}
            for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
             if(obj[dialysisDialyszersArr[i]]){
                obj[dialysisDialyszersArr[i]] +=1
@@ -297,6 +306,33 @@
               Arr.push(a);
             }
             console.log("newa",Arr)
+
+
+            for (let i in objThree) {
+              let a = {};
+              a[i] = objThree[i];
+              a.name = "滤过器"
+              a.count = objThree[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
+
+            for(let i=0;i<dialysisStrainerArr.length;i++){
+            if(objThree[dialysisStrainerArr[i]]){
+              objThree[dialysisStrainerArr[i]] +=1
+             }else{
+              objThree[dialysisStrainerArr[i]] = 1
+             }   
+           }
+
+           for (let i in objThree) {
+              let a = {};
+              a[i] = objThree[i];
+              a.name = "滤过器"
+              a.count = objThree[i]
+              a.specification_name = i
+              Arr.push(a);
+            }
            
          
             if(Arr.length >0){

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

@@ -170,18 +170,22 @@
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
-                <td>
+                
                 <td>
                   <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
-                </td>
+                  <span v-else></span>
                 </td>
                 
+                
                 <td>
                   {{ item.advice_spc }}
                 </td>
                </tr>
               </tbody>
             </table>
+            <span>低分子肝素:{{total_one}}</span>
+            <span>促红:{{ total_two }}</span>
+            <span>封管液:{{ total_three }}</span>
           </div>
         </div>
       </div>
@@ -231,6 +235,9 @@
         tableList:[],
         list:[],
         dialysisSett:{},
+        total_one:0,
+        total_two:0,
+        total_three:0
       }
     },
     components: {
@@ -248,7 +255,7 @@
          schedule_type:this.$route.query.schedule_type,
          partition_id:this.$route.query.partion_id,
          page:this.$route.query.page,
-         limit:this.$route.query.limit,
+         limit:500,
          ids:this.$route.query.ids,
        }
       console.log("params",params)
@@ -264,13 +271,29 @@
               }
               list.sort(this.compare('sort'))
 
+            var total_one =0
+            var total_two=0
+            var total_three =0  
+            console.log("listoowowowwoww",list)
             for(let i=0;i<list.length;i++){
               list[i].advice_spc =""
                 for(let j=0;j<list[i].advice.length;j++){
+                    total_two +=parseInt(list[i].advice[j].prescribing_number) 
                     if((list[i].advice[j].advice_name).indexOf("促红")!=-1){
                       list[i].advice_spc+= (list[i].advice[j].single_dose + "iu"+"/"+ list[i].advice[j].prescribing_number_unit)+","
                     }
                 }
+              this.total_two =total_two
+              if(list[i].dialysis_solution.anticoagulant == 3){
+                  total_one ++
+              }
+              this.total_one =total_one
+              
+              if(this.getBloodAccessOption(list[i].dialysis_solution.blood_access).indexOf('导管')!=-1){
+                   total_three++
+              }
+              this.total_three = total_three
+             
             }
             this.list = list
             this.dialysisSett = response.data.data.dialysisSett

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1719,6 +1719,30 @@ export default {
           }
       }
 
+      if(this.$store.getters.xt_user.org.id == 10579){
+        var date = new Date()
+          var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var day = date.getDate()
+
+          var hours = date.getHours()
+          var minites = date.getMinutes()
+
+          if (month < 10) {
+            month = '0' + month
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+      }
+
     },
     selectAllTemplateAdvice(selection) {
       console.log("params",selection)

src/xt_pages/dialysis/details/index.vue

@@ -1463,7 +1463,7 @@ export default {
           var filtedSchedules = []
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
             const schedule = originSchedules[s_i]
-            if (schedule.patient.name.indexOf(search_keyword) != -1) {
+            if ((schedule.patient.name.indexOf(search_keyword) != -1) || (schedule.patient.first_letter.indexOf(search_keyword) != -1)) {
               filtedSchedules.push(schedule)
               // break
             }

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -686,7 +686,7 @@ export default {
           this.$message.error("请选择需要记账的患者")
           return
         }
-        var that = this
+
         let obj = {
           patient_id: this.hisPatientInfo.id,
           diagnosis_time: this.record_date,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3786,20 +3786,16 @@ export default {
             console.log("-=======")
             for (let i = 0; i < this.zuobiao_project.length; i++) {
               for (let b = 0; b < this.tabProject.length; b++) {
-                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
+                if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 &&  this.zuobiao_project[i].bby06 == this.tabProject[b].specification_name){
                   console.log( this.zuobiao_project[i].lsqty)
                   console.log( this.tabProject[b].zuobiao_stock_num)
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
                   this.tabProject[b].price = this.zuobiao_project[i].price
-
                 }
               }
             }
           }
-
           this.allProject = this.tabProject
-
-
           // console.log('cccc',this.allProject);
         }
       })

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1634,7 +1634,6 @@ export default {
 
       }
       this.isloading = true
-      console.log('param32323232323323223233232332', params)
       getPatientInfo(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg)
@@ -1855,8 +1854,7 @@ export default {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
               }
-              console.log('is_medicine')
-              console.log(is_medicine)
+
 
               let index = i + 1
               let obj = {
@@ -2027,11 +2025,12 @@ export default {
                   obj.med_type = ''
 
                 } else {
-
                   obj.med_type = parseInt(prescription.med_type)
                 }
+
+
                 if (obj.med_type == 0 || obj.med_type == '') {
-                  if (this.org_id != 10206) {
+                  if (this.org_id != 10206 && this.org_id != 0) {
                     obj.med_type = 14
                   } else {
                     obj.med_type = 1
@@ -2055,6 +2054,10 @@ export default {
               }
               if (this.org_id != 10206) {
                 obj.med_type = 14
+              }else{
+
+                obj.med_type = 1
+
               }
               this.prescriptions.push(obj)
 
@@ -4215,7 +4218,7 @@ export default {
                         med_type: ''
 
                       }
-                      if (this.org_id != 10206) {
+                      if (this.org_id != 10206 && this.org_id != 0) {
                         if (prescription.med_type == 0 || prescription.med_type == '') {
 
                           obj.med_type = ''
@@ -4230,9 +4233,10 @@ export default {
 
                         }
                       }else{
-
-                        obj.med_type = prescription.med_type
-
+                        obj.med_type = parseInt(prescription.med_type)
+                        if (obj.med_type == 0 || obj.med_type == '') {
+                          obj.med_type = 1
+                        }
                       }
                       this.prescriptions.push(obj)
                     }
@@ -4252,7 +4256,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)
@@ -4921,9 +4925,13 @@ export default {
                       med_type: ''
 
                     }
-                    if (this.org_id != 10206) {
+                    if (this.org_id != 10206 && this.org_id != 0) {
 
                       obj.med_type = 14
+                    }else{
+
+                      obj.med_type = 1
+
                     }
 
                     this.prescriptions.push(obj)

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -2036,7 +2036,7 @@
               console.log("-=======")
               for (let i = 0; i < this.zuobiao_project.length; i++) {
                 for (let b = 0; b < this.tabProject.length; b++) {
-                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
+                  if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01 && this.zuobiao_project[i].bby06 == this.tabProject[b].specification_name){
                     this.tabProject[b]["zuobiao_stock_num"] = this.zuobiao_project[i].lsqty
                     this.tabProject[b].price = this.zuobiao_project[i].price
 

src/xt_pages/workforce/components/editTableData.vue

@@ -5545,10 +5545,12 @@ export default {
         this.patientList = this.all_patients;
       } else {
         this.patientList = [];
+        console.log("this.all_patients",this.all_patients)
         for (let i = 0; i < this.all_patients.length; i++) {
           if (
               this.all_patients[i].name.indexOf(this.keywords) != -1 ||
               this.all_patients[i].dialysis_no.indexOf(this.keywords) != -1
+              ||  this.all_patients[i].first_letter.indexOf(this.keywords) != -1
           ) {
             this.patientList.push(this.all_patients[i]);
           }