1

src/lang/zh.js

@@ -204,6 +204,7 @@ export default {
     scrm: 'SCRM',
     shop: '分销商城',
 
+    costComparison:'医保费用对照',
     incomeStatistics:'收入统计',
     outpatientRegistration:'门诊挂号',
     outpatientRegistrationIndex:'门诊挂号',

src/router/modules/outpatientCharges.js

@@ -48,6 +48,12 @@ export default {
         name: 'incomeStatistics',
         meta: { title: 'incomeStatistics', noCache: true }
     },
+    {
+        path: '/outpatientCharges/costComparison',
+        component: () => import('@/xt_pages/outpatientCharges/costComparison'),
+        name: 'costComparison',
+        meta: { title: 'costComparison', noCache: true }
+    },
     {
         path: '/outpatientCharges/summaryDetail',
         component: () => import('@/xt_pages/outpatientCharges/summaryDetail'),

src/store/getters.js

@@ -28,6 +28,8 @@ const getters = {
   patient_state_selected: state => state.xt_user.patient_state_selected,
   treat_state_selected: state => state.xt_user.treat_state_selected,
   selected_date: state => state.xt_user.selected_date,
+  search_mode: state => state.xt_user.search_mode,
+  search_value: state => state.xt_user.search_value,
 
   xt_role_temps: state => state.xt_role_temps,
 

src/store/modules/xt_user.js

@@ -53,10 +53,21 @@ const xt_user = {
 
     // 示例: ['', '',]
     urlfors: [],
-    fileds: []
+    fileds: [],
+
+    //监测的搜索状态
+    search_mode: 1,
+    //监测的搜索值
+    search_value:''
   },
 
   mutations: {
+    SET_SEARCH_VALUE:(state, search_value) => {
+      state.search_value = search_value
+    },
+    SET_SEARCH_MODE:(state, search_mode) => {
+      state.search_mode = search_mode
+    },
     SET_SCHEDULE_TYPE_SELECTED: (state, schedule_type_selected) => {
       state.schedule_type_selected = schedule_type_selected
     },
@@ -180,6 +191,12 @@ const xt_user = {
   },
 
   actions: {
+    SetSearchValue({ commit }, search_value) {
+      commit('SET_SEARCH_VALUE', search_value)
+    },
+    SetSearchMode({ commit }, search_mode) {
+      commit('SET_SEARCH_MODE', search_mode)
+    },
     SetScheduleTypeSelected({ commit }, schedule_type_selected) {
       commit('SET_SCHEDULE_TYPE_SELECTED', schedule_type_selected)
     },

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -500,23 +500,52 @@ export default {
     };
   },
   created() {
-    var date = new Date();
-    this.time = date;
-    var year = date.getFullYear();
-    var month = date.getMonth() + 1;
-    var day = date.getDate();
-    if (month < 10) {
-      month = "0" + month;
-    }
-    if (day < 10) {
-      day = "0" + day;
+    var search_mode = this.$store.getters.search_mode
+    var search_value = this.$store.getters.search_value
+    console.log('search_mode',search_mode)
+    if(search_mode == 2){
+      this.search_mode = search_mode
+      if(search_value != ''){
+        this.patient_search_keyword = search_value
+        this.listQuery.keywords = search_value
+        this.getSchedualPatientList();
+        var date = new Date();
+        this.time = date;
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var day = date.getDate();
+        if (month < 10) {
+          month = "0" + month;
+        }
+        if (day < 10) {
+          day = "0" + day;
+        }
+        var nowDate = year + "-" + month + "-" + day;
+        var date = new Date(nowDate + " 00:00:00");
+        this.listQuery.schedul_time = date.getTime();
+        this.getAllZone();
+        this.getTemplateInfo();
+      }
+    }else {
+      var date = new Date();
+      this.time = date;
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var day = date.getDate();
+      if (month < 10) {
+        month = "0" + month;
+      }
+      if (day < 10) {
+        day = "0" + day;
+      }
+      var nowDate = year + "-" + month + "-" + day;
+      var date = new Date(nowDate + " 00:00:00");
+      this.listQuery.schedul_time = date.getTime();
+      this.getAllZone();
+      this.getSchedualPatientList();
+      this.getTemplateInfo();
     }
-    var nowDate = year + "-" + month + "-" + day;
-    var date = new Date(nowDate + " 00:00:00");
-    this.listQuery.schedul_time = date.getTime();
-    this.getAllZone();
-    this.getSchedualPatientList();
-    this.getTemplateInfo();
+    
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
@@ -673,9 +702,11 @@ export default {
       } else {
         this.search_mode = 1;
       }
+      this.$store.dispatch('SetSearchMode', this.search_mode)
     },
     searchPatientAction: function() {
       this.listQuery.keywords = this.patient_search_keyword;
+      this.$store.dispatch('SetSearchValue', this.patient_search_keyword)
       console.log(this.patient_search_keyword);
       if (this.patient_search_keyword.length == 0) {
         return;

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -344,7 +344,7 @@
           >打印</el-button
         >
       </template>
-       <template v-if="org_template_info.template_id == 25">
+      <template v-if="org_template_info.template_id == 25">
         <el-button
           :loading="loading"
           size="small"
@@ -437,6 +437,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 32">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -672,6 +682,11 @@
             v-if="org_template_info.template_id == 31"
           >
           </DialysisPrintOrderThirtyOne>
+          <DialysisPrintOrderThirtyTwo
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 32"
+          >
+          </DialysisPrintOrderThirtyTwo>
         </div>
       </el-container>
     </div>
@@ -722,9 +737,11 @@ import DialysisPrintOrderTwentyEight from "./template/DialysisPrintOrderTwentyEi
 import DialysisPrintOrderTwentyNine from "./template/DialysisPrintOrderTwentyNine";
 import DialysisPrintOrderThirty from "./template/DialysisPrintOrderThirty";
 import DialysisPrintOrderThirtyOne from "./template/DialysisPrintOrderThirtyOne";
+import DialysisPrintOrderThirtyTwo from "./template/DialysisPrintOrderThirtyTwo";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirtyTwo,
     DialysisPrintOrderThirtyOne,
     DialysisPrintOrderThirty,
     DialysisPrintOrderTwentyNine,
@@ -1091,13 +1108,6 @@ export default {
           style: style,
           scanStyles: false
         });
-      }else if (this.org_template_info.template_id == 25) {
-        printJS({
-          printable: "dialysis-print-box",
-          type: "html",
-          style: style5,
-          scanStyles: false
-        });
       } else if (this.org_template_info.template_id == 26) {
         printJS({
           printable: "dialysis-print-box",
@@ -1140,7 +1150,14 @@ export default {
           style: style3,
           scanStyles: false
         });
-      } 
+      } else if (this.org_template_info.template_id == 32) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style5,
+          scanStyles: false
+        });
+      }
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -1214,7 +1214,7 @@ export default {
             this.AlPanel = this.anticoagulantsConfit[thisALID]
           }
 
-          this.advices = response.data.data.advices
+          this.advices = JSON.parse(JSON.stringify(response.data.data.advices))
           this.monitors = response.data.data.monitors
           console.log('透析监测', this.monitors)
           this.summary = response.data.data.summary

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -570,14 +570,14 @@
         </tr>
         <tr style="height:40px">
           <td rowspan="11" style="border:none;text-align:right;height:40px">
-            记录者
+            护士签名
             <span style="display: inline-block;width:100px;text-align: left;">
                 <span v-if="orderForm.url === ''" style="display:flex;align-items:center;">{{ orderForm.start_nurse }}</span>
                 <span v-if="orderForm.url !== ''" style="display:flex;align-items:center;height:36px;">
                     <img :src="orderForm.url" style="height:30px;" />
                 </span>
             </span>
-            二核护士
+            <!-- 二核护士
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
               <span v-if="dialysisOrder ? dialysisOrder.start_nurse != check.modifier : false">
@@ -591,7 +591,7 @@
               {{ getAdminUser(check == null ? 0 : check.creater) }}
               </span>
               <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt srcset v-else />
-            </span>
+            </span> -->
             </span>
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -420,7 +420,7 @@
                     <td width="35">℃</td>
                     <td width='60'>24h尿量</td>
                     <td width='50'>
-                        <div class="under-line">&nbsp;{{ predialysis.urine_volume ? predialysis.urine_volume : '' }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.urine_volume ? predialysis.urine_volume : 0 }}</div>
                     </td>
                     <td width='10'>ml</td>
                     <td width='40'>水肿</td>
@@ -558,7 +558,7 @@
                 <table class="table-box">
                     <tbody>
                         <tr>
-                            <td width='100'>透析频率(次/周)</td>
+                            <td width='110'>透析频率(次/周)</td>
                             <td width='50'>
                                 <div class="under-line">
                                     &nbsp;{{ predialysis.dialysis_count ? predialysis.dialysis_count : "" }}
@@ -690,7 +690,7 @@
                     <td width='20'>mmol/L</td>
                     <td width="20">钾</td>
 
-                    <td width="150">
+                    <td width="160">
                       (
                         <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : false" showValue="2.0"></label-box>
                         <label-box :isChecked="false" showValue="3.0mmol/L"></label-box>
@@ -850,10 +850,10 @@
         </tr>
       </table>
 
-      <table class="print-table" border="1">
+      <table class="print-table" border="1" v-if="monitors.length <= 8">
         <tbody>
           <tr>
-            <td :rowspan="jilurow+4" width="30px" class="title-box">
+            <td :rowspan="monitors.length + 1" width="30px" class="title-box">
               透析治疗记录
             </td>
 
@@ -898,7 +898,7 @@
             </td>
 
             <td>
-              &nbsp;{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}
+              &nbsp;<span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.arterial_pressure ? monitor.arterial_pressure : '0' }}</span>
             </td>
             <td>
               &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
