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

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -193,7 +193,7 @@
                 v-for="(item, i) in way_arr"
                 class="under_line"
                 v-if="record.receive_assessment.way == item.id"
-                style="width: 180px; text-align: left"
+                style="width: 130px; text-align: left"
               >
                 {{ item.name }}
               </div>
@@ -1821,48 +1821,65 @@
                               </span>
                             </td>
 
-                            <td
-                              height="26px"
+                            <td height="26px"
                               colspan="2"
                               class="advice-name"
                               style="padding-left: 7px"
-                            >
-                              <span v-if="advice[0].parent_id > 0">---></span>
-                              <span>{{ advice[0].advice_name }}</span>
-
-                              <span
-                                v-if="
-                                  advice[0] &&
-                                  advice[0].advice_desc != undefined
-                                "
-                              >
-                                <!-- ({{ advice[0].advice_desc
-                                }}{{ advice[0].drug_spec_unit }} ) -->
-                              </span>
-
-                              <span v-if="advice[0].prescribing_number"
-                                >&nbsp;&nbsp; {{ advice[0].prescribing_number
-                                }}{{ advice[0].prescribing_number_unit }}</span
-                              >
-                              <span v-if="advice[0].single_dose != 0">
+                            > 
+                              <div v-if="org_id==10551 || org_id ==0">
+                                <div :rowspan="advice[0].prescriptionChild.length"  v-for="(it,key)  in advice[0].prescriptionChild" style="border: none;">
+                                  <div style="border: none;">
+                                    <span>{{ it.advice_name }}</span>
+                                          <span v-if="it && it.advice_desc"
+                                            >({{ it.advice_desc
+                                            }}{{ it.drug_spec_unit }})</span
+                                          >
+                                          <span v-if="it.prescribing_number"
+                                            >&nbsp;&nbsp; {{ it.prescribing_number
+                                            }}{{ it.prescribing_number_unit }}</span
+                                          >
+                                          <span v-if="it.single_dose != 0"
+                                            >{{ it.single_dose
+                                            }}{{ it.single_dose_unit }}</span
+                                          >
+                                          <span>{{ it.delivery_way}}</span>
+                                          <span>{{
+                                            it.execution_frequency
+                                          }}</span>
+                                          <span v-if="it.remark !=''"
+                                            >({{ it.remark }})</span
+                                          >
+                                  </div>
+                                </div>
+                              </div>
+                              <div v-else>
+                                <span v-if="advice[0].parent_id > 0"></span>
+                                <span>{{ advice[0].advice_name }}</span>
+
+                                <span v-if="advice[0].prescribing_number"
+                                  >&nbsp;&nbsp; {{ advice[0].prescribing_number
+                                  }}{{ advice[0].prescribing_number_unit }}</span
+                                >
+                                <span v-if="advice[0].single_dose != 0">
 
-                                <span v-if="advice[0].advice_name!='血液透析滤过'&& advice[0].advice_name!='血液透析' && advice[0].advice_name!='电脑血糖监测'"> {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}</span>
-                                </span
-                              >
+                                  <span v-if="advice[0].advice_name!='血液透析滤过'&& advice[0].advice_name!='血液透析' && advice[0].advice_name!='电脑血糖监测'"> {{ advice[0].single_dose}}{{ advice[0].single_dose_unit }}</span>
+                                  </span
+                                >
 
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].delivery_way
-                              }}</span>
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].execution_frequency
-                              }}</span>
-                              <span
-                                v-if="
-                                  advice[0].parent_id == 0 &&
-                                  advice[0].remark.length > 0
-                                "
-                                >({{ advice[0].remark }})</span
-                              >
+                                <span v-if="advice[0].parent_id == 0">{{
+                                  advice[0].delivery_way
+                                }}</span>
+                                <span v-if="advice[0].parent_id == 0">{{
+                                  advice[0].execution_frequency
+                                }}</span>
+                                <!-- <span
+                                  v-if="
+                                    advice[0].parent_id == 0 &&
+                                    advice[0].remark.length > 0
+                                  "
+                                  >({{ advice[0].remark }})</span
+                                > -->
+                              </div>
                             </td>
 
                             <td height="35px">
