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

src/xt_pages/DepositManagement/print/printindex.vue

@@ -17,31 +17,27 @@
               <div style="display: flex; padding: 0 30px">
                 <div style="display: flex">
                   <div>收款单位：</div>
-                  <span>{{name}}</span>
-                  <div
-                    style="min-width: 224px; border-bottom: 1px solid #000"
-                  ></div>
+                  <div style="min-width: 224px; border-bottom: 1px solid #000">
+                    <span>{{name}}</span>
+                  </div>
                 </div>
                 <div style="display: flex">
                   <div>收款方式：</div>
-                  <span>现金</span>
                   <div
                     style="min-width: 224px; border-bottom: 1px solid #000"
-                  ></div>
+                  ><span>现金</span>
+                  </div>
                 </div>
               </div>
               <div style="display: flex; padding: 0 30px">
                 <div>人民币：</div>
-                ￥{{money}}
                 <div
                   style="min-width: 225px; border-bottom: 1px solid #000"
-                ></div>
+                >￥{{money}}</div>
               </div>
               <div style="display: flex; padding: 0 30px">
                 <div>收款是由：</div>
-<!--                <span>{{ li }}</span>-->
-                <span>预交押金</span>
-                <div style="width: 86%; border-bottom: 1px solid #000"></div>
+                <div style="width: 86%; border-bottom: 1px solid #000"><span>预交押金</span></div>
               </div>
             </div>
           </div>