@@ -1106,6 +1106,189 @@
       </table>
 
     </div>
+    <div style="page-break-after: always;"></div>
+    <div class="dialysis-print-order"  v-if="monitors.length > 8">
+      <div class="order-yy-name" style="font-size:28px;font-weight:bold;">{{ orgname }}</div>
+      <div class="order-title">血液净化治疗记录单</div>
+      <table class="table-box">
+        <tbody>
+          <tr>
+            <td width="50">姓 名:</td>
+            <td width="90">
+              <div class="under-line">&nbsp;{{ patientInfo.name }}</div>
+            </td>
+            <td width="30"></td>
+            <td width="50">性 别:</td>
+            <td width="100">
+              <label-box :isChecked="patientInfo_gender_1" showValue="男" ></label-box>&nbsp;
+              <label-box :isChecked="patientInfo_gender_2" showValue="女" ></label-box>
+            </td>
+            <td width="20"></td>
+
+            <td width="50">年 龄:</td>
+            <td width="50">
+              <div class="under-line">{{ getNewAge(patientInfo.id_card_no) }}</div>
+            </td>
+            <td width="20">岁</td>
+            <td width="20"></td>
+
+            <!-- <td width="40">诊 断:</td>
+            <td width="160">
+              <div class="under-line">&nbsp;{{ patientInfo.diagnose }}</div>
+            </td> -->
+            <td width="40">日 期:</td>
+            <td width="50">
+                <div class="under-line">{{ queryParams.xtdate.slice(0,4) }}</div>
+            </td>
+            <td width='10'>年</td>
+            <td width="50">
+                <div class="under-line">{{ queryParams.xtdate.slice(5,7) }}</div>
+            </td>
+            <td width='10'>月</td>
+            <td width="50">
+                <div class="under-line">{{ queryParams.xtdate.slice(8,11) }}</div>
+            </td>
+            <td width='10'>日</td>
+            <td width='30'></td>
+            <td width="20">第</td>
+            <td width="50">
+                <div class="under-line">2</div>
+            </td>
+            <td width="20">页</td>
+            <!-- <td width="60">住院号:</td>
+            <td width="80">
+              <div class="under-line">
+                &nbsp;{{ receiverTreatmentAccess.admission_number ? receiverTreatmentAccess.admission_number : "" }}
+              </div>
+            </td> -->
+            <td width="20"></td>
+
+            <td></td>
+
+            
+          </tr>
+        </tbody>
+      </table>
+      <table class="table-box" style="margin-top: 10px;">
+        <tbody>
+          <tr>
+            <td width="70">透析次数:</td>
+            <td width="50">
+              <div class="under-line">&nbsp;{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
+            </td>
+            <td width="30"></td>
+            <td width="40">诊 断:</td>
+            <td width="160">
+              <div class="under-line">&nbsp;{{ patientInfo.diagnose }}</div>
+            </td>
+            <td width="20"></td>
+
+            <td width="60">门诊号:</td>
+            <td width="80">
+              <div class="under-line">
+                &nbsp;{{ patientInfo.dialysis_no }}
+              </div>
+            </td>
+            <td width="20"></td>
+
+            
+            <td width="70">设备型号:</td>
+            <td width='100'>
+                <div class="under-line">&nbsp;
+                    {{ predialysis.machine_type ? predialysis.machine_type : '' }}
+                </div>
+            </td>
+            <td width='30'></td>
+            <td width="30">机位</td>
+            <td width="120">
+                <div class="under-line">&nbsp;{{ getNumber() }}</div>
+            </td>
+            <td width="20">号</td>
+
+            <td></td>
+
+            
+          </tr>
+        </tbody>
+      </table>
+      <table class="print-table" border="1">
+        <tbody>
+          <tr>
+            <td :rowspan="monitors.length + 1" width="30px" class="title-box">
+              透析治疗记录
+            </td>
+
+            <td style="line-height:20px;" width="50">时<br />间</td>
+            <td style="line-height:20px;" width="70">血<br />压<br /><span style="font-size:10px; !important">mmHg</span></td>
+            <td style="line-height:20px;" width="40">脉<br />搏<br /><span style="font-size:10px; !important">次/分</span></td>
+            <td style="line-height:20px;" width="50">血<br />流<br />量<br /><span style="font-size:10px; !important">ml/分</span></td>
+            <td style="line-height:20px;" width="50">动<br />脉<br />压<br /><span style="font-size:10px; !important">mmHg</span></td>
+            <td style="line-height:20px;" width="50">静<br />脉<br />压<br /><span style="font-size:10px; !important">mmHg</span></td>
+            <td style="line-height:20px;" width="50">跨<br />膜<br />压<br /><span style="font-size:10px; !important">mmHg</span></td>
+            <td style="line-height:20px;" width="40">超<br />滤<br />率<br /><span style="font-size:10px; !important">ml/h</span></td>
+            <td style="line-height:20px;" width="40">钠<br />浓<br />度<br /><span style="font-size:10px; !important">mmol/L</span></td>
+            <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
+            
+            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">ml</span></td>
+            <td style="line-height:20px;" width="">病情变化及处理</td>
+            <td style="line-height:20px;" width="60">签名</td>
+          </tr>
+
+          <tr v-for="monitor in monitors" :key="monitor.id">
+            <td style="height:40px;">
+              &nbsp;
+              <!-- <template>
+                <span v-if="monitor.monitoring_date">
+                    {{monitor.monitoring_date | parseTime('{y}-{m}-{d}')}}
+                </span>
+            </template>     -->
+              {{ getTime(monitor.operate_time, "{h}:{i}") }}
+            </td>
+            <td>
+              &nbsp;
+              <span v-if='monitor.operate_time'>
+              {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
+              {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
+              </span>
+            </td>
+            <td>
+              &nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
+            </td>
+            <td>
+              &nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
+            </td>
+
+            <td>
+              &nbsp;<span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.arterial_pressure ? monitor.arterial_pressure : '0' }}</span>
+            </td>
+            <td>
+              &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
+            </td>
+            <td>
+              &nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
+            </td>
+            <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
+            <td>&nbsp;{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
+            <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
+
+            <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '' }}</td>
+            <td style="text-align:left;line-height:20px;">
+              &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
+            </td>
+            <td>
+              <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
+                {{ getAdminUser(monitor.monitoring_nurse) }}
+              </span>
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
+              </span>
+            </td>
+            
+            
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
 </template>
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -177,61 +177,90 @@
                 </div>
               </div>
             </el-tab-pane>