@@ -3264,6 +3281,8 @@ export default {
             } else {
               dlegh = 0;
             }
+            
+            
             if (dlegh > 0) {
               if (
                 typeof this.records[recordIndex].monitor_records ===
@@ -3276,7 +3295,6 @@ export default {
                 this.records[recordIndex].monitor_records.push([]);
               }
             }
-
             this.records[recordIndex].isShowZero = false;
             if (this.records[recordIndex].patient.user_org_id == 9535) {
               this.records[recordIndex].isShowZero = true;
@@ -3300,9 +3318,12 @@ export default {
                 this.records[recordIndex].advices.push([]);
               }
             }
-
+            console.log('22222222',this.records[recordIndex].advices);
+            
             var childMap = {};
             for (const index in this.records[recordIndex].advices) {
+              
+              this.records[recordIndex].advices[index].prescriptionChild = []
               if (this.records[recordIndex].advices[index].parent_id == 0) {
                 continue;
               }
@@ -3320,6 +3341,7 @@ export default {
             }
 
             var advices = [];
+            // var advices2 = []
             for (const index in this.records[recordIndex].advices) {
               if (this.records[recordIndex].advices[index].parent_id > 0) {
                 continue;
@@ -3329,10 +3351,25 @@ export default {
                 item.children = childMap[item.id];
               } else {
                 item.children = [];
+                this.records[recordIndex].advices[index].prescriptionChild.push(item) 
               }
               advices.push(item);
+              
             }
-
+            var arr = []
+            for(let i=0;i<advices.length;i++){
+              for(let j=i+1;j<advices.length;j++){
+                if(advices[i].id !=undefined){
+                  if(advices[i].groupno == advices[j].groupno){
+                    arr.push(advices[j])
+                    advices[i].prescriptionChild.push(advices[j])
+                    advices.splice(j,1)
+                  }
+                }
+              }
+            }
+            console.log('3333333333',advices,arr);
+            
             var leftAdvice = [];
             var rightAdvice = [];
             var adlen = advices.length;

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1921,14 +1921,14 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          if(this.org_id ==10206){
-            this.template_id = 80
-            // this.template_id = 81
-            console.log("templage-i233232323232322323233232323223",this.template_id)
-          }else{
+          // if(this.org_id ==10206){
+          //   this.template_id = 80
+          //   // this.template_id = 81
+          //   console.log("templage-i233232323232322323233232323223",this.template_id)
+          // }else{
             var template = response.data.data.template;
             this.template_id = template.template_id;
-          }
+          // }
 
         }
       });

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2701,13 +2701,13 @@ export default {
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
 
-          if(this.org_id !=10206 && this.org_id !=0){
+          // if(this.org_id !=10206 ){//&& this.org_id !=0
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
             this.org_template_info = response.data.data.org_template_info;
-          }else{
-            this.org_template_info = response.data.data.org_template_info;
-            this.org_template_info.template_id= 82
-          }
+          // }else{
+          //   this.org_template_info = response.data.data.org_template_info;
+          //   this.org_template_info.template_id= 82
+          // }
 
 
           console.log('kkkkkkk222222',this.org_template_info);

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -2049,56 +2049,46 @@ export default {
         if(this.dialysisOrder !=undefined && this.dialysisOrder.end_time != 0){
           if(this.monitors.length >0){
             for(let i in this.monitors){
-              console.log('1111111111',this.dialysisOrder.end_time,this.monitors[i].operate_time);
-              if(this.monitors[i].blood_flow_volume ==0 && this.dialysisOrder.end_time >= this.monitors[i].operate_time){
-                const obj55 = '监测第'+((i*1)+1)+'行血流量'
-                checkDate.push(obj55)
-              } if((this.monitors[i].venous_pressure ==0 ||
-                  this.monitors[i].transmembrane_pressure ==0 ) && this.dialysisOrder.end_time >= this.monitors[i].operate_time
+              if(this.dialysisOrder.end_time >= this.monitors[i].operate_time && 
+                this.monitors[i].dispose.indexOf('停') <=-1 && this.monitors[i].ultrafiltration_rate!=0
               ){
-                const obj56 = '监测第'+((i*1)+1)+'行静脉压/跨膜压'
-                checkDate.push(obj56)
-              } if(this.monitors[i].ultrafiltration_rate ==0 && this.dialysisOrder.end_time >= this.monitors[i].operate_time){
-                const obj57 = '监测第'+((i*1)+1)+'行超滤率'
-                checkDate.push(obj57)
-              } if(this.monitors[i].ultrafiltration_volume == 0 && i !=0 && 
-                  this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj53 = '监测第'+((i*1)+1)+'行超滤量'
-                checkDate.push(obj53)
-              } if(this.monitors[i].replacement_rate ==0 && this.prescription.mode =='HDF'&& 
-                  this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj58 = '监测第'+((i*1)+1)+'行置换率'
-                checkDate.push(obj58)
-              } if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0
-                  && this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj54 = '监测第'+((i*1)+1)+'行置换量'
-                checkDate.push(obj54)
-              } if(this.monitors[i].sodium_concentration ==0 && 
-                  this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                // this.monitors[i].temperature == 0
-                const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
-                checkDate.push(obj59)
-              } if(this.monitors[i].pulse_frequency ==0  && 
-                  this.monitors[i].operate_time <= this.dialysisOrder.end_time
-              ){
-                const obj60 = '监测第'+((i*1)+1)+'行脉搏'
-                checkDate.push(obj60)
-              } if(this.monitors[i].breathing_rate ==0 && 
-                this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj61 = '监测第'+((i*1)+1)+'行呼吸'
-                checkDate.push(obj61)
-              } if((this.monitors[i].systolic_blood_pressure ==0 ||
-                    this.monitors.diastolic_blood_pressure==0) && 
-                    this.dialysisOrder.end_time >= this.monitors[i].operate_time
-              ){
-                const obj62 = '监测第'+((i*1)+1)+'行血压'
-                checkDate.push(obj62)
+                  console.log('1111111111',this.dialysisOrder.end_time,this.monitors[i].operate_time);
+                if(this.monitors[i].blood_flow_volume ==0 ){
+                  const obj55 = '监测第'+((i*1)+1)+'行血流量'
+                  checkDate.push(obj55)
+                } if((this.monitors[i].venous_pressure ==0 ||
+                    this.monitors[i].transmembrane_pressure ==0 ) ){
+                  const obj56 = '监测第'+((i*1)+1)+'行静脉压/跨膜压'
+                  checkDate.push(obj56)
+                } if(this.monitors[i].ultrafiltration_rate ==0 ){
+                  const obj57 = '监测第'+((i*1)+1)+'行超滤率'
+                  checkDate.push(obj57)
+                } if(this.monitors[i].ultrafiltration_volume == 0 && i !=0 ){
+                  const obj53 = '监测第'+((i*1)+1)+'行超滤量'
+                  checkDate.push(obj53)
+                } if(this.monitors[i].replacement_rate ==0 && this.prescription.mode =='HDF'){
+                  const obj58 = '监测第'+((i*1)+1)+'行置换率'
+                  checkDate.push(obj58)
+                } if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
+                  const obj54 = '监测第'+((i*1)+1)+'行置换量'
+                  checkDate.push(obj54)
+                } if(this.monitors[i].sodium_concentration ==0 ){
+                  // this.monitors[i].temperature == 0
+                  const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
+                  checkDate.push(obj59)
+                } if(this.monitors[i].pulse_frequency ==0  ){
+                  const obj60 = '监测第'+((i*1)+1)+'行脉搏'
+                  checkDate.push(obj60)
+                } if(this.monitors[i].breathing_rate ==0 ){
+                  const obj61 = '监测第'+((i*1)+1)+'行呼吸'
+                  checkDate.push(obj61)
+                } if((this.monitors[i].systolic_blood_pressure ==0 ||
+                      this.monitors.diastolic_blood_pressure==0) ){
+                  const obj62 = '监测第'+((i*1)+1)+'行血压'
+                  checkDate.push(obj62)
+                }
               }
+              
 
             }
           }

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1564,7 +1564,7 @@
                           colspan="2" class="advice-name"
                           style="padding-left: 7px"
                         >
-                          <div v-if="org_id==10551 || org_id==0">
+                          <div v-if="org_id==10551 || org_id ==0">
                             <div :rowspan="advice.prescriptionChild.length"  v-for="(it,key)  in advice.prescriptionChild" style="border: none;">
                               <div style="border: none;">
                                 <span>{{ it.advice_name }}</span>
@@ -1584,7 +1584,7 @@
                                       <span>{{
                                         it.execution_frequency
                                       }}</span>
-                                      <span v-if="it.remark.length > 0"
+                                      <span v-if="it.remark !=''"
                                         >({{ it.remark }})</span
                                       >
                               </div>
@@ -3830,13 +3830,18 @@ export default {
             let newArr = Object.values(dataInfo)
 
             if(newArr!=null && newArr.length >0){
-            for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<this.doctor_advices.length;j++){
-                if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
-                    newArr[i].prescriptionChild.push(this.doctor_advices[j])
+              for(let i=0;i<newArr.length;i++){
+                for(let j=0;j<this.doctor_advices.length;j++){
+                  if(newArr[i].groupPrescriptionId == this.doctor_advices[j].groupPrescriptionId){
+                      newArr[i].prescriptionChild.push(this.doctor_advices[j])
+                  }
                 }
               }
             }
+            for(let i in newArr){
+              if(newArr[i].parent_id == undefined){
+                newArr.splice(i,1)
+              }
             }
             console.log("newArr",newArr)
             this.doctor_advices = []

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -60,13 +60,16 @@
             <div class="inline_block" style="margin-right:30px;">
               血液净化器类型
               <div class="inline_block under_line" style="width:150px;text-align: center;">
-                <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
+                <!-- <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
                   {{
                     prescription.dialyzer_perfusion_apparatus
                       ? prescription.dialyzer_perfusion_apparatus
                       : ""
                   }}
-                </span>
+                </span> -->
+
+                
+              
                 <span v-if="prescription.dialysis_dialyszers !=''">
                   {{
                     prescription.dialysis_dialyszers
@@ -74,10 +77,10 @@
                       : "/"
                   }}
                 </span>
-                <span v-if="prescription.dialysis_strainer !=''">
+                <span v-if="prescription.dialysis_irrigation !=''">
                   {{
-                    prescription.dialysis_strainer?
-                    prescription.dialysis_strainer:""
+                    prescription.dialysis_irrigation?
+                    prescription.dialysis_irrigation:""
                   }}
                 </span>
               </div>

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -328,7 +328,7 @@
                 </tr>
             </table>
           </div>
-          <div style="margin-bottom: 10px;" v-if="org_id!=0&& org_id!=10375">
+          <div style="margin-bottom: 10px;" v-if="org_id!=10375">
             <table class="table" border="1"
               style="border-collapse: collapse;text-align: center;width: 100%;"
             >
@@ -352,7 +352,7 @@
                   height="32px"
                   class="advice-name"
                   style="padding-left: 7px"
-                 
+
                 >
                  <div :rowspan="advice.prescriptionChild.length"  v-for="(it,key)  in advice.prescriptionChild" style="border: none;">
                    <div style="border: none;">
@@ -373,7 +373,8 @@
                           <span>{{
                             it.execution_frequency
                           }}</span>
-                          <span v-if="it.remark.length > 0"
+                          
+                          <span v-if="it.remark !=''"
                             >({{ it.remark }})</span
                           >
                    </div>
@@ -466,7 +467,7 @@
                 </td>
                 <td>
                   <span>透析器凝血：
-                   
+
                     {{
                      afterdialysis &&
                      afterdialysis
@@ -474,19 +475,19 @@
                         : "/"
                      }}
 
-                 
+
                   </span>
                 </td>
                 <td>
                   <span>实际置换量：
-                   
+
                     {{
                       afterdialysis.actual_displacement
                         ? afterdialysis.actual_displacement
                         : ""
                      }}L
 
-                 
+
                   </span>
                 </td>
               </tr>
@@ -526,7 +527,7 @@
                 <td width="5%">医生：</td>
                 <td width="10%">
                   <!-- <span>{{getAdminUser(prescription.creater)}}</span> -->
-                  <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor>0">{{ getAdminUser(doctor_advices[0].advice_doctor) }}</span> 
+                  <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor>0">{{ getAdminUser(doctor_advices[0].advice_doctor) }}</span>
                   <span v-if="doctor_advices[0]!=null&&doctor_advices[0].advice_doctor==0">{{getAdminUser(prescription.creater)}}</span>
                   <!-- <img style="height:65px;width: 90%;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else> -->
                 </td>
@@ -1302,6 +1303,8 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
+
+
         this.doctor_advices =
           response.data.data.advices == null ? [] : response.data.data.advices;
         for (let index = 0; index < this.doctor_advices.length; index++) {
@@ -1351,23 +1354,23 @@ export default {
              }
            }
         }
-        this.doctor_advices = [] 
+        this.doctor_advices = []
         this.doctor_advices = docArr
-      
 
 
-       
-          
+
+
+
         if(this.doctor_advices!=null && this.doctor_advices.length>0){
 
             for(let i=0;i<this.doctor_advices.length;i++){
-              this.doctor_advices[i].groupPrescriptionId = this.doctor_advices[i].prescription_id + "_"  + this.doctor_advices[i].groupno 
+              this.doctor_advices[i].groupPrescriptionId = this.doctor_advices[i].prescription_id + "_"  + this.doctor_advices[i].groupno
             }
             console.log("医嘱内容我我哦我我哦doctor_advices",this.doctor_advices)
 
             let dataInfo = {}
             this.doctor_advices.forEach((item, index) => {
-        
+
             let { groupPrescriptionId } = item
             if (!dataInfo[groupPrescriptionId]) {
               dataInfo[groupPrescriptionId] = {
@@ -1392,7 +1395,7 @@ export default {
             }
           })
           let newArr = Object.values(dataInfo)
-          
+
           if(newArr!=null && newArr.length >0){
              for(let i=0;i<newArr.length;i++){
                for(let j=0;j<this.doctor_advices.length;j++){
@@ -1403,12 +1406,16 @@ export default {
              }
           }
           console.log("newArr",newArr)
-            
+          for(let i in newArr){
+            if(newArr[i].parent_id == undefined){
+              newArr.splice(i,1)
+            }
+          }
           this.doctor_advices = []
           this.doctor_advices = newArr
-         
+
         }
-        
+
 
       } else {
         this.loading = false;

src/xt_pages/outpatientCharges/statementTemplate/printSeventheen.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="statement-print" class="statement-print">
-     <div class="statementTitle">濉溪杏康血液透析中结算单</div>
+     <div class="statementTitle">濉溪杏康血液透析中心结算单</div>
      <!-- <div style="text-align: center;font-size: 17px;">门 &nbsp;诊 &nbsp;结 &nbsp;帐 &nbsp;票 &nbsp;据</div> -->
       <div style="width: 100%;border-bottom: 1px dashed black;padding-bottom: 5px;">
         <div style="width: 100%;display: flex;padding: 5px;">

src/xt_pages/user/components/PatientSidebar.vue

@@ -433,7 +433,7 @@ export default {
       fetchAllList().then(response => {
         if (response.data.state == 1) {
           if(this.org_id ==10191){
-             var patients = response.data.data.patients
+             var patients = response.data.data.patientsOne
             //  console.log("patients",patients)
              for(let i=0;i<patients.length;i++){
                if(patients[i].lapseto ==1){
@@ -442,7 +442,7 @@ export default {
 
              }
           }else{
-            this.patientsList = response.data.data.patients
+            this.patientsList = response.data.data.patientsOne
             console.log("哈哈哈哈哈哈",this.patientsList)
           }
 

src/xt_pages/user/components/PatientSidebar_ord.vue

@@ -434,7 +434,7 @@
           if (response.data.state == 1) {
             if(this.org_id ==10191){
                var patients = response.data.data.patientsOne
-              //  console.log("patients",patients)
+              console.log("patients",patients)
                for(let i=0;i<patients.length;i++){
                  if(patients[i].lapseto ==1){
                   this.patientsList.push(patients[i])