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

@@ -101,19 +101,10 @@
             </div>
           </div>
           <div class="row">
-            
-            <div class="inline_block" style="margin-left: 10px">
+            <div style="">
               诊断：
-              <div
-                class="under_line"
-                style="
-                  width: 640px;
-                  text-align: left;
-                  word-break: break-all;
-                  word-wrap: break-word;
-                  display: inline-block;
-                  white-space: unset;
-                "
+              <div style="border-bottom: 1px solid black;width: 95%;text-align: left;word-break: break-all;
+                  word-wrap: break-word;display: inline-block;white-space: unset;"
               >
                 {{ record.patient.diagnose }}
               </div>
@@ -162,9 +153,9 @@
                       <div class="inline_block" style="flex: 1">
                         透析机型号：
                         <div class="under_line" style="width: 60%; text-align: center">
-                          {{record.assessment_before_dislysis.machine_type ? 
-                            record.assessment_before_dislysis.machine_type : ""
-                          }}
+                          <span v-if="record.bed_id !=0 && record.bed_id !=''">
+                            {{ getnumberlist(record.bed_id) }} 
+                          </span>
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -254,9 +245,9 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 2;">
+                      <div class="inline_block" style="flex: 1;">
                         血管通路：
-                        <div class="under_line" style="width: 70%;">
+                        <div class="under_line" style="width: 68%;white-space: normal;">
                           <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
                           {{
                             record.assessment_before_dislysis &&
@@ -272,7 +263,7 @@
                         </div>
                       </div>
                       
-                      <div class="inline_block" style="flex: 2">
+                      <div class="inline_block" style="flex: 1">
                         导管：
                         <div class="under_line"
                           style="width: 80%; text-align: center;white-space: normal;"
@@ -1026,12 +1017,9 @@
                         </div>
                         °C
                       </div>
-                      <div class="inline_block"
-                        style="margin-left: 10px; flex: 1"
-                      >
+                      <div class="inline_block" style="flex: 1">
                         P：
-                        <div
-                          class="under_line"
+                        <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
                           {{
@@ -1042,12 +1030,9 @@
                         </div>
                         次/分
                       </div>
-                      <div class="inline_block"
-                        style="margin-left: 10px; flex: 1"
-                      >
+                      <div class="inline_block" style="flex: 1">
                         R：
-                        <div
-                          class="under_line"
+                        <div class="under_line"
                           style="width: 50px; text-align: center"
                         >
                           {{
@@ -1058,9 +1043,7 @@
                         </div>
                         次/分
                       </div>
-                      <div class="inline_block"
-                        style="margin-left: 10px; flex: 1.5"
-                      >
+                      <div class="inline_block" style="flex: 1.5">
                         BP：
                         <div
                           class="under_line"
@@ -1085,35 +1068,13 @@
                         </div>
                         mmHg
                       </div>
-                      <div class="inline_block" style="flex: 1.5">
-                        实际治疗时间：
-                        <div class="under_line"
-                          style="width: 30px; text-align: center"
-                        >
-                          {{
-                            record.assessment_after_dislysis.actual_treatment_hour
-                              ? record.assessment_after_dislysis.actual_treatment_hour
-                              : "/"
-                          }}
-                        </div>
-                        h
-                        <div class="under_line"
-                          style="width: 30px; text-align: center"
-                        >
-                          {{
-                            record.assessment_after_dislysis.actual_treatment_minute
-                              ? record.assessment_after_dislysis.actual_treatment_minute
-                              : 0
-                          }}
-                        </div>
-                        min
-                      </div>
+                      
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
-                      <div class="inline_block" style="flex: 2.5">
+                      <div class="inline_block" style="flex: 2">
                         透析器凝血：
                         <div class="under_line"
-                          style=" width: 170px; text-align: center; white-space: normal;"
+                          style=" width: 60%; text-align: center; white-space: normal;"
                         >
                           {{ record.assessment_after_dislysis.cruor ? record.assessment_after_dislysis.cruor : "/" }}
                         </div>
@@ -1121,7 +1082,7 @@
                       <div class="inline_block" style="flex: 2">
                         内瘘：
                         <div class="under_line"
-                          style=" width: 170px; text-align: center; white-space: normal;"
+                          style=" width: 75%; text-align: center; white-space: normal;"
                         >
                           {{
                             record.assessment_after_dislysis.internal_fistula
@@ -1130,16 +1091,39 @@
                           }}
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 4">
+                      <div class="inline_block" style="flex: 2">
                         导管：
                         <div class="under_line"
-                          style="min-width: 120px; text-align: center"
+                          style="min-width: 75%; text-align: center"
                         >
                           {{
                             record.assessment_after_dislysis.catheter ? record.assessment_after_dislysis.catheter : "/"
                           }}
                         </div>
                       </div>
+                      <div class="inline_block" style="flex: 2">
+                        实际治疗时间：
+                        <div class="under_line"
+                          style="width: 30px; text-align: center"
+                        >
+                          {{
+                            record.assessment_after_dislysis.actual_treatment_hour
+                              ? record.assessment_after_dislysis.actual_treatment_hour
+                              : "/"
+                          }}
+                        </div>
+                        h
+                        <div class="under_line"
+                          style="width: 30px; text-align: center"
+                        >
+                          {{
+                            record.assessment_after_dislysis.actual_treatment_minute
+                              ? record.assessment_after_dislysis.actual_treatment_minute
+                              : 0
+                          }}
+                        </div>
+                        min
+                      </div>
                     </div>
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
@@ -1559,6 +1543,7 @@ export default {
         "腹痛",
       ],
       org_id: "",
+      number_list:[],
     };
   },
   created() {
@@ -1634,7 +1619,8 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
-
+          console.log('');
+          this.number_list = resp.data.numberList
           //华池
           if(this.org_id ==10440){
 
@@ -1872,7 +1858,7 @@ export default {
                 }
                 let objInfo = {}
                 this.records[i].his_advices.forEach((item,index)=>{
-                  console.log("itemwowowowowo",item)
+                  // console.log("itemwowowowowo",item)
                   let { new_groupno } = item
                   if(!objInfo[new_groupno]){
                     objInfo[new_groupno] = {
@@ -1922,8 +1908,6 @@ export default {
             }
           }
 
-
-
           console.log("时间我哦我",this.records)
 
           // this.records.forEach(o => {
@@ -2006,6 +1990,15 @@ export default {
         return ''
       }
     },
+    // 透析型号
+    getnumberlist(id){
+      const options = this.number_list
+      for(let i in options){
+        if(id == options[i].id){
+          return options[i].number_type
+        }
+      }
+    },
     getzongliang(id){
       const options = this.anticoagulantsConfit
       if(id != 0){
@@ -2138,7 +2131,6 @@ export default {
         return "";
       }
       if (key[id] in this.operatorMaps) {
-        console.log('key[id]this.operatorMaps1111',key,id,this.operatorMaps[key[id]].es_url);
         return this.operatorMaps[key[id]].es_url;
       } else {
         return "";
@@ -2216,26 +2208,26 @@ export default {
     // },
     getAge: function(val) {
 
-     if (val.id_card_no) {
-       var thisLen = val.id_card_no.length
-
-       var birth = ''
-       if (thisLen == 15) {
-         birth = '19' + val.id_card_no.substr(6, 6)
-       } else {
-         birth = val.id_card_no.substr(6, 8)
-       }
-       var birthtwo =
-         birth.substr(0, 4) +
-         '-' +
-         birth.substr(4, 2) +
-         '-' +
-         birth.substr(6, 2)
-
-       var age = jsGetAge(birthtwo, '-')
-       return age
-     }
-   },
+      if (val.id_card_no) {
+        var thisLen = val.id_card_no.length
+
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
+        } else {
+          birth = val.id_card_no.substr(6, 8)
+        }
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
+      }
+    },
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -88,10 +88,10 @@
           </div>
         </div>
         <div class="row">
-          <div class="inline_block" style="">
+          <div style="">
             诊断：
-            <div class="under_line"
-              style=" width: 640px; text-align: left;word-wrap: break-word;white-space: inherit;"
+            <div style="border-bottom: 1px solid black; width: 95%; text-align: left;word-wrap: break-word;
+                white-space: inherit;display: inline-block;"
             >
               {{ patientInfo.diagnose }}
             </div>
@@ -133,7 +133,12 @@
                     <div class="inline_block" style="flex: 1">
                       透析机型号：
                       <div class="under_line" style="width: 60%; text-align: center">
-                        {{predialysis.machine_type ? predialysis.machine_type : ""}}
+                        <span v-if="dialysisOrder && dialysisOrder.bed_id !=0">
+                          {{ getnumberlist(dialysisOrder.bed_id) }} 
+                        </span>
+                        <span v-else>
+                          {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) }} 
+                        </span>
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
@@ -224,16 +229,16 @@
                       </div>
                     </div>
 
-                    <div class="inline_block" style="flex: 2;">
+                    <div class="inline_block" style="flex: 1;">
                       血管通路：
-                      <div class="under_line" style="width: 70%;">
+                      <div class="under_line" style="width: 68%;white-space: normal;">
                         <!-- {{ QueryPartById(predialysis.blood_access_part_id) }} -->
                         {{ predialysis.blood_access_part_id }}
                         {{ predialysis.blood_access_part_opera_name }}
                       </div>
                     </div>
                     
-                    <div class="inline_block" style="flex: 2">
+                    <div class="inline_block" style="flex: 1">
                       导管：
                       <div class="under_line"
                         style="width: 80%; text-align: center;white-space: normal;"
@@ -725,9 +730,6 @@
                            <span v-if="it&& it.remark">{{ it.remark }}</span>&nbsp;&nbsp;&nbsp;
 
                          </span>
-
-
-
                         </td>
 
                         <td height="32px">
@@ -873,9 +875,7 @@
                       </div>
                       °C
                     </div>
-                    <div class="inline_block"
-                      style="margin-left: 10px; flex: 1"
-                    >
+                    <div class="inline_block" style="flex: 1">
                       P：
                       <div
                         class="under_line"
@@ -889,9 +889,7 @@
                       </div>
                       次/分
                     </div>
-                    <div class="inline_block"
-                      style="margin-left: 10px; flex: 1"
-                    >
+                    <div class="inline_block" style="flex: 1">
                       R：
                       <div
                         class="under_line"
@@ -905,9 +903,7 @@
                       </div>
                       次/分
                     </div>
-                    <div class="inline_block"
-                      style="margin-left: 10px; flex: 1.5"
-                    >
+                    <div class="inline_block"style="flex: 1.5">
                       BP：
                       <div
                         class="under_line"
@@ -932,38 +928,15 @@
                       </div>
                       mmHg
                     </div>
-                    <div class="inline_block" style="flex: 1.5">
-                      实际治疗时间：
-                      <div class="under_line"
-                        style="width: 30px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.actual_treatment_hour
-                            ? afterdialysis.actual_treatment_hour
-                            : "/"
-                        }}
-                      </div>
-                      h
-                      <div class="under_line"
-                        style="width: 30px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.actual_treatment_minute
-                            ? afterdialysis.actual_treatment_minute
-                            : 0
-                        }}
-                      </div>
-                      min
-                    </div>
                   </div>
 
                   <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
-                    <div class="inline_block" style="flex: 2.5">
+                    <div class="inline_block" style="flex: 2">
                       透析器凝血：
                       <div
                         class="under_line"
                         style="
-                          width: 170px;
+                          width: 60%;
                           text-align: center;
                           white-space: normal;
                         "
@@ -976,7 +949,7 @@
                       <div
                         class="under_line"
                         style="
-                          width: 170px;
+                          width: 75%;
                           text-align: center;
                           white-space: normal;
                         "
@@ -988,17 +961,39 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 4">
+                    <div class="inline_block" style="flex: 2">
                       导管：
-                      <div
-                        class="under_line"
-                        style="min-width: 120px; text-align: center"
+                      <div class="under_line"
+                        style="width: 75%; text-align: center;white-space: normal;"
                       >
                         {{
                           afterdialysis.catheter ? afterdialysis.catheter : "/"
                         }}
                       </div>
                     </div>
+                    <div class="inline_block" style="flex: 2">
+                      实际治疗时间：
+                      <div class="under_line"
+                        style="width: 30px; text-align: center"
+                      >
+                        {{
+                          afterdialysis.actual_treatment_hour
+                            ? afterdialysis.actual_treatment_hour
+                            : "/"
+                        }}
+                      </div>
+                      h
+                      <div class="under_line"
+                        style="width: 30px; text-align: center"
+                      >
+                        {{
+                          afterdialysis.actual_treatment_minute
+                            ? afterdialysis.actual_treatment_minute
+                            : 0
+                        }}
+                      </div>
+                      min
+                    </div>
                   </div>
 
                   <div class="row"
@@ -2300,7 +2295,8 @@ export default {
       org_id: 0,
       projectsOne: [],
       schedule_date_one:"",
-      new_doctor_advice_list:[]
+      new_doctor_advice_list:[],
+      number_list:[],
     };
   },
   methods: {
@@ -2827,6 +2823,7 @@ export default {
         } else {
           this.patientInfo.first_dialysis_date = "";
         }
+        this.number_list = response.data.data.numberList
         this.check = response.data.data.check;
         this.xtdate = response.data.data.xtdate;
         this.predialysis = response.data.data.PredialysisEvaluation;
@@ -3227,12 +3224,12 @@ export default {
                   }
                 }
 
-                console.log("newArrwowoow",newArr)
+                // console.log("newArrwowoow",newArr)
 
               this.new_doctor_advice_list = []
               this.new_doctor_advice_list.push(...newArr)
 
-              console.log("newArrwowoow",this.new_doctor_advice_list)
+              // console.log("newArrwowoow",this.new_doctor_advice_list)
             }
           }
         }