-            <!--<el-tab-pane label="月结" name="second">-->
-              <!--<div style="display:flex;height:100%;">-->
-                <!--<div class="centerLeft">-->
-                  <!--<div class="tabsBox">-->
-                    <!--&lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
-                    <!--<el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>-->
-
-                      <!--<el-tab-pane-->
-                        <!--v-for="(item, index) in month_prescriptions"-->
-                        <!--:key="index"-->
-                        <!--:label="item.name"-->
-                        <!--:name="item.name"-->
-                      <!--&gt;-->
-                      <!--</el-tab-pane>-->
-
-                      <!--<div class="RP">-->
-                        <!--Rp-->
-                        <!--<el-date-picker-->
-                          <!--v-model="other_start_time"-->
-                          <!--prefix-icon="el-icon-date"-->
-                          <!--@change="changeTime"-->
-                          <!--:editable="false"-->
-                          <!--style="width: 150px;"-->
-                          <!--type="date"-->
-                          <!--:picker-options="pickerOptions"-->
-                          <!--placeholder="选择开始时间"-->
-                          <!--align="right"-->
-                          <!--format="yyyy-MM-dd"-->
-                          <!--value-format="yyyy-MM-dd"-->
-                        <!--&gt;</el-date-picker>-->
-                        <!--<span class>-</span>-->
-                        <!--<el-date-picker-->
-                          <!--v-model="other_end_time"-->
-                          <!--prefix-icon="el-icon-date"-->
-                          <!--@change="changeEndTime"-->
-                          <!--:editable="false"-->
-                          <!--style="width: 150px;"-->
-                          <!--type="date"-->
-                          <!--placeholder="选择结束时间"-->
-                          <!--align="right"-->
-                          <!--format="yyyy-MM-dd"-->
-                          <!--value-format="yyyy-MM-dd"-->
-                        <!--&gt;</el-date-picker>-->
-                      <!--</div>-->
-                      <!--&lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
-                    <!--</el-tabs>-->
-
-                  <!--</div>-->
-                  <!--&lt;!&ndash;<div class="costBox">&ndash;&gt;-->
-                    <!--&lt;!&ndash;<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>&ndash;&gt;-->
-                    <!--&lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
-                  <!--&lt;!&ndash;</div>&ndash;&gt;-->
-                <!--</div>-->
-              <!--</div>-->
-            <!--</el-tab-pane>-->
+            <el-tab-pane label="月结" name="second">
+              <div style="display:flex;height:100%;">
+                <div class="centerLeft">
+                  <div class="tabsBox">
+                    <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card" closable>
+
+                      <el-tab-pane
+                        v-for="(item, index) in month_prescriptions"
+                        :key="index"
+                        :label="item.name"
+                        :name="item.name">
+                      </el-tab-pane>
+
+                      <div class="RP">
+                        Rp
+                        <el-date-picker
+                          v-model="other_start_time"
+                          prefix-icon="el-icon-date"
+                          @change="changeTime"
+                          :editable="false"
+                          style="width: 150px;"
+                          type="date"
+                          :picker-options="pickerOptions"
+                          placeholder="选择开始时间"
+                          align="right"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                        <span class>-</span>
+                        <el-date-picker
+                          v-model="other_end_time"
+                          prefix-icon="el-icon-date"
+                          @change="changeEndTime"
+                          :editable="false"
+                          style="width: 150px;"
+                          type="date"
+                          placeholder="选择结束时间"
+                          align="right"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                      </div>
+                      <prescription-table :preTableData='preTableData'></prescription-table>
+                    </el-tabs>
+
+                  </div>
+                  <div class="costBox">
+                    <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
+                    <span>{{ state }}</span>
+                  </div>
+                </div>
+                <div class="centerRight">
+                  <p class="centerRightTitle">人员信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">人员编码:{{patientInfo.dialysis_no}}</span>
+                    <span style="font-size:14px;">日期:{{record_date}}</span>
+                  </div>
+                  <ul class="basicUl">
+                    <li style="width:50%;">姓名：{{patientInfo.name}}</li>
+                    <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>
+                    <li style="width:50%;">年龄：{{patientInfo.age }}</li>
+                    <li style="width:50%;">身高：{{patientInfo.height?patientInfo.height:''}}</li>
+                    <li style="width:50%;">体重：{{patientInfo.weight?patientInfo.weight:''}}</li>
+                    <li style="width:50%;">电话：{{patientInfo.phone}}</li>
+                    <li style="width:100%;">地址：{{patientInfo.home_address}}</li>
+                    <li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>
+                  </ul>
+                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number}}</span>
+                  </div>
+                  <ul class="basicUl">
+                    <li style="width:50%;">医生：{{ info.doctor }}</li>
+                    <li style="width:50%;">科室：{{ info.departments }}</li>
+                    <li style="width:100%;">总费用：{{ getTotal() }}</li>
+
+                    <li style="width:100%;">判断结果：{{info.diagnosis}}</li>
+                    <li style="width:100%;">是否有传染病：</li>
+                    <li style="width:100%;">血压：</li>
+                  </ul>
+                </div>
+              </div>
+            </el-tab-pane>
           </el-tabs>
 
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height: calc(100% - 56px);display: flex;flex-direction: column;margin-top: 56px;">
+  <div style="height: calc(100% - 58px);display: flex;flex-direction: column;margin-top: 56px;">
     <!-- <div style="border-top:1px solid #e5e5e5;margin-top:5px;">
       <div class="mainCell" style="margin-bottom:10px;float:right">
         <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