@@ -95,7 +91,7 @@ export default {
     },
     to_print() {
       const style =
-        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .print h2{text-align: center;} .print p{width: 85%;text-align: right;} .content{width: 70%;height: 250px;border: 1px solid #000;margin: 20px auto;display: flex;flex-direction: column;justify-content: space-evenly;}';
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .print h2{text-align: center;} .print p{width: 85%;text-align: right;} .content{width: 70%;height: 250px;border: 1px solid #000;margin: 20px auto;display: flex;flex-direction: column;justify-content: space-evenly;white-space: nowrap;}';
       printJS({
         printable: "dialysis-print-box",
         type: "html",
@@ -130,5 +126,6 @@ export default {
   display: flex;
   flex-direction: column;
   justify-content: space-evenly;
+  white-space: nowrap;
 }
 </style>

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -350,14 +350,21 @@
                                     .blood_access_part_id
                                 : 0
                           }}
-                          {{
+                          <!-- {{
                             record.assessment_before_dislysis &&
                             record.assessment_before_dislysis
                               .blood_access_part_opera_name
                               ? record.assessment_before_dislysis
                                   .blood_access_part_opera_name
                               : ""
+                          }} -->
+                          <span v-for="(item, index) in arrtwo" :key="index">
+                          {{
+                           record.blood_access_part_opera_id == item.id
+                         ? item.name
+                            : ""
                           }}
+                        </span>
                         </div>
                       </div>
                       <div class="inline_block" style="flex:1;">
@@ -1135,7 +1142,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
-                          <td style="font-size: 16px" width="10%" v-if="org_id == 10223">核对者</td>
+                          <td style="font-size: 16px" width="10%" v-if="org_id == 10223 ||org_id == 0||org_id == 4">核对者</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
                         <tr
@@ -1143,54 +1150,51 @@
                           :key="advice_index"
                         >
                           <td height="35px">
-                            <span v-if="advice[0].start_time">
-                              {{ getTime(advice[0].start_time, "{h}:{i}") }}
+                            <span v-if="advice.start_time">
+                              {{ getTime(advice.start_time, "{h}:{i}") }}
                             </span>
-                            <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
                           </td>
+                          
                           <td
                             height="35px"
                             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[advice_index] && advice[0].advice_desc != undefined">
-                               ({{ advice[0].advice_desc}}{{ advice[0].drug_spec_unit }} )
+                            <span v-if="advice.parent_id > 0">---></span>
+                            <span>{{ advice.advice_name }}</span>
+                            <span v-if=" advice[advice_index] && advice.advice_desc != undefined">
+                               ({{ advice.advice_desc}}{{ advice.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.prescribing_number"
+                              >&nbsp;&nbsp; {{ advice.prescribing_number
+                              }}{{ advice.prescribing_number_unit }}</span
                             >
-                            <span v-if="advice[0].single_dose != 0">
-                              {{ advice[0].single_dose
-                              }}{{ advice[0].single_dose_unit }}</span
+                            <span v-if="advice.single_dose != 0">
+                              {{ advice.single_dose
+                              }}{{ advice.single_dose_unit }}</span
                             >
                             <span
                               v-if="
-                                advice[0].parent_id == 0 &&
-                                  advice[0].children.length == 0
+                                advice.parent_id == 0
                               "
-                              >{{ advice[0].delivery_way }}</span
+                              >{{ advice.delivery_way }}</span
                             >
                             <span
                               v-if="
-                                advice[0].parent_id == 0 &&
-                                  advice[0].children.length == 0
+                                advice.parent_id == 0 
                               "
-                              >{{ advice[0].execution_frequency }}</span
+                              >{{ advice.execution_frequency }}</span
                             >
                             <span
                               v-if="
-                                advice[0].parent_id == 0 &&
-                                  advice[0].children &&
-                                  advice[0].children.length == 0 &&
-                                  advice[0].remark.length > 0
+                                advice.parent_id ==0 &&
+                                  advice.remark.length > 0
                               "
-                              >({{ advice[0].remark }})</span
+                              >({{ advice.remark }})</span
                             >
                           </td>
+
                           <td height="35px">
                             <span
                               v-if="
@@ -1234,13 +1238,15 @@
                               style="height: 40px;"
                             />
                           </td>
+
+
                           <td height="35px">
-                            <span v-if="advice[0].execution_time">{{
-                              getTime(advice[0].execution_time, " {h}:{i}")
+                            <span v-if="advice.execution_time">{{
+                              getTime(advice.execution_time, " {h}:{i}")
                             }}</span>
                           </td>
 
-                          <td height="35px" v-if="org_id == 10223">
+                          <td height="35px" v-if="org_id == 10223||org_id == 0||org_id == 4">
                             <span
                               v-if="
                                 setAdminUserES(advice[0], 'checker') ==
@@ -2017,7 +2023,7 @@ export default {
       precaution_arr: [],
       intake_arr: [],
       nutrition_arr: [],
-
+      arrtwo: [],
       records: [
         // 模拟有多条数据
         // {
@@ -2079,6 +2085,84 @@ export default {
       "hemodialysis",
       "vascular_access_desc"
     );
+    var arrtwo = [];
+    for (let i = 0; i < bloodAccessParOpera.length; i++) {
+      if (bloodAccessParOpera[i].name == "内瘘波动及震颤-存在") {
+        bloodAccessParOpera[i].name = "存在";
+        arr.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "内瘘波动及震颤-减弱") {
+        bloodAccessParOpera[i].name = "减弱";
+        arr.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "内瘘波动及震颤-消失") {
+        bloodAccessParOpera[i].name = "消失";
+        arr.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "动脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "动静脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套股静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套锁骨下静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "带隧道带绦纶套颈内静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套股静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套锁骨下静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "无绦纶套颈内静脉导管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "直线型移植血管动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "自体动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "袢型移植血管动静脉内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "静脉直穿") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "AVG") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "自体内瘘") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "AVF") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "颈内静脉") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "股静脉") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "人造血管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      if (bloodAccessParOpera[i].name == "移植血管") {
+        arrtwo.push(bloodAccessParOpera[i]);
+      }
+      this.arrtwo = arrtwo;
+    }
+    console.log("arrtwo", arrtwo)
+
     for (var key in bloodAccessParOpera) {
       this.bloodAccessParOpera[bloodAccessParOpera[key].id] =
         bloodAccessParOpera[key];
@@ -2117,8 +2201,10 @@ export default {
       .then(rs => {
         var resp = rs.data;
         if (resp.state == 1) {
-          this.records = this.records.concat(resp.data.schedules);
-          console.log("记录", this.records);
+          // this.records = this.records.concat(resp.data.schedules);
+          // console.log(rs,'rs')
+          this.records = resp.data.schedules;
+          console.log("记录this.records", this.records);
 
           for (const recordIndex in this.records) {
             var dlegh = 0;
@@ -2149,61 +2235,82 @@ export default {
             }
 
             var delghTwo = 0;
+            console.log(this.records[recordIndex].advices,'长度')
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 12
+              this.records[recordIndex].advices.length < 6
             ) {
-              delghTwo = 12 - this.records[recordIndex].advices.length;
+              delghTwo = 6 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }
 
             if (delghTwo > 0) {
+              console.log(typeof this.records[recordIndex].advices,'typeof this.records[recordIndex].advices')
               if (
                 typeof this.records[recordIndex].advices === "undefined" ||
                 this.records[recordIndex].advices == null
               ) {
-                this.records[recordIndex].advices = [];
+                for (let index = 0; index < delghTwo; index++) {
+                this.records[recordIndex].advices.push([]);
+              }
               }
               for (let index = 0; index < delghTwo; index++) {
                 this.records[recordIndex].advices.push([]);
               }
             }
 
-            var childMap = {};
-            for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id == 0) {
-                continue;
-              }
-              if (
-                !(
-                  this.records[recordIndex].advices[index].parent_id in childMap
-                )
-              ) {
-                childMap[
-                  this.records[recordIndex].advices[index].parent_id
-                ] = [];
-              }
-              childMap[this.records[recordIndex].advices[index].parent_id].push(
-                this.records[recordIndex].advices[index]
-              );
-            }
+            // var childMap = {};
+            // for (const index in this.records[recordIndex].advices) {
+            //   if (this.records[recordIndex].advices[index].parent_id == 0) {
+            //     continue;
+            //   }
+            //   if (
+            //     !(
+            //       this.records[recordIndex].advices[index].parent_id in childMap
+            //     )
+            //   ) {
+            //     childMap[
+            //       this.records[recordIndex].advices[index].parent_id
+            //     ] = [];
+            //   }
+            //   childMap[this.records[recordIndex].advices[index].parent_id].push(
+            //     this.records[recordIndex].advices[index]
+            //   );
+            // }
+            // console.log(childMap,'childMap')
 
-            var advices = [];
-            for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id > 0) {
-                continue;
-              }
-              var item = this.records[recordIndex].advices[index];
-              if (item.id in childMap) {
-                item.children = childMap[item.id];
-                // advices.push(childMap[item.id]);
-              } else {
-                item.children = [];
-              }
-              advices.push(item);
+            // var advices = [];
+            // for (const index in this.records[recordIndex].advices) {
+            //   if (this.records[recordIndex].advices[index].parent_id > 0) {
+            //     continue;
+            //   }
+            //   var item = this.records[recordIndex].advices[index];
+            //   if (item.id in childMap) {
+            //     item.children = childMap[item.id];
+            //     // advices.push(childMap[item.id]);
+            //   } else {
+            //     item.children = [];
+            //   }
+            //   advices.push(item);
               
+            // }
+
+          console.log(" this.records[recordIndex].advices", this.records);
+          this.operators = resp.data.medical_staffs;
+          if (this.operators.length > 0) {
+            var operatorsLen = this.operators.length;
+            for (var index = 0; index < operatorsLen; index++) {
+              this.$set(
+                this.operatorMaps,
+                this.operators[index].id,
+                this.operators[index]
+              );
             }
+          }
+          this.adminUser = resp.data.users;
+          console.log("使用者", this.adminUser);
+          this.loading = false;
 
             var leftAdvice = [];
             var rightAdvice = [];
@@ -2237,31 +2344,20 @@ export default {
             }
           }
 
-          console.log(" this.records[recordIndex].advices", this.records);
-          this.operators = resp.data.medical_staffs;
-          if (this.operators.length > 0) {
-            var operatorsLen = this.operators.length;
-            for (var index = 0; index < operatorsLen; index++) {
-              this.$set(
-                this.operatorMaps,
-                this.operators[index].id,
-                this.operators[index]
-              );
-            }
-          }
-          this.adminUser = resp.data.users;
-          console.log("使用者", this.adminUser);
-          this.loading = false;
-        } else {
+         
+        } 
+        else {
           this.loading = false;
           this.$message.error(resp.msg);
         }
       })
       .catch(err => {
-        this.$message.error(err);
+        // this.$message.error(err);
+        console.log(err)
       });
   },
   methods: {
+
     getUnit: function(val) {
       if (val.assessment_after_dislysis == null) {
         return "";

src/xt_pages/hospitalStation/recordPrint.vue

@@ -13,7 +13,7 @@
 
      <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 9671 && org_id!=9675"
+        v-if="org_id != 9675 && org_id != 9671 &&org_id != 0"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -22,7 +22,7 @@
         :patientid="patientid"
       ></printOne>
       <printTwo
-        v-if="org_id == 9671 || org_id == 9675"
+        v-if="org_id == 10217 || org_id == 0 ||org_id==9675||org_id==9671"
         ref="printTwo"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -101,13 +101,26 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}';
-      printJS({
-        printable: "prescription-print",
-        type: "html",
-        style: style,
-        scanStyles: false
-      });
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}";
+       const style1 =
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
+      
+      
+      if (this.org_id != 10217 && this.org_id != 0) {
+        printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style,
+          scanStyles: false,
+        });
+      } else if (this.org_id == 10217 || this.org_id == 0) {
+        printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style1,
+          scanStyles: false,
+        });
+      }
     },
 
      //患者列表

src/xt_pages/hospitalStation/recordTemplate/printTwo.vue

@@ -2,7 +2,7 @@
   <div id="prescription-print">
     <div class="prescription-print">
       <div class="printTitle">{{ orgname }}血透中心病历</div>
-       <div class="record_Title">
+       <!-- <div class="record_Title">
             <div>姓名：{{patient.name?patient.name:''}}</div>
             <div>性别：
                 <span v-if="patient.gender == 1">男</span>
@@ -10,29 +10,29 @@
             </div>
             <div>年龄：{{patient.age?patient.age:''}}岁</div>
             <div>透析病历号:{{patient.id?patient.id:''}}</div>
-        </div>
+        </div> -->
       <div class="infoTitle" style="margin-top:20px;">
-        <div>姓名：{{ patient.name ? patient.name : "" }}</div>
-        <div>
-          家庭住址：{{ patient.home_address ? patient.home_address : "" }}
+        <div class="name_slot">姓名：{{ patient.name ? patient.name : "" }}</div>
+        <div class="address_slot">
+          家庭住址：{{ patient.home_address ? patient.home_address : "" }}深圳市南山区桃园街道新屋村东区三号楼303
         </div>
       </div>
       <div class="infoTitle">
-        <div>
+        <div class="name_slot">
           性别：
           <span v-if="patient.gender == 1">男</span>
           <span v-if="patient.gender == 2">女</span>
         </div>
-        <div>工作单位：{{patient.work_unit}}</div>
+        <div class="address_slot">工作单位：{{patient.work_unit}}</div>
        
       </div>
       <div class="infoTitle">
-        <div>出生日期：{{patient.id_card_no.slice(6,10)}}年{{ patient.id_card_no.slice(10,12) }}月{{patient.id_card_no.slice(12,14) }}日</div> 
-        <div>身份证号：{{patient.id_card_no}}</div>
+        <div class="name_slot">出生日期：{{patient.id_card_no.slice(6,10)}}年{{ patient.id_card_no.slice(10,12) }}月{{patient.id_card_no.slice(12,14) }}日</div> 
+        <div class="address_slot">身份证号：{{patient.id_card_no}}</div>
       </div>
       <div class="infoTitle">
-        <div>联系人：{{patient.contact_name}}</div>
-        <div>联系电话：{{ patient.phone ? patient.phone : "" }}</div>
+        <div class="name_slot">联系人：{{patient.contact_name}}</div>
+        <div class="address_slot">联系电话：{{ patient.phone ? patient.phone : "" }}</div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
         <div>进入透析时间：{{getTime(patient.first_dialysis_date)}}</div>
@@ -40,7 +40,7 @@
       </div>
       <div class="infoTitle">
         <div style="width: 300px">原发病：{{history.primary_disease}}</div>
-        <div>确诊肾衰日期：{{getTime(patient.first_dialysis_date)}}</div>
+        <div class="address_slot">确诊肾衰日期：{{getTime(history.confirm_failure_date)}}</div>
       </div>
       <div class="otherInfo">
         <div>
@@ -52,7 +52,7 @@
         <div style="flex: 1"></div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>血管通路：{{getAccess(accessList.access_project)}}</div>
+        <div>血管通路：{{accessList.blood_access_part_opera_id}}</div>
         <div style="flex: 1"></div>
       </div>
 
@@ -88,16 +88,14 @@
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 80px;">
+      <div class="otherInfo" style="min-height: 150px;">
         <div class="otherName">家族史：</div>
         <div style="flex: 1">
-          {{ history.family_history ? history.family_history : "" }}
+          {{ history.family_history ? history.family_history : "" }}啊实打实大苏打实打实
         </div>
       </div>
-
-      <div style="page-break-after: always; margin-top: 50px"></div>
     </div>
-
+<div style="page-break-after: always; margin-top: 50px"></div>
     <div class="prescription-print">
       <!-- <div class="printTitle">病历内容</div> -->
       <div class="recordTitle">
@@ -132,7 +130,7 @@
               手签：
             </div>
           </div>
-          <div style="text-align: center; letter-spacing: 3px">{{getTime(history.record_date)}}</div>
+          <div style="text-align: center; letter-spacing: 3px;padding-top:20px">{{getTime(history.record_date)}}</div>
         </div>
       </div>
     </div>
@@ -222,6 +220,7 @@ export default {
         if (response.data.state == 1) {
           var patient = response.data.data.patient;
           this.patient = patient;
+          console.log(this.patient,'this.patient')
           var history = response.data.data.history;
           this.history = history;
           var hispatient = response.data.data.hispatient;
@@ -316,6 +315,10 @@ export default {
 .infoTitle div {
   width: 200px;
 }
+
+.infoTitle .address_slot{width: 400px;} 
+.infoTitle .name_slot{width: 250px;}
+
 .otherInfo {
   display: flex;
   margin-top: 10px;

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -305,8 +305,10 @@
         class="centerDialog"
         width="600px"
         title="打印"
+        destroy-on-close
         :visible.sync="recordVisible">
-      <recordPrint :patientid="patientid" ref="recordPrint"></recordPrint>
+      <recordPrint :patientid="patientid" ref="recordPrint">
+    </recordPrint>
     </el-dialog>
 
   </div>
@@ -4596,9 +4598,10 @@ export default {
         }
         this.$refs.child.createCaseHistory()
       } else if (index == 2) {
-        this.recordVisible = true
-        this.$refs.recordPrint.show(this.patientid)
 
+          this.recordVisible = true
+        this.$refs.recordPrint.show(this.patientid)
+        
         // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
       } else if (index == 3) {
         var mode_status = this.$refs.saveRecordTemplate.mode_status
@@ -4948,6 +4951,10 @@ export default {
     }
   },
   created() {
+    this.$nextTick(() => {
+      
+    })
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
     this.getInitData()
     var nowDate = new Date()
     var nowYear = nowDate.getFullYear()
@@ -4965,7 +4972,7 @@ export default {
     // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
     let tableHeight = document.body.clientHeight - 263
     this.tableHeight = tableHeight
-    this.org_id = this.$store.getters.xt_user.template_info.org_id
+    
 
   },
 
@@ -4990,7 +4997,10 @@ export default {
           that.timer = false
         }, 400)
       }
-    }
+    },
+    patientid: function (val) {
+      console.log("val22332323", val);
+    },
 
   }
 }

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -13,7 +13,7 @@
 
     <div class="dialysisPage" style="padding-top: 40px">
       <printOne
-        v-if="org_id != 9675 && org_id != 9671"
+        v-if="org_id != 9675 && org_id != 9671 && org_id != 0"
         ref="printOne"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -22,7 +22,9 @@
         :patientid="patientid"
       ></printOne>
       <printTwo
-        v-if="org_id == 9671 || org_id == 9675"
+        v-if="
+          org_id == 10217 || org_id == 0 || org_id == 9675 || org_id == 9671
+        "
         ref="printTwo"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -71,8 +73,11 @@ export default {
       org_id,
     };
   },
+
+
   methods: {
     show(val) {
+      console.log(val,'ooooooo')
       this.$refs.printOne.show(val);
       this.$refs.printTwo.show(val);
     },
@@ -104,10 +109,9 @@ export default {
 
       const style =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;padding:0 10px;}.infoTitle div{width: 200px;}.otherInfo{display: flex;margin-top:20px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle div{width: 200px;}}";
-       const style1 =
-        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.infoTitle div{width: 300px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
-      
-      
+      const style1 =
+        "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot{width: 250px;}.otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
+
       if (this.org_id != 10217 && this.org_id != 0) {
         printJS({
           printable: "prescription-print",
@@ -174,9 +178,9 @@ export default {
   created() {
     // this.getPatientList()
     this.org_id = this.$store.getters.xt_user.org.id;
-    console.log("=====", this.org_id);
-    this.$refs.printOne.show(this.patientid);
-    this.$refs.printTwo.show(this.patientid);
+    // console.log("=====", this.org_id);
+    // this.$refs.printOne.show(this.patientid);
+    // this.$refs.printTwo.show(this.patientid);
   },
   // computed:{
   //   filtedSchedules: function() {

src/xt_pages/outpatientDoctorStation/recordTemplate/printTwo.vue

@@ -2,7 +2,7 @@
   <div id="prescription-print">
     <div class="prescription-print">
       <div class="printTitle">{{ orgname }}血透中心病历</div>
-       <div class="record_Title">
+      <!-- <div class="record_Title">
             <div>姓名：{{patient.name?patient.name:''}}</div>
             <div>性别：
                 <span v-if="patient.gender == 1">男</span>
@@ -10,60 +10,71 @@
             </div>
             <div>年龄：{{patient.age?patient.age:''}}岁</div>
             <div>透析病历号:{{patient.id?patient.id:''}}</div>
+        </div> -->
+      <div class="infoTitle" style="margin-top: 20px">
+        <div class="name_slot">
+          姓名：{{ patient.name ? patient.name : "" }}
         </div>
-      <div class="infoTitle" style="margin-top:20px;">
-        <div>姓名：{{ patient.name ? patient.name : "" }}</div>
-        <div>
+        <div class="address_slot">
           家庭住址：{{ patient.home_address ? patient.home_address : "" }}
         </div>
       </div>
       <div class="infoTitle">
-        <div>
+        <div class="name_slot">
           性别：
           <span v-if="patient.gender == 1">男</span>
           <span v-if="patient.gender == 2">女</span>
         </div>
-        <div>工作单位：{{patient.work_unit}}</div>
-       
+        <div class="address_slot">工作单位：{{ patient.work_unit }}</div>
       </div>
       <div class="infoTitle">
-        <div>出生日期：{{patient.id_card_no.slice(6,10)}}年{{ patient.id_card_no.slice(10,12) }}月{{patient.id_card_no.slice(12,14) }}日</div> 
-        <div>身份证号：{{patient.id_card_no}}</div>
+        <div class="name_slot">
+          出生日期：{{ patient.id_card_no.slice(6, 10) }}年{{
+            patient.id_card_no.slice(10, 12)
+          }}月{{ patient.id_card_no.slice(12, 14) }}日
+        </div>
+        <div class="address_slot">身份证号：{{ patient.id_card_no }}</div>
       </div>
       <div class="infoTitle">
-        <div>联系人：{{patient.contact_name}}</div>
-        <div>联系电话：{{ patient.phone ? patient.phone : "" }}</div>
+        <div class="name_slot">联系人：{{ patient.contact_name }}</div>
+        <div class="address_slot">
+          联系电话：{{ patient.phone ? patient.phone : "" }}
+        </div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>进入透析时间：{{getTime(patient.first_dialysis_date)}}</div>
+        <div>进入透析时间：{{ getTime(patient.first_dialysis_date) }}</div>
         <div style="flex: 1"></div>
       </div>
       <div class="infoTitle">
-        <div style="width: 300px">原发病：{{history.primary_disease}}</div>
-        <div>确诊肾衰日期：{{getTime(patient.first_dialysis_date)}}</div>
+        <div style="width: 300px">原发病：{{ history.primary_disease }}</div>
+        <div class="address_slot">
+          确诊肾衰日期：{{ getTime(history.confirm_failure_date) }}
+        </div>
       </div>
       <div class="otherInfo">
         <div>
-          药物过敏史：{{ history.allergic_history ? history.allergic_history : "" }}
+          药物过敏史：{{
+            history.allergic_history ? history.allergic_history : ""
+          }}
         </div>
       </div>
       <div class="otherInfo">
-        <div>初始透析日期：{{getTime(patient.first_dialysis_date)}}</div>
+        <div>初始透析日期：{{ getTime(patient.first_dialysis_date) }}</div>
         <div style="flex: 1"></div>
       </div>
       <div class="otherInfo" style="border-bottom: 1px solid">
-        <div>血管通路：{{getAccess(accessList.access_project)}}</div>
+        <div>血管通路：{{ accessList.blood_access_part_opera_id }}</div>
         <div style="flex: 1"></div>
       </div>
 
-      <div class="otherInfo" style="min-height: 60px;">
+      <div class="otherInfo" style="min-height: 60px">
         <div class="otherName">主诉：</div>
         <div style="flex: 1">
           {{ history.chief_conplaint ? history.chief_conplaint : "" }}
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 180px;">
+      <div class="otherInfo" style="min-height: 180px">
         <div class="otherName">现病史：</div>
         <div style="flex: 1">
           {{
@@ -74,52 +85,61 @@
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 100px;">
+      <div class="otherInfo" style="min-height: 100px">
         <div class="otherName">既往史：</div>
         <div style="flex: 1">
           {{ history.past_history ? history.past_history : "" }}
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 80px;">
+      <div class="otherInfo" style="min-height: 80px">
         <div class="otherName">个人史：</div>
         <div style="flex: 1">
           {{ history.personal_history ? history.personal_history : "" }}
         </div>
       </div>
 
-      <div class="otherInfo" style="min-height: 80px;">
+      <div class="otherInfo" style="min-height: 150px">
         <div class="otherName">家族史：</div>
         <div style="flex: 1">
           {{ history.family_history ? history.family_history : "" }}
         </div>
       </div>
-
-      <div style="page-break-after: always; margin-top: 50px"></div>
     </div>
-
+    <div style="page-break-after: always; margin-top: 50px"></div>
     <div class="prescription-print">
       <!-- <div class="printTitle">病历内容</div> -->
       <div class="recordTitle">
         <div>体格检查</div>
-        <div class="recordContent" style="height:250px;">
+        <div class="recordContent" style="height: 250px">
           <div>
-          <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
-          <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
-          <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
-          <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+            <span
+              >体温：{{
+                history.temperature ? history.temperature + "℃" : "/"
+              }}</span
+            >
+            <span
+              >脉搏：{{ history.pulse ? history.pulse + "次/分" : "/" }}</span
+            >
+            <span
+              >呼吸：{{
+                history.breathing ? history.breathing + "次/分" : "/"
+              }}</span
+            >
+            <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
           </div>
-
         </div>
         <div></div>
       </div>
       <div class="recordTitle">
         <div>专科检查</div>
-        <div class="recordContent">{{history.special_inspection}}</div>
+        <div class="recordContent">{{ history.special_inspection }}</div>
       </div>
       <div class="recordTitle" style="border-bottom: 1px solid">
         <div>实验室及器械检查</div>
-        <div class="recordContent" style="height:250px;">{{history.lab_apparatus}}</div>
+        <div class="recordContent" style="height: 250px">
+          {{ history.lab_apparatus }}
+        </div>
       </div>
       <div style="display: flex; justify-content: end">
         <div class="endInfo">
@@ -127,12 +147,18 @@
             诊断：{{ history.diagnostic ? history.diagnostic : "" }}
           </div>
           <div style="display: flex">
-            <div>医师：{{getDoctor(history.doctor) ? getDoctor(history.doctor) : ""}}</div>
             <div>
-              手签：
+              医师：{{
+                getDoctor(history.doctor) ? getDoctor(history.doctor) : ""
+              }}
             </div>
+            <div>手签：</div>
+          </div>
+          <div
+            style="text-align: center; letter-spacing: 3px; padding-top: 20px"
+          >
+            {{ getTime(history.record_date) }}
           </div>
-          <div style="text-align: center; letter-spacing: 3px">{{getTime(history.record_date)}}</div>
         </div>
       </div>
     </div>
@@ -143,7 +169,7 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 
 import { getDataConfig } from "@/utils/data";
 import { getAllDoctorList, getPatientCaseHistory } from "@/api/project/project";
-import {getAccessList} from "@/api/patient"
+import { getAccessList } from "@/api/patient";
 export default {
   props: {
     patient: Object,
@@ -158,10 +184,12 @@ export default {
       orgname: "",
       history: {},
       printDate: "",
-      accessList:{},
-      blood_access_part_opera:[],
+      accessList: {},
+      blood_access_part_opera: [],
     };
   },
+
+
   methods: {
     getAge(patient) {
       var thisLen = patient.id_card_no.length;
@@ -200,7 +228,6 @@ export default {
 
           this.doctorList = doctor;
           var department = response.data.data.department;
-          console.log("department", department);
           this.departmentList = department;
         }
       });
@@ -226,9 +253,8 @@ export default {
           this.history = history;
           var hispatient = response.data.data.hispatient;
           this.hispatient = hispatient;
-          var accessList = response.data.data.accessList
-          console.log("accesslist2332323232",accessList)
-          this.accessList = accessList
+          var accessList = response.data.data.accessList;
+          this.accessList = accessList;
         }
       });
     },
@@ -242,38 +268,39 @@ export default {
       return name;
     },
     getTime(val) {
-      if(val < 0){
-        return ""
+      if (val < 0) {
+        return "";
       }
-      if(val == ""){
-      return ""
-      }else {
-      return uParseTime(val, '{y}-{m}-{d}')
+      if (val == "") {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d}");
       }
     },
-    getAccessList(){
-      getAccessList().then(response=>{
-        if(response.data.state == 1){
-          var blood_access_part_opera = response.data.data.blood_access_part_opera
-          this.blood_access_part_opera = blood_access_part_opera
+    getAccessList() {
+      getAccessList().then((response) => {
+        if (response.data.state == 1) {
+          var blood_access_part_opera =
+            response.data.data.blood_access_part_opera;
+          this.blood_access_part_opera = blood_access_part_opera;
         }
-     })
+      });
     },
-    getAccess(id){
-      var name = ""
-      for(let i=0;i<this.blood_access_part_opera.length;i++){
-         if(id == this.blood_access_part_opera[i].value){
-             name = this.blood_access_part_opera[i].name
-         }
+    getAccess(id) {
+      var name = "";
+      for (let i = 0; i < this.blood_access_part_opera.length; i++) {
+        if (id == this.blood_access_part_opera[i].value) {
+          name = this.blood_access_part_opera[i].name;
+        }
       }
-      return name
-    }
+      return name;
+    },
   },
   created() {
     this.educationOptions = getDataConfig("patient", "education_types");
     this.getAllDoctorList();
     this.getPatientCaseHistory();
-    this.getAccessList()
+    this.getAccessList();
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     var data = new Date();
@@ -281,12 +308,6 @@ export default {
       data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
     var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
     this.printDate = data.getFullYear() + "-" + month + "-" + date;
-
-  },
-  watch: {
-    patientid: function (val) {
-      console.log("val22332323", val);
-    },
   },
 };
 </script>
@@ -316,6 +337,14 @@ export default {
 .infoTitle div {
   width: 200px;
 }
+
+.infoTitle .address_slot {
+  width: 400px;
+}
+.infoTitle .name_slot {
+  width: 250px;
+}
+
 .otherInfo {
   display: flex;
   margin-top: 10px;
@@ -351,15 +380,15 @@ export default {
   text-align: left;
 }
 
-.record_Title{
-    display: flex;
-    margin-top:10px;
-    line-height: 24px;
-    padding:0 10px;
-    border-bottom: 2px solid #000;
+.record_Title {
+  display: flex;
+  margin-top: 10px;
+  line-height: 24px;
+  padding: 0 10px;
+  border-bottom: 2px solid #000;
 }
 
-.record_Title div{
+.record_Title div {
   width: 200px;
 }
 </style>