@@ -3444,6 +3441,15 @@ export default {
       }else{
         return ''
       }
+    },
+    // 透析型号
+    getnumberlist(id){
+      const options = this.number_list
+      for(let i in options){
+        if(id == options[i].id){
+          return options[i].number_type
+        }
+      }
     }
 
   },

src/xt_pages/outpatientTool/components/newSettlePrint.vue

@@ -397,7 +397,7 @@ export default {
           })
 
         }else if (
-          this.$store.getters.xt_user.org_id == 10480 || this.$store.getters.xt_user.org_id == 0
+          this.$store.getters.xt_user.org_id == 10480
         ) {
           const style =
             '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table tr td {padding: 2px;line-height: 30px;border: 1px solid black;text-align: center;}'
@@ -417,7 +417,17 @@ export default {
             style: style,
             scanStyles: false
           })
-        } else {
+        }else if(this.org_id == 10653 || this.org_id == 0){
+          const style =
+            '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 65%;}}}'
+          printJS({
+            printable: 'statement-print',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+        }
+        else {
           const style =
             '@media print {#statement-print{font-size:16px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}'
           printJS({
@@ -1705,7 +1715,7 @@ export default {
   },
 
   created() {
-    // this.org_id = this.$store.getters.xt_user.org_id
+    this.org_id = this.$store.getters.xt_user.org_id
     // this.getInfo(this.paramsObj.order_id, this.paramsObj)
   },