@@ -11,6 +11,10 @@
     <!-- <div class="backColor"></div> -->
     <div class="mainCenter">
       <div class="centerLeft">
+        <el-tabs v-model="dayorMonth" @tab-click="changeDayOrMonth">
+          <el-tab-pane label="日结" name="day"></el-tab-pane>
+          <el-tab-pane label="月结" name="month"></el-tab-pane>
+        </el-tabs>
         <el-form :model="form" ref="form" label-width="80px"
                  style="display: flex;flex-wrap: wrap;justify-content: space-between;">
           <el-form-item label="姓名:" prop="name" label-position="right">
@@ -82,6 +86,7 @@
             >
             <div class="RP">Rp
               <el-date-picker
+                v-if="dayorMonth == 'day'"
                 v-model="item.pre_time"
                 type="datetime"
                 :clearable="false"
@@ -89,6 +94,14 @@
                 value-format="yyyy-MM-dd hh:mm"
                 placeholder="选择日期">
               </el-date-picker>
+              <el-date-picker
+                v-if="dayorMonth == 'month'"
+                v-model="value1"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+              </el-date-picker>
               <div style="float: right;margin-bottom:5px;margin-right:1%;">
                 <el-button
                   round
@@ -252,6 +265,17 @@
           <div style="height:100%;" v-show="showTwo">
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="项目列表" name="1">
+                <div style="margin-bottom:5px;">
+                  <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
+                  <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
                 <div style="width: 100%;flex:1;overflow-y: auto;">
                   <el-table ref="tables" :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
                             :data="tabProject" border @select='selectChange'
