新分支

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    //host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/router/modules/dialysis.js

@@ -789,6 +789,19 @@ export default {
         title: '批量打印',
         noCache: true
       }
-    }
+    },
+
+    {
+      path: '/dialysis/print/batch/fiftyOne',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_fiftyOne',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
   ]
 }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -329,6 +329,15 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 51">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
       <template v-if="this.template_id == 59">
         <el-button
           size="small"
@@ -336,7 +345,7 @@
           :disabled="selecting_schs.length == 0"
           @click="batchPrintAction"
           type="primary"
-          >打印</el-button>
+          >批量打印</el-button>
       </template>
       <template v-if="this.template_id == 60">
         <el-button
@@ -2060,6 +2069,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
       } else if (this.template_id == 48) {
         this.$router.push({ path: "/dialysis/print/batch/six" });
+      }else if (this.template_id == 51) {
+        this.$router.push({ path: "/dialysis/print/batch/fiftyOne" });
       }else if (this.template_id == 59) {
         this.$router.push({ path: "/dialysis/print/batch/fiftynine" });
       }else if (this.template_id == 60) {

src/xt_pages/outpatientCharges/summary.vue

@@ -110,7 +110,7 @@
           >
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
           <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
-          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>
+<!--          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
 
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
@@ -118,7 +118,7 @@
           <!--          </el-button-->
           <!--          >-->
 
-                              <el-button size="small" type="primary" @click="export_detail_three">报表下载2</el-button>
+<!--                              <el-button size="small" type="primary" @click="export_detail_three">报表下载2</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
 <!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
@@ -529,7 +529,8 @@ export default {
           return "普通住院";
           break;
       }
-    },cancelUploadTwo(row){
+    },
+    cancelUploadTwo(row){
       if(this.$store.getters.xt_user.org_id == 10265){
         var that = this;
         axios
@@ -634,7 +635,8 @@ export default {
           })
           .catch(function (error) {
           });
-    },queryData(row){
+    },
+    queryData(row){
       var that = this;
       axios
         .get("http://127.0.0.1:9532/api/4103", {
@@ -1010,7 +1012,87 @@ export default {
           });
         }
       });
+    },getItemTypeName(order_infos,id,type){
+      console.log(type )
+
+      var  name = ""
+      for(let i = 0; i < order_infos.length;i++){
+        if(type == 1){
+          if(order_infos[i].advice_id == id){
+
+            name =   this.getItemName(order_infos[i].med_chrgitm_type)
+          }
+        }else{
+          if(order_infos[i].project_id == id){
+
+            name =   this.getItemName(order_infos[i].med_chrgitm_type)
+          }
+        }
+
+      }
+      return name
+    },       getItemName(med_chrgitm_type) {
+      switch (med_chrgitm_type) {
+        case '01':
+          return '床位费'
+          break
+        case '02':
+          return '诊察费'
+
+          break
+        case '03':
+          return '检查费'
+
+          break
+        case '04':
+          return '化验费'
+          break
+        case '05':
+          return '治疗费'
+
+          break
+        case '06':
+          return '手术费'
+
+          break
+        case '07':
+          return '护理费'
+
+          break
+        case '08':
+          return '材料费'
+
+          break
+        case '09':
+          return '西药费'
+
+          break
+        case '10':
+          return '中药饮片费'
+
+          break
+        case '11':
+          return '中成药费'
+
+          break
+        case '12':
+          return '一般诊疗费'
+
+          break
+        case '13':
+          return '挂号费'
+          break
+        case '14':
+          return '其他费'
+          break
+        case '0':
+          return '其他费'
+          break
+
+      }
+
     },
