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

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/complete.vue

@@ -227,7 +227,7 @@ import html2canvas from "html2canvas"
         nurseList:[],
         operators:[],
         docList:[],
-        status_options:[{value:1,label:'达到透析处方时间'},{value:2,label:'未达到处方时间'},{value:3,label:'超出处方时间'}],
+        status_options:[{value:1,label:'达到透析处方时间'},{value:3,label:'未达到处方时间'},{value:2,label:'超出处方时间'}],
         date_options:[{value:1,label:'最近七天'},{value:2,label:'本周'},{value:3,label:'上周'},{value:4,label:'本月'},
                       {value:5,label:'上月'},{value:6,label:'本年'},{value:7,label:'上一年'}
         ],
@@ -348,7 +348,7 @@ import html2canvas from "html2canvas"
                 }
               }
               console.log('111111',status_id);
-              
+
               this.status_value = status_id
               this.getdetail(status_id)
             })

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -31,59 +31,59 @@
               {{ orgname }} 血液净化治疗记录单
             </div>
           </div>
-          <div class="row">
-            <div class="inline_block">
-              姓名：
+          <div class="row" style="display: flex;">
+            <div class="inline_block" style="flex: 0.9;">
+              姓名:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.patient.name }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
-              性别：
+            <div class="inline_block" style="flex: 0.9;">
+              性别:
               <div class="under_line" style="width: 30px; text-align: center">
                 {{ record.patient.gender == 1 ? "男" : "女" }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 10px">
-              年龄：
+            <div class="inline_block" style="flex: 0.9;">
+              年龄:
               <div class="under_line" style="width: 30px; text-align: center">
                 <!-- {{ record.patient.age }} -->
                 {{ getAge(record.patient) }}
               </div>
               岁
             </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition!=1">
-              门诊：
+            <div class="inline_block" v-if="record.receive_assessment.condition!=1" style="flex: 0.9;">
+              门诊:
               <div class="under_line" style="width: 30px; text-align: center">
                 <check-box :checked="record.patient.source == 1"></check-box>
               </div>
             </div>
-            <div class="inline_block" v-if="record.receive_assessment.condition==1">
-              住院：
+            <div class="inline_block" v-if="record.receive_assessment.condition==1" style="flex: 0.9;">
+              住院:
               <div class="under_line" style="width: 30px; text-align: center">
                 <check-box :checked="record.patient.source == 1"></check-box>
               </div>
             </div>
-            <div class="inline_block">
-              病区：
+            <div class="inline_block" style="flex: 0.9;">
+              病区:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_zone.name}}
               </div>
             </div>
-            <div class="inline_block">
-              床号：
+            <div class="inline_block" style="flex: 1.1;">
+              床号:
               <div class="under_line" style="width: 50px; text-align: center">
                 {{ record.device_number.number }}
               </div>
             </div>
-            <div class="inline_block">
-              透析号：
-              <div class="under_line" style="width: 70px; text-align: center">
+            <div class="inline_block"style="flex: 1.1;">
+              透析号:
+              <div class="under_line" style="width: 60px; text-align: center">
                 {{ record.patient.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px">
-              住院号/门诊号：
+            <div class="inline_block" style="flex: 1.5;">
+              住院号/门诊号:
               <div
                 class="under_line"
                 style="width: 70px; text-align: left"
@@ -102,7 +102,7 @@
           </div>
           <div class="row">
             <div style="">
-              诊断：
+              诊断:
               <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;"
               >
@@ -133,7 +133,7 @@
                   <td colspan="2">
                     <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
-                        本次透析日期：
+                        本次透析日期:
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
                         </div>
@@ -2340,13 +2340,13 @@ export default {
   width: 50%;
 }
 
-.under_line::before {
+/* .under_line::before {
   content: "\00A0";
 }
 
 .under_line::after {
   content: "\00A0";
-}
+} */
 
 .under_line_two {
   display: inline-block;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -155,7 +155,7 @@
                 </el-date-picker>
 
 
-                <el-select v-if="org_id != 10206" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                <el-select v-if="org_id != 10206 && org_id != 10721 && org_id != 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                            @change="changevalue">
                   <el-option
                     v-for="(item,index) in register"
@@ -175,6 +175,17 @@
                   </el-option>
                 </el-select>
 
+
+                <el-select v-if="org_id == 10721 || org_id == 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                           @change="changevalue">
+                  <el-option
+                    v-for="(item,index) in register10721"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+
                 <div style="float: right;margin-bottom:5px;margin-right:1%;">
                   <el-button
                     round
@@ -637,6 +648,15 @@ export default {
 
 
 
+      ],
+      register10721: [
+        { value: 11, label: '普通门诊' },
+        { value: 14, label: '门诊特殊病' },
+        { value: 992102, label: '透析(992102)' },
+        { value: 140104, label: '门诊慢病(140104)' },
+        { value: 140201, label: '门诊特病(140201)' },
+        { value: 1111, label: '精一' },
+        { value: 1112, label: '精二' },
       ],
       medical_care: [
         { value: 11, label: '普通门诊' },

src/xt_pages/user/components/PatientDetail.vue

@@ -1290,7 +1290,7 @@
       <div id="print-info-box" v-else>
         <div class="print_main_content" style="font-family:SimSun;">
           <div style="font-size: 35px;font-weight: 600;text-align: center;margin-top: 30px;">
-            海拉尔普爱{{ orgname }}
+            {{ orgname }}
           </div>
           <div style="font-size: 35px;font-weight: 600;margin-bottom: 10px;text-align: center;">血液净化治疗患者首次门诊病历</div>
           <div >
@@ -1316,7 +1316,7 @@
                     {{ patientPrint.age }}岁
                   </td>
                   <td style="padding: 5px 0px;font-size: 22px;font-weight: 500;width:12%;">
-                    报销方式
+                    医保类型
                   </td>
                   <td style="padding: 5px 0px;font-size: 22px;width: 15%;">
                     {{patientPrint.reimbursement_way_id }}