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

src/utils/tools.js

@@ -26,18 +26,18 @@ export function jsGetAge(strBirthday, splitstr) {
   var birthMonth = strBirthdayArr[1]
   var birthDay = strBirthdayArr[2]
 
-  console.log("birthYear",birthYear)
-  console.log("birthMonth",birthMonth)
-  console.log("birthDay",birthDay)
+  // console.log("birthYear",birthYear)
+  // console.log("birthMonth",birthMonth)
+  // console.log("birthDay",birthDay)
 
   var d = new Date()
   var nowYear = d.getFullYear()
   var nowMonth = d.getMonth() + 1
   var nowDay = d.getDate()
 
-  console.log("nowYear",nowYear)
-  console.log("nowMonth",nowMonth)
-  console.log("nowDay",nowDay)
+  // console.log("nowYear",nowYear)
+  // console.log("nowMonth",nowMonth)
+  // console.log("nowDay",nowDay)
 
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁
@@ -86,9 +86,9 @@ export function jsGetAgeOne(strBirthday,splitstr, nowYear,nowMonth,nowDay) {
   // console.log("anowMonth",anowMonth)
   // console.log("anowDay",anowDay)
 
-  console.log("brityYear666",strBirthdayArr[0])
-  console.log("birthMonth5656",strBirthdayArr[1])
-  console.log("birthDay5656",strBirthdayArr[2])
+  // console.log("brityYear666",strBirthdayArr[0])
+  // console.log("birthMonth5656",strBirthdayArr[1])
+  // console.log("birthDay5656",strBirthdayArr[2])
 
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -603,7 +603,6 @@ export default{
               for(let x=j+1; x<advicess.length;x++){
                 if(advicess[j].groupno == advicess[x].groupno){
                   this.advicePrint[i].advices[j]['arr'].push(advicess.splice(x,1))
-                  // advicess.splice(x,1)
                   x--
                 }
               }
@@ -622,7 +621,6 @@ export default{
               );
             }
           }
-
           // console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
           console.log("hisPatient", hisPatient);
@@ -664,7 +662,7 @@ export default{
       return name;
     },
     getTotalOne(id) {
-      console.log('999999999',this.prescriptions);
+      // console.log('999999999',this.prescriptions);
       var total = 0;
       var addtotal = 0;
       var zimuyao = 0;
@@ -699,7 +697,7 @@ export default{
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (id == this.prescriptions[i].id) {
           if (this.prescriptions[i].advices != null) {
-            console.log('123456789',this.prescriptions[i].advices);
+            // console.log('123456789',this.prescriptions[i].advices);
             
             for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
               total =
@@ -713,18 +711,7 @@ export default{
                     this.prescriptions[i].advices[a].arr[b][0].price *
                     this.prescriptions[i].advices[a].arr[b][0].prescribing_number
                   }
-                //   if(this.prescriptions[i].advices[a].arr.length<2){
-                //     zimuyao = zimuyao +
-                //     this.prescriptions[i].advices[a].arr[0].price *
-                //     this.prescriptions[i].advices[a].arr[0].prescribing_number
-                //   }else{
-                //     const child = this.prescriptions[i].advices[a].arr
-                //     for(let i in child){
-                //       zimuyao = zimuyao +
-                //       child[i][0].price *
-                //       child[i][0].prescribing_number
-                //     }
-                //   }
+                
                 }
             }
           }
@@ -759,13 +746,10 @@ export default{
 
     getDiagnosis(id) {
       let arr = id.split(",");
-      console.log('vvvvvv',arr);  
       var name = "";
-      const diagnoses = this.diagnoses.reverse()
-      console.log('bbbbbb12121',this.diagnoses);
+      const diagnoses = this.diagnoses
       for (let i = 0; i < diagnoses.length; i++) {
         if (arr.indexOf(String(diagnoses[i].id)) > -1) {
-          console.log('this.diagnoses[i].class_name',diagnoses[i].class_name);
           name += diagnoses[i].class_name + " ";
         }
       }