@@ -443,7 +467,8 @@
         diagnose: '',
         curTotal: 0,
         prescription_id: 0,
-        tempDrugs: []
+        tempDrugs: [],
+        dayorMonth:'day'
 
       }
     },
@@ -1543,6 +1568,9 @@
         if (this.departmentValue == 0) {
           this.departmentValue = ""
         }
+      },
+      changeDayOrMonth(tab){
+        // console.log('dayormonth',this.dayorMonth)
       }
     }, mounted() {
       this.request_record_date = this.record_date
@@ -1658,7 +1686,7 @@
     flex: 1;
     overflow-y: auto;
     margin-bottom: 60px;
-    margin-top: 4px;
+    // margin-top: 4px;
 
   .el-tabs__item {
     padding: 0 10px;

src/xt_pages/sign/signIn.vue

@@ -196,7 +196,7 @@ export default {
                 console.log('执行')
                 this.page++
                 let obj = {
-                    cmd: "queue/queuelist",
+                    cmd: "queue/queuelistbyq",
                     data: {page:this.page,size:10,sort:1}
                 };
                 this.websocketSend(obj)
@@ -204,7 +204,7 @@ export default {
                 console.log('执行2222')
                 this.page = 1
                 let newobj = {
-                    cmd: "queue/queuelist",
+                    cmd: "queue/queuelistbyq",
                     data: {page:this.page,size:10,sort:1}
                 };
                 this.websocketSend(newobj)
@@ -263,7 +263,7 @@ export default {
                         this.queueInfo = res.data.queueInfo
                         this.page = 1
                         let obj = {
-                            cmd: "queue/queuelist",
+                            cmd: "queue/queuelistbyq",
                             data: {page:1,size:10,sort:1}
                         };
                         this.websocketSend(obj)