Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

src/pages/main/PatientBox.vue

@@ -56,7 +56,7 @@
               <span v-if="patient.patient.is_infectious==2" style="color:red">{{ patient.patient.name }}</span> 
               <span v-if="patient.patient.is_infectious!=2">{{ patient.patient.name }}</span> 
               <span class="num"
-                >{{ genderText(patient) }} | {{ age(patient) }}岁</span
+                >{{ genderText(patient) }} | {{ age(patient)>200 ? patient.patient.age : age(patient) }}岁</span
               >
             </h3>
             <div class="difficult" v-if="patient.patient.troble_shoot == 1">

src/pages/main/template/DialysisPrintOrderSeventyeight.vue

@@ -189,16 +189,15 @@
                     </div>
                   </div>
                 </div>
-
                 <div class="row" style="display: flex">
-                  <div class="inline_block" style="flex: 1;">
+                  <!-- <div class="inline_block" style="flex: 1;">
                     合并症：
                     <div class="under_line"
                       style=" width: 50%;text-align: center; white-space: normal;"
                     >
                       {{ predialysis.complication ? predialysis.complication : "/" }}
                     </div>
-                  </div>
+                  </div> -->
 
                   <!-- <div class="inline_block" style=" flex: 1">
                     跌倒评估：
@@ -1275,10 +1274,12 @@ export default {
         } if (this.predialysis.internal_fistula == "" || this.predialysis.catheter == "") {
           const obj6 = "透前内瘘,导管"
           checkDate.push(obj6)
-        } if (this.predialysis.complication == "" ) {
-          const obj7 = "合并症"
-          checkDate.push(obj7)
-        } if (this.predialysis.dry_weight == '' ) {
+        } 
+        // if (this.predialysis.complication == "" ) {
+        //   const obj7 = "合并症"
+        //   checkDate.push(obj7)
+        // } 
+        if (this.predialysis.dry_weight == '' ) {
           const obj8 = "干体重"
           checkDate.push(obj8)
         } if ( this. predialysis.weight_before == '') {

src/pages/main/template/DialysisPrintOrderSixty.vue

@@ -562,8 +562,8 @@
                       style="width: 70px; text-align: center"
                     >
                       {{
-                        prescription.displace_liqui_value
-                          ? prescription.displace_liqui_value
+                        prescription.replacement_total
+                          ? prescription.replacement_total
                           : "/"
                       }}
                     </div>

src/pages/main/template/DialysisPrintOrderSixtyeight.vue

@@ -828,31 +828,23 @@
                           <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                         </td>
                         <td height="35px" colspan="2" class="advice-name" style="padding-left:7px;" >
-                          <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>
-                                      <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> 
+                          <template v-if="advice.children!=undefined && (org_id==10551||org_id == 0)">
+                            <div v-for="(item,index) in advice.children" :key="index">
+                              {{ item.advice_name }}
+                              <span v-if="item.advice_desc">
+                                ({{ item.advice_desc}}{{ item.drug_spec_unit }})
+                              </span>
+                              <span v-if="item.prescribing_number">
+                                &nbsp;&nbsp; {{ item.prescribing_number}}
+                                {{ item.prescribing_number_unit }}
+                              </span>
+                              <span v-if="item.single_dose !=''">
+                                {{ item.single_dose}}{{ item.single_dose_unit }}
+                              </span>
+                              
                             </div>
-                          </div>
-                          <div v-else>
+                          </template>
+                          <div >
                             <span v-if="advice.parent_id > 0">---></span>
                             <span>{{ advice.advice_name }}</span>
                             <span v-if="advice && advice.advice_desc"
@@ -1820,7 +1812,13 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]['isShow'] = 2
         }
