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_seventynine.vue

@@ -58,7 +58,7 @@
                   </tr>
 
                    <tr>
-                    <td colspan="3">
+                    <td colspan="2">
                       <div style="line-height:30px;">
                         上机前病情:
                         <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
@@ -66,6 +66,15 @@
                         <span>{{record.assessment_before_dislysis.symptom_before_dialysis_other}}</span>
                       </div>
                     </td>
+                    <td>
+                      <div style="line-height:30px;">
+                        BP:
+                        {{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : ""}} /
+                        {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : ""}}
+                        mmHg
+                      </div>
+                      
+                    </td>
                   </tr>
 
                   <tr>
@@ -170,14 +179,8 @@
                   <td colspan="3">
                     <div style="display: inline-block;line-height: 30px;">
                       血管通路:
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='内瘘' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='长期静脉导管' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='临时静脉导管' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!=''?true :false" showValue="其它">
-                      </label-box>
+                      {{ record.assessment_before_dislysis.blood_access_part_id ? record.assessment_before_dislysis.blood_access_part_id :'' }}
+                      {{ QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
                     </div>&nbsp;&nbsp;
                     <div style="display: inline-block;line-height: 30px;">
                       穿刺者:
@@ -586,8 +589,12 @@
                 for (let index = 0; index < delghTwo; index++) {
                   this.records[recordIndex].advices.push([])
                 }
+                for(let i  in this.records[recordIndex].his_advices){
+                  this.records[recordIndex].advices.unshift(this.records[recordIndex].his_advices[i])
+                }
               }
-
+              console.log('his_advices',this.records[recordIndex].advices);
+              
               var childMap = {}
               for (const index in this.records[recordIndex].advices) {
                 if (this.records[recordIndex].advices[index].parent_id == 0) {
@@ -620,7 +627,9 @@
                 }
                 advices.push(item)
               }
-
+              // advices = advices.concat(this.records[recordIndex].his_advices)
+              console.log('advices',advices);
+              
               var leftAdvice = []
               var rightAdvice = []
               var adlen = advices.length

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -32,7 +32,7 @@
             </tr>
 
             <tr>
-              <td colspan="3">
+              <td colspan="2">
                 <div style="line-height:30px;">
                   上机前病情:
                   <!-- <span v-if="predialysis.symptom_before_dialysis_other==''"> -->
@@ -44,6 +44,15 @@
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
                 </div>
               </td>
+              <td>
+                <div style="line-height:30px;">
+                  BP:
+                  {{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : ""}} /
+                  {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : ""}}
+                  mmHg
+                </div>
+                
+              </td>
             </tr>
 
             <tr>
@@ -151,13 +160,8 @@
             <td colspan="3">
               <div style="display: inline-block;line-height: 30px;">
                 血管通路:
-                <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name!='内瘘' &&
-                            predialysis.blood_access_part_opera_name!='长期静脉导管' &&
-                            predialysis.blood_access_part_opera_name!='临时静脉导管'?true :false" showValue="其它">
-                </label-box> -->
+          
+                {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id :'/' }}
                 {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name :'/' }}
               </div>&nbsp;&nbsp;
               <div style="display: inline-block;line-height: 30px;">

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -22,7 +22,7 @@
           org_id == 10028 ||
           org_id == 10278 ||
           org_id == 10610 ||
-          org_id==10537 
+          org_id==10537 ||  org_id == 0
         "
       >
         <printTwo :info="info" v-if="org_id == 9990"></printTwo>
@@ -67,7 +67,7 @@
       <!-- 盱眙恒硕 -->
       <printfivetheen :info="info" v-if="org_id == 10633"></printfivetheen>
       <!-- 顺有好 -->
-      <printSixtheen :info="info" v-if="org_id == 10697 || org_id == 0"></printSixtheen>
+      <printSixtheen :info="info" v-if="org_id == 10697"></printSixtheen>
 
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
@@ -743,7 +743,7 @@ export default {
         }
         if (
           this.org_id == 10138 ||
-          this.org_id == 10278 ||  this.org_id == 10610
+          this.org_id == 10278 ||  this.org_id == 10610 || this.org_id == 10537 || this.org_id == 0
         ) {
           getPrivateExpenses(params).then((response) => {
             if (response.data.state == 0) {
@@ -752,6 +752,8 @@ export default {
               return false
             } else {
               this.balanceAccounts = response.data.data
+              console.log( "this.balanceAccounts")
+              console.log(  this.balanceAccounts)
               let arr = []
               let obj = {
                 type: 1,

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -176,7 +176,7 @@
               <div style="display:flex;">
                   <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name.indexOf('（') > -1 ? balanceAccounts.patient.name.substring(0,balanceAccounts.patient.name.indexOf('（')) : balanceAccounts.patient.name : ''}}</span>
                   </div>
-                  <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient.gender == '1' ? '男' : '女'}}</span>
+                  <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient && balanceAccounts.patient.gender == '1' ? '男' : '女'}}</span>
                   </div>
                   <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span>
                   </div>

src/xt_pages/outpatientTool/components/detail.vue

@@ -31,12 +31,12 @@
             <el-select size="small" v-model="item_time_type" placeholder="请选择"
                        style="width:150px;margin-left:10px;" @change="changeTimeItem">
               <el-option
-                label="结算时间"
-                value="1">
+                label="处方时间"
+                value="0">
               </el-option>
               <el-option
-                label="处方时间"
-                value="2">
+                label="结算时间"
+                value="1">
               </el-option>
             </el-select>
 

src/xt_pages/outpatientTool/components/gather.vue

@@ -28,13 +28,15 @@
                    style="width:150px;margin-left:10px;" @change="changeTimeItem">
 
           <el-option
-            label="结算时间"
-            value="1">
+            label="处方时间"
+            value="0">
           </el-option>
+
           <el-option
-            label="处方时间"
-            value="2">
+            label="结算时间"
+            value="1">
           </el-option>
+
         </el-select>
         <el-date-picker
           v-model="chargeDate"