+
     export_detail_three() {
       let params = {};
       getHisDataThree(params).then((response) => {
@@ -1028,12 +1110,13 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "1",
+                month: "2",
                 code: data[b].code,
                 pric: data[b].count * data[b].price,
                 item_name: data[b].name,
                 unit: data[b].unit,
                 count: data[b].count,
+                item_type_name:this.getItemTypeName(order.order_info, data[b].id,data[b].type)
 
               }
               if (order.insutype == "310") {
@@ -1055,7 +1138,9 @@ export default {
                 "医保类型": list[i].insutype,
                 "年": list[i].year,
                 "月": list[i].month,
+
                 "药品编码": list[i].code,
+                "费用类型": list[i].item_type_name,
                 "名称": list[i].item_name,
                 "单位": list[i].unit,
                 "数量": list[i].count,
@@ -1073,6 +1158,7 @@ export default {
               "年",
               "月",
               "药品编码",
+              "费用类型",
               "名称",
               "单位",
               "数量",
@@ -1086,6 +1172,7 @@ export default {
               "年",
               "月",
               "药品编码",
+              "费用类型",
               "名称",
               "单位",
               "数量",
@@ -2298,47 +2385,40 @@ export default {
 
             } else if (order.his_patient.insuplc_admdvs == "440704"){
 
-              insuplc_admdvs_name = "蓬江区"
+              insuplc_admdvs_name = "江海区"
 
 
             } else if (order.his_patient.insuplc_admdvs == "440705"){
 
-              insuplc_admdvs_name = "蓬江区"
+              insuplc_admdvs_name = "新会区"
 
 
             }else if (order.his_patient.insuplc_admdvs == "440781"){
 
-              insuplc_admdvs_name = "蓬江区"
-
+              insuplc_admdvs_name = "台山市"
 
             }else if (order.his_patient.insuplc_admdvs == "440783"){
-
-              insuplc_admdvs_name = "蓬江区"
-
+              insuplc_admdvs_name = "开平市"
 
             }else if (order.his_patient.insuplc_admdvs == "440784"){
-
-
+              insuplc_admdvs_name = "鹤山市"
 
             }else if (order.his_patient.insuplc_admdvs == "440785"){
-
-
+              insuplc_admdvs_name = "恩平市"
 
             }else if (order.his_patient.insuplc_admdvs == "440799"){
-
-
-
+              insuplc_admdvs_name = "市直"
             }
 
 
-
             let obj = {
               就诊号: order.mdtrt_id,
               患者姓名: name,
               开处时间: time,
               险种类型: insutypeName,
               参保所属医保区划: order.his_patient.insuplc_admdvs,
-              属地名称: order.his_patient.insuplc_admdvs,
+              参保号:order.his_patient.id_card_no,
+              属地名称: insuplc_admdvs_name,
               应收金额: order.medfee_sumamt,
               实收金额: order.medfee_sumamt,
               医保统筹金额: order.hifp_pay,
@@ -2372,6 +2452,9 @@ export default {
               "患者姓名",
               "开处时间",
               "险种类型",
+              "参保所属医保区划",
+              "参保号",
+              "属地名称",
               "应收金额",
               "实收金额",
               "医保统筹金额",
@@ -2401,6 +2484,9 @@ export default {
               "患者姓名",
               "开处时间",
               "险种类型",
+              "参保所属医保区划",
+              "参保号",
+              "属地名称",
               "应收金额",
               "实收金额",
               "医保统筹金额",
@@ -2502,6 +2588,7 @@ export default {
               price: month_prescriptions[i].project[a].price
 
             }
+
             project_ids.push(obj)
             project_month_prescriptions.project.push(month_prescriptions[i].project[a])
           }
@@ -2523,6 +2610,10 @@ export default {
             obj['code'] = drug_month_prescriptions.advices[a].id
             obj['unit'] = drug_month_prescriptions.advices[a].drug.min_unit
             obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+            obj['id'] = drug_month_prescriptions.advices[a].id
+            obj['type'] = 1
+
+
             count = count + drug_month_prescriptions.advices[a].prescribing_number
           }
         }
@@ -2541,17 +2632,20 @@ export default {
               obj['code'] = project_month_prescriptions.project[a].id
               obj['unit'] = project_month_prescriptions.project[a].project.unit
               obj['type'] = 2
+              obj['id'] = project_month_prescriptions.project[a].id
+
 
             } else if (project_month_prescriptions.project[a].type == 3) {
               obj['name'] = project_month_prescriptions.project[a].good_info.good_name
               obj['code'] = project_month_prescriptions.project[a].id
               obj['unit'] = project_month_prescriptions.project[a].good_info.packing_unit
               obj['type'] = 3
+              obj['id'] = project_month_prescriptions.project[a].id
 
             }
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
-            obj['type'] = 1
+            obj['type'] = 2
 
           }
         }

src/xt_pages/sign/lineUp.vue

@@ -43,9 +43,9 @@
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
-                            <p style="width:12%">排队号</p>
+                            <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">排队号</p>
                             <p style="width:14%">姓名</p>
-                            <p style="width:14%">病例号</p>
+                            <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">病例号</p>
                             <p style="width:14%">床位号</p>
                             <p style="width:14%">治疗状态</p>
                             <p style="width:14%">上机时间</p>
@@ -53,14 +53,14 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%">
+                                <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id!=10440">
                                     <span v-if="item.schedule_type == 1">上午</span>
                                     <span v-if="item.schedule_type == 2">下午</span>
                                     <span v-if="item.schedule_type == 3">晚上</span>
                                     {{ item.queue_no }}号
                                 </p>
                                 <p style="width:14%">{{ item.patient_name }}</p>
-                                <p style="width:14%">{{ item.dialysis_no }}</p>
+                                <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">{{ item.dialysis_no }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
                                 <p style="width:14%">
                                     <span v-if="item.status == 1">待接诊</span>
@@ -220,9 +220,9 @@
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
-                            <p style="width:12%">排队号</p>
+                            <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">排队号</p>
                             <p style="width:14%">姓名</p>
-                            <p style="width:14%">病例号</p>
+                            <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">病例号</p>
                             <p style="width:14%">床位号</p>
                             <p style="width:14%">治疗状态</p>
                             <p style="width:14%">上机时间</p>
@@ -230,14 +230,14 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%">
+                                <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">
                                     <span v-if="item.schedule_type == 1">上午</span>
                                     <span v-if="item.schedule_type == 2">下午</span>
                                     <span v-if="item.schedule_type == 3">晚上</span>
                                     {{ item.queue_no }}号
                                 </p>
                                 <p style="width:14%">{{ item.patient_name }}</p>
-                                <p style="width:14%">{{ item.dialysis_no }}</p>
+                                <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">{{ item.dialysis_no }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
                                 <p style="width:14%">
                                     <span v-if="item.status == 1">待接诊</span>

src/xt_pages/user/firstDisease.vue

@@ -11,8 +11,8 @@
 
                         <el-button type="primary" icon="el-icon-edit-outline" size="small"
                                    @click="toEdit">修改</el-button>
-                      <!-- <el-button type="primary" icon="el-icon-printer" size="small"
-                                 @click="print">打印</el-button> -->
+                      <el-button type="primary" icon="el-icon-printer" size="small"
+                                 @click="print">打印</el-button>
                       <el-button size="small"  type="danger" @click="deleteAction">删除</el-button>
                     </span>
         </div>