-
+        if(this.org_id ==10551 ||this.org_id ==0){
+          for(let i in this.doctor_advices){
+            if(this.doctor_advices[i].parent_id >0){
+              this.doctor_advices.splice(i,1)
+            }
+          }
+        }
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {
@@ -1917,72 +1915,8 @@ export default {
         }
         this.totollength = this.doctor_advices.length + this.monitors.length
         console.log(this.advice_groups)
-        if(this.org_id ==10551 ||this.org_id ==0){
-          var docArr = []
-          if(this.doctor_advices!=null && this.doctor_advices.length>0){
-            for(let i=0;i<this.doctor_advices.length;i++){
-              if(this.doctor_advices[i].delivery_way!='口服'){
-                  docArr.push(this.doctor_advices[i])
-              }
-            }
-          }
-          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
-            }
-            console.log("医嘱内容我我哦我我哦doctor_advices",this.doctor_advices)
-
-            let dataInfo = {}
-            this.doctor_advices.forEach((item, index) => {
-
-            let { groupPrescriptionId } = item
-            if (!dataInfo[groupPrescriptionId]) {
-              dataInfo[groupPrescriptionId] = {
-                groupPrescriptionId:item.groupPrescriptionId,
-                start_time:item.start_time,
-                advice_name:item.advice_name,
-                advice_desc:item.advice_desc,
-                parent_id:item.parent_id,
-                drug_spec_unit:item.drug_spec_unit,
-                prescribing_number:item.prescribing_number,
-                prescribing_number_unit:item.prescribing_number_unit,
-                single_dose:item.single_dose,
-                single_dose_unit:item.single_dose_unit,
-                delivery_way:item.delivery_way,
-                execution_frequency:item.execution_frequency,
-                remark:item.remark,
-                execution_time:item.execution_time,
-                execution_staff:item.execution_staff,
-                prescriptionChild:[],
-                advice_doctor:item.advice_doctor,
-              }
-            }
-            })
-            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 in newArr){
-              if(newArr[i].parent_id == undefined){
-                newArr.splice(i,1)
-              }
-            }
-            this.doctor_advices = []
-            this.doctor_advices = newArr
-            console.log("newArr",this.doctor_advices)
-          }
-        }
+        console.log("医嘱内容我我哦我我哦doctor_advices",this.doctor_advices)
+        
       } else {
         this.loading = false
         this.$message.error('请求数据失败')

src/pages/main/template/DialysisPrintOrdereighty.vue

@@ -754,21 +754,36 @@
                   <div class="under_line"
                     style="width: 50px; text-align: center"
                   >
-                    {{
+                    <!-- {{
                       afterdialysis.systolic_blood_pressure
                         ? afterdialysis.systolic_blood_pressure
                         : "/"
-                    }}
+                    }} -->
+                    
+                    <span v-if="monitors.length>0">
+                      {{ 
+                        monitors[monitors.length-1].systolic_blood_pressure ?
+                        monitors[monitors.length-1].systolic_blood_pressure :"/"
+                      }}
+                    </span>
+                      <span v-else>/</span>
                   </div>
                   /
                   <div class="under_line"
                     style="width: 50px; text-align: center"
                   >
-                    {{
+                    <!-- {{
                       afterdialysis.diastolic_blood_pressure
                         ? afterdialysis.diastolic_blood_pressure
                         : "/"
-                    }}
+                    }} -->
+                    <span v-if="monitors.length>0">
+                      {{ 
+                        monitors[monitors.length-1].diastolic_blood_pressure ?
+                          monitors[monitors.length-1].diastolic_blood_pressure :"/"
+                      }}
+                    </span>
+                    <span v-else>/</span>
                   </div>
                   mmHg
                 </div>

src/pages/main/template/DialysisPrintOrdereightytwo.vue

@@ -363,7 +363,7 @@
           <tbody>
               <tr style="line-height:20px;">
                 <td width="60">时间</td>
-                <td width="30">据测血压</td>
+                <td width="30">拒测血压</td>
                 <td width="60">BP<br/>mmHg</td>
                 <td width="40">脉搏<br/>次/分</td>
                 <td width="40">血流速<br/>ml/min</td>