添加医保编码和名称

src/api/public-api.js

@@ -51,3 +51,13 @@ export function yaoPinShiFouPiPeiYiBao(data) {
         data
     })
 }
+
+export function huoQuYuanGongXinXi(code) {
+    return request({
+        url: '/publicApi/huoQuYuanGongXinXi',
+        method: 'get',
+        params: {code}
+    });
+}
+
+

src/components/inpatient/XiangMuLuRu.vue

@@ -285,6 +285,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="国家编码" prop="nationalCode"></el-table-column>
+                <el-table-column label="国家名称" prop="nationalName"></el-table-column>
                 <el-table-column label="单价" prop="chargeAmount"></el-table-column>
                 <el-table-column label="数量" prop="amount">
                   <template #default="scope">

src/components/med-tec-mod/HuoQuMuBan.vue

@@ -15,6 +15,7 @@
                 <el-table-column type="selection"></el-table-column>
                 <el-table-column label="项目名称" prop="chargeName"></el-table-column>
                 <el-table-column label="国家编码" prop="nationalCode"></el-table-column>
+                <el-table-column label="国家名称" prop="nationalName"></el-table-column>
                 <el-table-column label="单价" prop="chargeAmount"></el-table-column>
                 <el-table-column label="数量" prop="amount"></el-table-column>
                 <el-table-column label="金额">

src/components/med-tec-mod/YiJiXiangMuLuRu.vue

@@ -4,27 +4,27 @@
       <HuoQuMuBan @selectionFeiYong="xuanZeXiangMuTable"></HuoQuMuBan>
     </el-aside>
     <el-main>
-      <el-button type="warning" icon="el-icon-star-off" @click="baoCunMuBanDialog = true">存模板</el-button>
-      <el-button type="primary" @click="shangChuanXiangMu" icon="el-icon-upload">保存</el-button>
-      <el-button type="success" icon="el-icon-plus" @click="xinZhengXiangMuDialog = true">新增</el-button>
-      <el-select style="width: 120px; margin: 0px 10px 0px 10px" v-model="zhiXingKeShi" filterable>
+      <el-button icon="el-icon-star-off" type="warning" @click="baoCunMuBanDialog = true">存模板</el-button>
+      <el-button icon="el-icon-upload" type="primary" @click="shangChuanXiangMu">保存</el-button>
+      <el-button icon="el-icon-plus" type="success" @click="xinZhengXiangMuDialog = true">新增</el-button>
+      <el-select v-model="zhiXingKeShi" filterable style="width: 120px; margin: 0px 10px 0px 10px">
         <el-option v-for="item in deptData" :key="item.code" :label="item.name" :value="item.code">
           <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
           <el-divider direction="vertical"></el-divider>
           <span>{{ item.name }}</span></el-option
         >
       </el-select>
-      <el-button type="warning" icon="el-icon-edit" @click="xieGaiZhiXingKeShi">修改执行科室</el-button>
+      <el-button icon="el-icon-edit" type="warning" @click="xieGaiZhiXingKeShi">修改执行科室</el-button>
       <span v-if="panDuanSFWeiShouShuShi()">
         病区：
-        <el-select style="width: 120px" filterable v-model="queryWard" @change="getBingQuDuiYingKeShiChange">
+        <el-select v-model="queryWard" filterable style="width: 120px" @change="getBingQuDuiYingKeShiChange">
           <el-option v-for="item in wardData" :key="item.code" :label="item.name" :value="item.code">
             <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
             <el-divider direction="vertical"></el-divider>
             <span>{{ item.name }}</span></el-option
           > </el-select
         >小科室：
-        <el-select style="width: 120px" filterable v-model="queryDept">
+        <el-select v-model="queryDept" filterable style="width: 120px">
           <el-option v-for="item in xiaoKeShiList" :key="item.code" :label="item.name" :value="item.code">
             <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
             <el-divider direction="vertical"></el-divider>
@@ -32,27 +32,28 @@
           >
         </el-select>
         手术编码：
-        <el-input style="width: 120px" v-model="ssCode" clearable placeholder="请输入手术编码"></el-input>
+        <el-input v-model="ssCode" clearable placeholder="请输入手术编码" style="width: 120px"></el-input>
       </span>
       <el-tag type="danger"> 项目总价：{{ xiangMuZongJia }}</el-tag>
-      <el-table :data="feiYongShuJu" :height="tableHeight - 27" style="margin-top: 10px" stripe highlight-current-row>
+      <el-table :data="feiYongShuJu" :height="tableHeight - 27" highlight-current-row stripe style="margin-top: 10px">
         <el-table-column label="录入信息">
           <el-table-column label="是否自费" width="130">
             <template #default="scope">
               <el-switch
-                active-color="#ff4949"
-                inactive-color="#13ce66"
-                active-text="自费"
-                inactive-text="医保"
-                :active-value="1"
-                :inactive-value="0"
-                v-model="scope.row.ybSelfFlag"
+                  v-model="scope.row.ybSelfFlag"
+                  :active-value="1"
+                  :inactive-value="0"
+                  active-color="#ff4949"
+                  active-text="自费"
+                  inactive-color="#13ce66"
+                  inactive-text="医保"
               ></el-switch>
             </template>
           </el-table-column>
           <el-table-column label="医生" width="70px">
             <template #default="scope">
-              <el-select v-model="scope.row.doctorCode" remote filterable clearable :remote-method="remoteMethodRenYuan" style="width: 100px">
+              <el-select v-model="scope.row.doctorCode" :remote-method="remoteMethodRenYuan" clearable filterable remote
+                         style="width: 100px">
                 <el-option v-for="item in renYuanList" :key="item.code" :label="item.name" :value="item.code">
                   <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
                   <el-divider direction="vertical"></el-divider>
@@ -65,7 +66,7 @@
           <el-table-column label="名称" prop="chargeName"></el-table-column>
           <el-table-column label="执行科室" prop="deptCode">
             <template #default="scope">
-              <el-select style="width: 90%" v-model="scope.row.deptCode" filterable>
+              <el-select v-model="scope.row.deptCode" filterable style="width: 90%">
                 <el-option v-for="item in deptData" :key="item.code" :label="item.name" :value="item.code">
                   <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
                   <el-divider direction="vertical"></el-divider>
@@ -78,7 +79,8 @@
           <el-table-column label="数量" prop="amount" width="130">
             <template #default="scope">
               <!--precision 限制输入的精度 0 就是不带任何一位小数点  -->
-              <el-input-number v-model="scope.row.amount" style="width: 120px" :min="0" :precision="1"></el-input-number>
+              <el-input-number v-model="scope.row.amount" :min="0" :precision="1"
+                               style="width: 120px"></el-input-number>
             </template>
           </el-table-column>
         </el-table-column>
@@ -95,42 +97,44 @@
         </el-table-column>
       </el-table>
     </el-main>
-    <el-dialog v-model="xinZhengXiangMuDialog" title="新增" :width="1500">
+    <el-dialog v-model="xinZhengXiangMuDialog" :width="1500" title="新增">
       搜索：
       <el-input v-model="chargeCodePy" style="width: 140px" @keyup.enter="rmChargePyCode"></el-input>
       <el-divider direction="vertical"></el-divider>
       <el-button type="primary" @click="rmChargePyCode">查询</el-button>
       <el-divider direction="vertical"></el-divider>
       <el-switch
-        active-color="#409EFF"
-        inactive-color="#13ce66"
-        active-text="药品"
-        inactive-text="项目"
-        :active-value="1"
-        :inactive-value="0"
-        v-model="xiangMuHuoYaoPinFlag"
+          v-model="xiangMuHuoYaoPinFlag"
+          :active-value="1"
+          :inactive-value="0"
+          active-color="#409EFF"
+          active-text="药品"
+          inactive-color="#13ce66"
+          inactive-text="项目"
       ></el-switch>
       <el-divider direction="vertical"></el-divider>
       <el-table
-        :data="
+          :data="
           xiangMuHuoYaoPinShuJu.data.slice(
             (xiangMuHuoYaoPinShuJu.currentPage - 1) * xiangMuHuoYaoPinShuJu.pageSize,
             xiangMuHuoYaoPinShuJu.currentPage * xiangMuHuoYaoPinShuJu.pageSize
           )
         "
-        :height="tableHeight / 1.2"
+          :height="tableHeight / 1.2"
       >
         <el-table-column label="操作" width="40">
           <template #default="scope">
-            <el-button @click="danGeXiangMuBaoCun(scope.row)" type="text">添加</el-button>
+            <el-button type="text" @click="danGeXiangMuBaoCun(scope.row)">添加</el-button>
           </template>
         </el-table-column>
         <el-table-column label="项目编码" prop="chargeCodeMx"></el-table-column>
         <el-table-column label="项目名称" prop="chargeName"></el-table-column>
+        <el-table-column label="国家编码" prop="nationalCode"></el-table-column>
+        <el-table-column label="国家名称" prop="nationalName"></el-table-column>
         <el-table-column label="规格" prop="spec"></el-table-column>
         <el-table-column label="执行科室" prop="deptCode">
           <template #default="scope">
-            <el-select style="width: 90%" v-model="scope.row.deptCode" filterable>
+            <el-select v-model="scope.row.deptCode" filterable style="width: 90%">
               <el-option v-for="item in deptData" :key="item.code" :label="item.name" :value="item.code">
                 <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
                 <el-divider direction="vertical"></el-divider>
@@ -151,25 +155,25 @@
           </template>
         </el-table-column>
         <el-table-column label="账单码" prop="billItemName"></el-table-column>
-        <el-table-column label="库存" prop="stockAmount" v-if="xiangMuHuoYaoPinFlag === 1"></el-table-column>
-        <el-table-column label="医保类型" prop="yblx" v-if="xiangMuHuoYaoPinFlag === 1"></el-table-column>
+        <el-table-column v-if="xiangMuHuoYaoPinFlag === 1" label="库存" prop="stockAmount"></el-table-column>
+        <el-table-column v-if="xiangMuHuoYaoPinFlag === 1" label="医保类型" prop="yblx"></el-table-column>
       </el-table>
       <el-pagination
-        :page-size="xiangMuHuoYaoPinShuJu.pageSize"
-        :current-page="xiangMuHuoYaoPinShuJu.currentPage"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="xiangMuHuoYaoPinShuJu.data.length"
-        @size-change="xinZhengSizeChange"
-        @current-change="xinZhengCurrentChange"
-        background
+          :current-page="xiangMuHuoYaoPinShuJu.currentPage"
+          :page-size="xiangMuHuoYaoPinShuJu.pageSize"
+          :total="xiangMuHuoYaoPinShuJu.data.length"
+          background
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="xinZhengSizeChange"
+          @current-change="xinZhengCurrentChange"
       >
       </el-pagination>
     </el-dialog>
-    <el-dialog title="保存模板" v-model="baoCunMuBanDialog">
+    <el-dialog v-model="baoCunMuBanDialog" title="保存模板">
       <el-row>
         <el-col :span="24">
           模板名称：
-          <el-input v-model="cunMuBanPojo.name" maxlength="15" @blur="zhuanPinYin" show-word-limit></el-input>
+          <el-input v-model="cunMuBanPojo.name" maxlength="15" show-word-limit @blur="zhuanPinYin"></el-input>
         </el-col>
         <el-col :span="12">
           拼音码：
@@ -181,7 +185,7 @@
         </el-col>
         <!-- <el-col :span="12"> 排序码：<el-input v-model="cunMuBanPojo.paiXu" maxlength="7" show-word-limit></el-input> </el-col> -->
         <el-col :span="12">
-          <el-button style="margin-top: 10px" icon="el-icon-upload" type="primary" @click="baoCunMuBan">保存</el-button>
+          <el-button icon="el-icon-upload" style="margin-top: 10px" type="primary" @click="baoCunMuBan">保存</el-button>
         </el-col>
       </el-row>
     </el-dialog>
@@ -189,14 +193,22 @@
 </template>
 
 <script>
-import { computed, onMounted, ref, watch } from 'vue'
-import { getMuBanXinXi, xiangMuFeiYongShangChuan, getDept, queryDanGeXiangMu, getPyCode, shangChuanMuBan } from '@/api/yibao/xiang-mu-lu-ru'
-import { getRenYuan } from '../../api/public-api.js'
+import {computed, onMounted, ref, watch} from 'vue'
+import {
+  getBingQuDuiYingKeShi,
+  getDept,
+  getMuBanXinXi,
+  getPyCode,
+  getWard,
+  queryDanGeXiangMu,
+  shangChuanMuBan,
+  xiangMuFeiYongShangChuan
+} from '@/api/yibao/xiang-mu-lu-ru'
+import {getRenYuan} from '../../api/public-api.js'
 import store from '@/store'
-import { getDatetime } from '@/utils/date'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { getBingQuDuiYingKeShi, getWard } from '@/api/yibao/xiang-mu-lu-ru'
-import { clone } from '@/utils/clone'
+import {getDatetime} from '@/utils/date'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {clone} from '@/utils/clone'
 import HuoQuMuBan from './HuoQuMuBan.vue'
 
 export default {
@@ -283,13 +295,14 @@ export default {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
       })
-        .then(() => {
-          xiangMuFeiYongShangChuan(shangChuanFeiYong).then(() => {
-            feiYongShuJu.value = []
-            chargeCode.value = []
+          .then(() => {
+            xiangMuFeiYongShangChuan(shangChuanFeiYong).then(() => {
+              feiYongShuJu.value = []
+              chargeCode.value = []
+            })
+          })
+          .catch(() => {
           })
-        })
-        .catch(() => {})
     }
 
     const shanChuXiangMuClick = (val) => {
@@ -356,15 +369,15 @@ export default {
     })
 
     watch(
-      () => props.patient,
-      () => {
-        // 这里刚好是反着的
-        queryWard.value = props.patient.admissDept
-        getBingQuDuiYingKeShiChange()
-        setTimeout(() => {
-          queryDept.value = props.patient.zkWard
-        }, 100)
-      }
+        () => props.patient,
+        () => {
+          // 这里刚好是反着的
+          queryWard.value = props.patient.admissDept
+          getBingQuDuiYingKeShiChange()
+          setTimeout(() => {
+            queryDept.value = props.patient.zkWard
+          }, 100)
+        }
     )
     // 以下是保存模板
     const baoCunMuBanDialog = ref(false)
@@ -436,10 +449,10 @@ export default {
     }
 
     watch(
-      () => xiangMuHuoYaoPinFlag.value,
-      () => {
-        xiangMuHuoYaoPinShuJu.value.data = []
-      }
+        () => xiangMuHuoYaoPinFlag.value,
+        () => {
+          xiangMuHuoYaoPinShuJu.value.data = []
+        }
     )
     const renYuanList = ref([])
 

src/components/progress/Index.vue

@@ -38,7 +38,7 @@ import { useStore } from 'vuex'
 import { setCallback } from '@/utils/websocket'
 import { Export } from '@/utils/ExportExcel'
 import { makePercentage } from './progUtils'
-import { stringNotBlank } from '../../utils/blank-utils'
+import { stringNotBlank } from '@/utils/blank-utils'
 import { reactive, watch } from 'vue'
 
 export default {

src/components/si-sheet-upload/jieSuanDanDaYing.vue

@@ -1,12 +1,12 @@
 <template>
-  <el-dialog v-model="jieSuanDanDaYingDialog" fullscreen @closed="emit('close')" title="打印结算单">
+  <el-dialog v-model="jieSuanDanDaYingDialog" fullscreen title="打印结算单" @closed="emit('close')">
     <el-affix :offset="50" style="margin-left: 800px">
-      <el-button @click="daYingClick" size="medium" type="primary">打印</el-button>
+      <el-button size="medium" type="primary" @click="daYingClick">打印</el-button>
     </el-affix>
     <el-affix :offset="100" style="margin-left: 800px">
-      <el-button @click="jieSuanDanDaYingDialog = false" size="medium" type="danger">退出</el-button>
+      <el-button size="medium" type="danger" @click="jieSuanDanDaYingDialog = false">退出</el-button>
     </el-affix>
-    <br />
+    <br/>
     <div id="setl">
       <div id="setl1">
         <h2 style="text-align: center"><span style="text-decoration: underline">湖南省</span>长沙市医疗保障基金结算清单</h2>
@@ -53,7 +53,8 @@
             </div>
           </div>
         </div>
-        <div style="border: 1px solid #000; line-height: 20px; text-align: center; background-color: rgba(127, 187, 236, 0.8)">
+        <div
+            style="border: 1px solid #000; line-height: 20px; text-align: center; background-color: rgba(127, 187, 236, 0.8)">
           <b style="color: #000"> 一、基本信息 </b>
         </div>
         <div class="divBorder" style="padding: 4px; margin-bottom: 4px">
@@ -242,7 +243,8 @@
           <!--   第七行     -->
         </div>
         <!--  二、门诊慢特病诊疗信息    -->
-        <div style="border: 1px solid #000; line-height: 20px; text-align: center; background-color: rgba(127, 187, 236, 0.8)">
+        <div
+            style="border: 1px solid #000; line-height: 20px; text-align: center; background-color: rgba(127, 187, 236, 0.8)">
           <b style="color: #000"> 二、门诊慢特病诊疗信息 </b>
         </div>
         <div class="divBorder" style="padding: 0 5px">
@@ -285,344 +287,358 @@
         </div>
         <!--      二、门诊慢特病诊疗信息    -->
         <!--三、住院诊疗信息-->
-        <div style="border: 1px solid #000; line-height: 20px; text-align: center; background-color: rgba(127, 187, 236, 0.8); margin-top: 5px">
-          <b style="color: #000"> 三、住院诊疗信息 </b>
-        </div>
-        <div class="divBorder" style="padding: 0 5px">
-          <!--        1-->
-          <div class="div-border-bottom">
-            <div class="wen-zi">
-              <div>住院医疗类型</div>
-              <div class="w10 divBorder">
-                <span>{{ setlinfo.iptMedType }}</span>
-              </div>
-              <div>1.住院 2.日间手术</div>
-            </div>
+        <div v-if="zyFlag">
+          <div
+              style="border: 1px solid #000; line-height: 20px; text-align: center; background-color: rgba(127, 187, 236, 0.8); margin-top: 5px">
+            <b style="color: #000"> 三、住院诊疗信息 </b>
           </div>
-          <!--1-->
-          <!--2-->
-          <div class="div-border-bottom">
-            <div class="wen-zi">
-              <div>入院途径</div>
-              <div class="w10 divBorder">
-                <span>{{ setlinfo.admWay }}</span>
+          <div class="divBorder" style="padding: 0 5px">
+            <!--        1-->
+            <div class="div-border-bottom">
+              <div class="wen-zi">
+                <div>住院医疗类型</div>
+                <div class="w10 divBorder">
+                  <span>{{ setlinfo.iptMedType }}</span>
+                </div>
+                <div>1.住院 2.日间手术</div>
               </div>
-              <div>1.急诊 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.门诊&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 3.其他医疗机构转入&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 9.其他</div>
             </div>
-          </div>
-          <!--2-->
-          <!--3-->
-          <div class="div-border-bottom">
-            <div class="wen-zi">
-              <div>治疗类别</div>
-              <div class="w10 divBorder">
-                <span>{{ setlinfo.trtType }}</span>
+            <!--1-->
+            <!--2-->
+            <div class="div-border-bottom">
+              <div class="wen-zi">
+                <div>入院途径</div>
+                <div class="w10 divBorder">
+                  <span>{{ setlinfo.admWay }}</span>
+                </div>
+                <div>1.急诊 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;2.门诊&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 3.其他医疗机构转入&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  9.其他
+                </div>
               </div>
-              <div>1.西医 2.中医（2.1 中医 2.2 民族医）3.中西医</div>
             </div>
-          </div>
-          <!--3-->
-          <!--4-->
-          <div class="div-border-bottom">
-            <div class="wen-zi">
-              <div>入院时间</div>
-              <div class="w120">
-                <span>{{ getDateName(setlinfo.admTime) }}</span>
+            <!--2-->
+            <!--3-->
+            <div class="div-border-bottom">
+              <div class="wen-zi">
+                <div>治疗类别</div>
+                <div class="w10 divBorder">
+                  <span>{{ setlinfo.trtType }}</span>
+                </div>
+                <div>1.西医 2.中医（2.1 中医 2.2 民族医）3.中西医</div>
               </div>
             </div>
-            <div class="wen-zi">
-              <div>入院科别</div>
-              <div class="w120">
-                <span>{{ setlinfo.admCatyName }}</span>
+            <!--3-->
+            <!--4-->
+            <div class="div-border-bottom">
+              <div class="wen-zi">
+                <div>入院时间</div>
+                <div class="w120">
+                  <span>{{ getDateName(setlinfo.admTime) }}</span>
+                </div>
               </div>
-            </div>
-            <div class="wen-zi">
-              <div>转科科别</div>
-              <div class="w120">
-                <span>{{ setlinfo.refldeptDeptName }}</span>
+              <div class="wen-zi">
+                <div>入院科别</div>
+                <div class="w120">
+                  <span>{{ setlinfo.admCatyName }}</span>
+                </div>
               </div>
-            </div>
-          </div>
-          <!--4-->
-          <!--5-->
-          <div class="div-border-bottom">
-            <div class="wen-zi">
-              <div>出院时间</div>
-              <div class="w120">
-                <span>{{ getDateName(setlinfo.dscgTime) }}</span>
+              <div class="wen-zi">
+                <div>转科科别</div>
+                <div class="w120">
+                  <span>{{ setlinfo.refldeptDeptName }}</span>
+                </div>
               </div>
             </div>
-            <div class="wen-zi">
-              <div>出院科别</div>
-              <div class="w120">
-                <span>{{ setlinfo.dscgCatyName }}</span>
+            <!--4-->
+            <!--5-->
+            <div class="div-border-bottom">
+              <div class="wen-zi">
+                <div>出院时间</div>
+                <div class="w120">
+                  <span>{{ getDateName(setlinfo.dscgTime) }}</span>
+                </div>
               </div>
-            </div>
-            <div class="wen-zi">
-              <div>实际住院</div>
-              <div class="w120">
-                <span>{{ setlinfo.actIptDays }}</span>
+              <div class="wen-zi">
+                <div>出院科别</div>
+                <div class="w120">
+                  <span>{{ setlinfo.dscgCatyName }}</span>
+                </div>
               </div>
-              <div>天</div>
-            </div>
-          </div>
-          <!--5-->
-          <!--6-->
-          <div class="tanXingHeZiHeng" style="margin-top: 0">
-            <div class="wen-zi">
-              <div>门（急）诊诊断（西医诊断）</div>
-              <div class="w120">
-                <span>{{ setlinfo.otpWmDise }}</span>
+              <div class="wen-zi">
+                <div>实际住院</div>
+                <div class="w120">
+                  <span>{{ setlinfo.actIptDays }}</span>
+                </div>
+                <div>天</div>
               </div>
             </div>
-            <div class="wen-zi">
-              <div>疾病代码</div>
-              <div class="w120">
-                <span>{{ setlinfo.wmDiseCode }}</span>
+            <!--5-->
+            <!--6-->
+            <div class="tanXingHeZiHeng" style="margin-top: 0">
+              <div class="wen-zi">
+                <div>门（急）诊诊断（西医诊断）</div>
+                <div class="w120">
+                  <span>{{ setlinfo.otpWmDise }}</span>
+                </div>
               </div>
-            </div>
-          </div>
-          <div class="tanXingHeZiHeng" style="margin-top: 0">
-            <div class="wen-zi">
-              <div>门（急）诊诊断（中医诊断）</div>
-              <div class="w120">
-                <span>{{ setlinfo.otpTcmDise }}</span>
+              <div class="wen-zi">
+                <div>疾病代码</div>
+                <div class="w120">
+                  <span>{{ setlinfo.wmDiseCode }}</span>
+                </div>
               </div>
             </div>
-            <div class="wen-zi">
-              <div>疾病代码</div>
-              <div class="w120">
-                <span>{{ setlinfo.tcmDiseCode }}</span>
+            <div class="tanXingHeZiHeng" style="margin-top: 0">
+              <div class="wen-zi">
+                <div>门（急）诊诊断（中医诊断）</div>
+                <div class="w120">
+                  <span>{{ setlinfo.otpTcmDise }}</span>
+                </div>
+              </div>
+              <div class="wen-zi">
+                <div>疾病代码</div>
+                <div class="w120">
+                  <span>{{ setlinfo.tcmDiseCode }}</span>
+                </div>
               </div>
             </div>
+            <!--6-->
           </div>
-          <!--6-->
-        </div>
-        <div class="tanXingHeZiHeng">
-          <table style="width: 100%">
-            <tr>
-              <th>出院西医诊断</th>
-              <th>疾病代码</th>
-              <th>入院病情</th>
-              <th>出院中医诊断</th>
-              <th>疾病代码</th>
-              <th>入院病情</th>
-            </tr>
-            <tr v-for="(item, index) in diseinfoData">
-              <td>{{ index === 0 ? '主要诊断：' + item.xiYiDisDiagComment : index === 1 ? '其他诊断：' + item.xiYiDisDiagComment : item.xiYiDisDiagComment }}</td>
-              <td>{{ item.xiYiDisDiag }}</td>
-              <td>{{ getAdmissCond(item.xiYiAdmissCond) }}</td>
-              <td>{{ index === 0 ? '主病：' + item.ZhongYiDiagComment : index === 1 ? '主证：' + item.ZhongYiDiagComment : item.ZhongYiDiagComment }}</td>
-              <td>{{ item.ZhongYiDisDiag }}</td>
-              <td>{{ getAdmissCond(item.ZhongYiAdmissCond) }}</td>
-            </tr>
-          </table>
-        </div>
-        <div class="tanXingHeZiHeng" style="margin-top: 2px">
-          <div class="wen-zi">
-            <div>诊断代码计数</div>
-            <div class="w90">
-              <span>{{ setlinfo.diagCodeCnt }}</span>
-            </div>
+          <div class="tanXingHeZiHeng">
+            <table style="width: 100%">
+              <tr>
+                <th>出院西医诊断</th>
+                <th>疾病代码</th>
+                <th>入院病情</th>
+                <th>出院中医诊断</th>
+                <th>疾病代码</th>
+                <th>入院病情</th>
+              </tr>
+              <tr v-for="(item, index) in diseinfoData">
+                <td>{{
+                    index === 0 ? '主要诊断：' + item.xiYiDisDiagComment : index === 1 ? '其他诊断：' + item.xiYiDisDiagComment : item.xiYiDisDiagComment
+                  }}
+                </td>
+                <td>{{ item.xiYiDisDiag }}</td>
+                <td>{{ getAdmissCond(item.xiYiAdmissCond) }}</td>
+                <td>{{
+                    index === 0 ? '主病：' + item.ZhongYiDiagComment : index === 1 ? '主证：' + item.ZhongYiDiagComment : item.ZhongYiDiagComment
+                  }}
+                </td>
+                <td>{{ item.ZhongYiDisDiag }}</td>
+                <td>{{ getAdmissCond(item.ZhongYiAdmissCond) }}</td>
+              </tr>
+            </table>
           </div>
-        </div>
-      </div>
-      <!--三、住院诊疗信息-->
-      <div id="setl2">
-        <div v-for="(item, index) in oprninfoData">
-          <table style="width: 100%">
-            <tr>
-              <td>{{ index === 0 ? '主要手术及操作名称' : '其他手术及操作名称' + index }}</td>
-              <td>{{ index === 0 ? '主要手术及操作代码' : '其他手术及操作代码' + index }}</td>
-              <td>麻醉方式</td>
-              <td>术者医师名</td>
-              <td>术者医师代码</td>
-              <td>麻醉医生姓名</td>
-              <td>麻醉医生代码</td>
-            </tr>
-            <tr>
-              <td>{{ item.ssmc }}</td>
-              <td>{{ item.ssbm }}</td>
-              <td>{{ maZuiName(item.mzff) }}</td>
-              <td>{{ item.ssysName }}</td>
-              <td>{{ item.operDrCode === null ? item.ssys : item.operDrCode }}</td>
-              <td>{{ item.mzysName }}</td>
-              <td>{{ item.anstDrCode === null ? item.mzys : item.anstDrCode }}</td>
-            </tr>
-          </table>
-          <div style="display: flex; justify-content: space-between">
+          <div class="tanXingHeZiHeng" style="margin-top: 2px">
             <div class="wen-zi">
-              <div>手术及操作起止时间</div>
-              <div class="w300 div-border-bottom">
-                <span>{{ getShouShuShiJian(item.ssrq) }} </span>
+              <div>诊断代码计数</div>
+              <div class="w90">
+                <span>{{ setlinfo.diagCodeCnt }}</span>
               </div>
             </div>
-            <div class="wen-zi">
-              <div>麻醉起止时间</div>
-              <div class="w300 div-border-bottom"></div>
-            </div>
           </div>
-          <span v-if="index === 0"></span>
-        </div>
-        <div class="tanXingHeZiHeng div-border-bottom">
-          <div class="wen-zi">
-            <div>呼吸机使用时间</div>
-            <div class="w300">
-              <span>{{ setlinfo.ventUsedDura }}</span>
+          <!--三、住院诊疗信息-->
+          <div id="setl2">
+            <div v-for="(item, index) in oprninfoData">
+              <table style="width: 100%">
+                <tr>
+                  <td>{{ index === 0 ? '主要手术及操作名称' : '其他手术及操作名称' + index }}</td>
+                  <td>{{ index === 0 ? '主要手术及操作代码' : '其他手术及操作代码' + index }}</td>
+                  <td>麻醉方式</td>
+                  <td>术者医师名</td>
+                  <td>术者医师代码</td>
+                  <td>麻醉医生姓名</td>
+                  <td>麻醉医生代码</td>
+                </tr>
+                <tr>
+                  <td>{{ item.ssmc }}</td>
+                  <td>{{ item.ssbm }}</td>
+                  <td>{{ maZuiName(item.mzff) }}</td>
+                  <td>{{ item.ssysName }}</td>
+                  <td>{{ item.operDrCode === null ? item.ssys : item.operDrCode }}</td>
+                  <td>{{ item.mzysName }}</td>
+                  <td>{{ item.anstDrCode === null ? item.mzys : item.anstDrCode }}</td>
+                </tr>
+              </table>
+              <div style="display: flex; justify-content: space-between">
+                <div class="wen-zi">
+                  <div>手术及操作起止时间</div>
+                  <div class="w300 div-border-bottom">
+                    <span>{{ getShouShuShiJian(item.ssrq) }} </span>
+                  </div>
+                </div>
+                <div class="wen-zi">
+                  <div>麻醉起止时间</div>
+                  <div class="w300 div-border-bottom"></div>
+                </div>
+              </div>
+              <span v-if="index === 0"></span>
             </div>
-          </div>
-        </div>
-        <div class="tanXingHeZiHeng div-border-bottom">
-          <div class="wen-zi">
-            <div>颅脑损伤患者昏迷时间：</div>
-            <div style="height: 40px; border: 0">
-              <div>入院前 {{ luNeiShiJian(setlinfo.pwcryBfadmComaDura) }}</div>
-              <br />
-              <div>入院后 {{ luNeiShiJian(setlinfo.pwcryAfadmComaDura) }}</div>
+            <div class="tanXingHeZiHeng div-border-bottom">
+              <div class="wen-zi">
+                <div>呼吸机使用时间</div>
+                <div class="w300">
+                  <span>{{ setlinfo.ventUsedDura }}</span>
+                </div>
+              </div>
+            </div>
+            <div class="tanXingHeZiHeng div-border-bottom">
+              <div class="wen-zi">
+                <div>颅脑损伤患者昏迷时间：</div>
+                <div style="height: 40px; border: 0">
+                  <div>入院前 {{ luNeiShiJian(setlinfo.pwcryBfadmComaDura) }}</div>
+                  <br/>
+                  <div>入院后 {{ luNeiShiJian(setlinfo.pwcryAfadmComaDura) }}</div>
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
 
-        <table>
-          <tr>
-            <th>
-              重症监护病房类型 （CCU、NICU、ECU、SICU、<br />
-              PICU、RICU、ICU（综合）、其 <br />
-              他）
-            </th>
-            <th>
-              进重症监护室时间 <br />
-              (_年_月_日_时_分)
-            </th>
-            <th>
-              出重症监护室时间<br />
-              (_年_月_日_时_分)
-            </th>
-            <th>合计（ 时 分）</th>
-          </tr>
-          <tr v-for="(item, index) in icuinfoData">
-            <td>{{ item.scsCutdWardType }}</td>
-            <td>{{ item.scsCutdInpoolTime }}</td>
-            <td>{{ item.scsCutdExitTime }}</td>
-            <td>{{ item.scsCutdSumDura }}</td>
-          </tr>
-        </table>
+            <table>
+              <tr>
+                <th>
+                  重症监护病房类型 （CCU、NICU、ECU、SICU、<br/>
+                  PICU、RICU、ICU（综合）、其 <br/>
+                  他）
+                </th>
+                <th>
+                  进重症监护室时间 <br/>
+                  (_年_月_日_时_分)
+                </th>
+                <th>
+                  出重症监护室时间<br/>
+                  (_年_月_日_时_分)
+                </th>
+                <th>合计（ 时 分）</th>
+              </tr>
+              <tr v-for="(item, index) in icuinfoData">
+                <td>{{ item.scsCutdWardType }}</td>
+                <td>{{ item.scsCutdInpoolTime }}</td>
+                <td>{{ item.scsCutdExitTime }}</td>
+                <td>{{ item.scsCutdSumDura }}</td>
+              </tr>
+            </table>
 
-        <table>
-          <tr>
-            <th>输血品种</th>
-            <th>输血量</th>
-            <th>输血计量单位</th>
-          </tr>
-          <tr v-for="(item, index) in bldData">
-            <td>{{ item.bldCat }}</td>
-            <td>{{ item.bldAmt }}</td>
-            <td>{{ item.bldUnt }}</td>
-          </tr>
-        </table>
+            <table>
+              <tr>
+                <th>输血品种</th>
+                <th>输血量</th>
+                <th>输血计量单位</th>
+              </tr>
+              <tr v-for="(item, index) in bldData">
+                <td>{{ item.bldCat }}</td>
+                <td>{{ item.bldAmt }}</td>
+                <td>{{ item.bldUnt }}</td>
+              </tr>
+            </table>
 
-        <div class="tanXingHeZiHeng div-border-bottom">
-          <div class="wen-zi">
-            <div>特级护理天数</div>
-            <div class="w90">
-              <span>{{ setlinfo.spgaNurscareDays }}</span>
-            </div>
-          </div>
-          <div class="wen-zi">
-            <div>一级护理天数</div>
-            <div class="w90">
-              <span>{{ setlinfo.lv1NurscareDays }}</span>
-            </div>
-          </div>
-          <div class="wen-zi">
-            <div>二级护理天数</div>
-            <div class="w90">
-              <span>{{ setlinfo.scdNurscareDays }}</span>
-            </div>
-          </div>
-          <div class="wen-zi">
-            <div>三级护理天数</div>
-            <div class="w90">
-              <span>{{ setlinfo.lv3NurscareDays }}</span>
+            <div class="tanXingHeZiHeng div-border-bottom">
+              <div class="wen-zi">
+                <div>特级护理天数</div>
+                <div class="w90">
+                  <span>{{ setlinfo.spgaNurscareDays }}</span>
+                </div>
+              </div>
+              <div class="wen-zi">
+                <div>一级护理天数</div>
+                <div class="w90">
+                  <span>{{ setlinfo.lv1NurscareDays }}</span>
+                </div>
+              </div>
+              <div class="wen-zi">
+                <div>二级护理天数</div>
+                <div class="w90">
+                  <span>{{ setlinfo.scdNurscareDays }}</span>
+                </div>
+              </div>
+              <div class="wen-zi">
+                <div>三级护理天数</div>
+                <div class="w90">
+                  <span>{{ setlinfo.lv3NurscareDays }}</span>
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
 
-        <div class="tanXingHeZiHeng">
-          <div class="wen-zi">
-            <div>离院方式</div>
-            <div class="w10 divBorder">
-              <span>{{ setlinfo.dscgWay }}</span>
-            </div>
-            <div>1.医嘱离院 2. 医嘱转院，</div>
-          </div>
-          <div class="wen-zi">
-            <div>拟接收机构名称</div>
-            <div class="w90">
-              <span>{{ setlinfo.acpMedinsName }}</span>
-            </div>
-          </div>
-          <div class="wen-zi">
-            <div>拟接收机构代码</div>
-            <div class="w90">
-              <span>{{ setlinfo.acpOptinsCode }}</span>
+            <div class="tanXingHeZiHeng">
+              <div class="wen-zi">
+                <div>离院方式</div>
+                <div class="w10 divBorder">
+                  <span>{{ setlinfo.dscgWay }}</span>
+                </div>
+                <div>1.医嘱离院 2. 医嘱转院，</div>
+              </div>
+              <div class="wen-zi">
+                <div>拟接收机构名称</div>
+                <div class="w90">
+                  <span>{{ setlinfo.acpMedinsName }}</span>
+                </div>
+              </div>
+              <div class="wen-zi">
+                <div>拟接收机构代码</div>
+                <div class="w90">
+                  <span>{{ setlinfo.acpOptinsCode }}</span>
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
-
-        <div class="tanXingHeZiHeng div-border-bottom" style="margin-bottom: 4px">3.转社区、转卫生院机构， 4.非医嘱离院 5.死亡 9.其他</div>
 
-        <div class="tanXingHeZiHeng div-border-bottom">
-          <div class="wen-zi">
-            <div>是否有出院 31 天内再住院计划</div>
-            <div class="w10 divBorder">
-              <span>{{ setlinfo.daysRinpFlag31 }}</span>
+            <div class="tanXingHeZiHeng div-border-bottom" style="margin-bottom: 4px">3.转社区、转卫生院机构， 4.非医嘱离院 5.死亡 9.其他
             </div>
-            <div>1.无 2.有</div>
-          </div>
 
-          <div class="wen-zi">
-            <div>目的</div>
-            <div style="width: 400px">
-              <span>{{ setlinfo.daysRinpPup31 }}</span>
-            </div>
-          </div>
-        </div>
+            <div class="tanXingHeZiHeng div-border-bottom">
+              <div class="wen-zi">
+                <div>是否有出院 31 天内再住院计划</div>
+                <div class="w10 divBorder">
+                  <span>{{ setlinfo.daysRinpFlag31 }}</span>
+                </div>
+                <div>1.无 2.有</div>
+              </div>
 
-        <div class="tanXingHeZiHeng div-border-bottom" style="justify-content: flex-start">
-          <div class="wen-zi">
-            <div>主诊医师姓名</div>
-            <div class="w90">
-              <span>{{ setlinfo.chfpdrName }}</span>
-            </div>
-          </div>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <div class="wen-zi">
-            <div>主诊医师代码</div>
-            <div class="w90">
-              <span>{{ setlinfo.chfpdrCode }}</span>
+              <div class="wen-zi">
+                <div>目的</div>
+                <div style="width: 400px">
+                  <span>{{ setlinfo.daysRinpPup31 }}</span>
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
 
-        <div class="tanXingHeZiHeng div-border-bottom" style="justify-content: flex-start">
-          <div class="wen-zi">
-            <div>责任护士姓名</div>
-            <div class="w90">
-              <span>{{ setlinfo.respNursName }}</span>
+            <div class="tanXingHeZiHeng div-border-bottom" style="justify-content: flex-start">
+              <div class="wen-zi">
+                <div>主诊医师姓名</div>
+                <div class="w90">
+                  <span>{{ setlinfo.chfpdrName }}</span>
+                </div>
+              </div>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <div class="wen-zi">
+                <div>主诊医师代码</div>
+                <div class="w90">
+                  <span>{{ setlinfo.chfpdrCode }}</span>
+                </div>
+              </div>
             </div>
-          </div>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <div class="wen-zi">
-            <div>责任护士代码</div>
-            <div class="w90">
-              <span>{{ setlinfo.respNurs }}</span>
+
+            <div class="tanXingHeZiHeng div-border-bottom" style="justify-content: flex-start">
+              <div class="wen-zi">
+                <div>责任护士姓名</div>
+                <div class="w90">
+                  <span>{{ setlinfo.respNursName }}</span>
+                </div>
+              </div>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <div class="wen-zi">
+                <div>责任护士代码</div>
+                <div class="w90">
+                  <span>{{ setlinfo.respNurs }}</span>
+                </div>
+              </div>
             </div>
           </div>
         </div>
       </div>
+
       <div id="setl3">
-        <div style="border: 1px solid #000; line-height: 20px; text-align: center; background-color: rgba(127, 187, 236, 0.8); margin-top: 5px">
+        <div
+            style="border: 1px solid #000; line-height: 20px; text-align: center; background-color: rgba(127, 187, 236, 0.8); margin-top: 5px">
           <b style="color: #000"> 四、医疗收费信息</b>
         </div>
 
@@ -652,7 +668,9 @@
 
           <div class="wen-zi">
             <div style="margin-left: 10px">结算期间</div>
-            <div style="margin-left: 10px; line-height: 45px" class="w250">{{ nianYueRi(setlinfo.setlBegnDate) }} - {{ nianYueRi(setlinfo.setlEndDate) }}</div>
+            <div class="w250" style="margin-left: 10px; line-height: 45px">{{ nianYueRi(setlinfo.setlBegnDate) }} -
+              {{ nianYueRi(setlinfo.setlEndDate) }}
+            </div>
           </div>
         </div>
 
@@ -667,7 +685,7 @@
           </tr>
 
           <tr v-for="(item, index) in iteminfoData">
-            <td>{{ item.medChrgitm }}</td>
+            <td>{{ item.medChrgitmName }}</td>
             <td>{{ item.amt }}</td>
             <td>{{ item.claaSumfee }}</td>
             <td>{{ item.clabAmt }}</td>
@@ -676,8 +694,8 @@
           </tr>
         </table>
         <!--第二页-->
-        <div class="tanXingHeZiHeng">
-          <div style="width: 50%" id="yiBaoZhiFu">
+        <div class="tanXingHeZiHeng" style="height: 241px">
+          <div id="yiBaoZhiFu" style="width: 50%">
             <table :style="geRenZhiFuTableHeight">
               <tr>
                 <th colspan="2">医保统筹基金支付</th>
@@ -788,24 +806,24 @@
   </el-dialog>
 </template>
 
-<script setup name="jieSuanDanDaYing">
-import { getLodop, initLodop } from '../../utils/c-lodop'
-import { jieSuanDanYangShiCss } from '../../data/css-for-print'
-import { daYingShangChuanJieSuanDan } from '../../api/medical-insurance/si-setl-upload'
+<script name="jieSuanDanDaYing" setup>
+import {getLodop, initLodop} from '@/utils/c-lodop'
+import {jieSuanDanYangShiCss} from '@/data/css-for-print'
+import {daYingShangChuanJieSuanDan} from '@/api/medical-insurance/si-setl-upload'
 import {
   brdyName,
+  fenLeiZhiFuLeiXing,
   getAdmissCond,
   getAge,
   getDateName,
+  getMedChrgitmTypeData,
   getShouShuData,
   getShouShuShiJian,
-  maZuiName,
   luNeiShiJian,
-  zhenDuanData,
+  maZuiName,
   nianYueRi,
-  getMedChrgitmTypeData,
+  zhenDuanData,
   zhongZhenJianHu,
-  fenLeiZhiFuLeiXing,
 } from './jieSuanDanXiuGai'
 
 const props = defineProps({
@@ -839,6 +857,8 @@ const patNo = ref('')
 const times = ref(0)
 const ledgerSn = ref(0)
 
+const zyFlag = ref(true)
+
 // 个人支付 表格的长度
 const geRenZhiFuTableHeight = ref({
   height: '100%',
@@ -866,31 +886,7 @@ onMounted(() => {
   patNo.value = props.data.patNo
   times.value = props.data.times
   ledgerSn.value = props.data.ledgerSn
-  queryJieSuanDan()
-})
-
-const queryJieSuanDan = () => {
-  daYingShangChuanJieSuanDan(patNo.value, times.value, ledgerSn.value)
-    .then((res) => {
-      jieSuanDanDaYingDialog.value = true
-      setlinfo.value = res.setlinfo
-      diseinfoData.value = zhenDuanData(res.diseinfo)
-      // 手术
-      oprninfoData.value = getShouShuData(res.oprninfo)
-      //  医疗收费信息
-      iteminfoData.value = getMedChrgitmTypeData(res.iteminfo)
-      icuinfoData.value = zhongZhenJianHu(res.icuinfo)
-      // 基金支付类型
-      let fenLeiJiJing = fenLeiZhiFuLeiXing(res.payinfo)
-      payinfoData.value = fenLeiJiJing.obj
-      qiTaPayinfoData.value = fenLeiJiJing.qiTa
-    })
-    .catch((e) => {
-      jieSuanDanDaYingDialog.value = false
-    })
-}
-
-onMounted(() => {
+  zyFlag.value = patNo.value.indexOf("-") === -1
   initLodop()
   if (opspdiseinfoData.value.length === 0) {
     for (let i = 0; i < 6; i++) {
@@ -905,20 +901,32 @@ onMounted(() => {
       })
     }
   }
+
+  queryJieSuanDan()
 })
-watch(
-  () => jieSuanDanDaYingDialog.value,
-  () => {
-    if (jieSuanDanDaYingDialog.value) {
-      setTimeout(() => {
-        const yiBaoZhiFuTable = document.getElementById('yiBaoZhiFu').offsetHeight
-        geRenZhiFuTableHeight.value = {
-          height: yiBaoZhiFuTable + 'px',
-        }
-      }, 100)
-    }
-  }
-)
+
+const queryJieSuanDan = () => {
+  daYingShangChuanJieSuanDan(patNo.value, times.value, ledgerSn.value)
+      .then((res) => {
+        jieSuanDanDaYingDialog.value = true
+        setlinfo.value = res.setlinfo
+        diseinfoData.value = zhenDuanData(res.diseinfo)
+        // 手术
+        oprninfoData.value = getShouShuData(res.oprninfo)
+        //  医疗收费信息
+        iteminfoData.value = getMedChrgitmTypeData(res.iteminfo)
+        icuinfoData.value = zhongZhenJianHu(res.icuinfo)
+        // 基金支付类型
+        let fenLeiJiJing = fenLeiZhiFuLeiXing(res.payinfo)
+        payinfoData.value = fenLeiJiJing.obj
+        qiTaPayinfoData.value = fenLeiJiJing.qiTa
+      })
+      .catch((e) => {
+        // jieSuanDanDaYingDialog.value = false
+      })
+}
+
+
 </script>
 
 <style scoped>

src/components/si-sheet-upload/jieSuanDanXiuGai.js

@@ -1,8 +1,8 @@
 import {ref} from "vue";
-import {maZuiFangShi} from "../../api/public-api";
+import {maZuiFangShi} from "@/api/public-api";
 import store from '@/store';
-import {listIsBlank, stringIsBlank, stringNotBlank} from "../../utils/blank-utils";
-import {getFundPayType, getMedChrgitmType} from "../../api/medical-insurance/si-setl-upload";
+import {listIsBlank, stringIsBlank} from "@/utils/blank-utils";
+import {getFundPayType, getMedChrgitmType} from "@/api/medical-insurance/si-setl-upload";
 
 const getRoles = store.state.user.info.roles
 
@@ -334,6 +334,9 @@ export function getShouShuData(val) {
 
 // 重症监护类型
 export function zhongZhenJianHu(val) {
+    if (val === null) {
+        val = []
+    }
     let data = []
     if (listIsBlank(val)) {
         data.push({
@@ -403,35 +406,11 @@ export function getMedChrgitmTypeData(val) {
         })
         return data
     }
-    for (let i = 0; i < medChrgitmType.length; i++) {
-        if (i >= val.length) {
-            data.push({
-                medChrgitm: medChrgitmType[i].name,
-                amt: '',
-                claaSumfee: '',
-                clabAmt: '',
-                fulamtOwnpayAmt: '',
-                othAmt: '',
-            })
-        } else if (stringNotBlank(val[i].medChrgitm)) {
-            data.push({
-                medChrgitm: medChrgitmType[i].name,
-                amt: val[i].amt,
-                claaSumfee: val[i].claaSumfee,
-                clabAmt: val[i].clabAmt,
-                fulamtOwnpayAmt: val[i].fulamtOwnpayAmt,
-                othAmt: val[i].othAmt,
-            })
-        }
-    }
-    data.push({
-        medChrgitm: "合计",
-        amt: val[val.length - 1].amt,
-        claaSumfee: val[val.length - 1].claaSumfee,
-        clabAmt: val[val.length - 1].clabAmt,
-        fulamtOwnpayAmt: val[val.length - 1].fulamtOwnpayAmt,
-        othAmt: val[val.length - 1].othAmt,
+
+    val.sort(function (a, b) {
+        return a.medChrgitm - b.medChrgitm
     })
+    data = val
 
     return data
 }

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/SouSuoYiZhu.vue

@@ -20,6 +20,7 @@
       <el-table-column label="大包装" prop="specPack"></el-table-column>
       <el-table-column label="医保类型" prop="ybFlagNew"></el-table-column>
       <el-table-column label="医保编码" prop="nationalCode"></el-table-column>
+      <el-table-column label="医保名称" prop="nationalName"></el-table-column>
       <el-table-column label="医保备注" prop="ybComment"></el-table-column>
       <el-table-column label="大输液" prop="infusionFlagName"></el-table-column>
       <el-table-column label="厂家" prop="manuName"></el-table-column>

src/views/hospitalization/zhu-yuan-yi-sheng/XinZengShuJu.vue

@@ -18,6 +18,8 @@ import XinZhenCaoYao from "@/views/hospitalization/zhu-yuan-yi-sheng/cao-yao-yi-
 import {ElNotification} from "element-plus";
 import {cuoWuXinXi, huanZheXinXi} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 import {stringIsBlank} from "@/utils/blank-utils";
+import store from '@/store'
+import {huoQuYuanGongXinXi} from "@/api/public-api";
 
 export default {
   name: "XinZengShuJu",
@@ -25,8 +27,16 @@ export default {
   setup() {
     const name = ref('')
 
+    let userInfo = $ref({})
+
     let notify = null
 
+    onMounted(() => {
+      huoQuYuanGongXinXi(store.state.user.info.code).then((res) => {
+        userInfo = res
+      })
+    })
+
     onActivated(() => {
       name.value = ''
       if (router.currentRoute.value.params.name) {
@@ -44,7 +54,7 @@ export default {
       } else {
         notify = ElNotification({
           type: 'warning',
-          message: `您现在进入新增数据，正在编辑患者<span style="color: teal">【${huanZheXinXi.value.name}】</span><br>正在编辑【${name.value}】`,
+          message: `医生：【${userInfo.name}】您现在进入新增数据<br>您的医保编码：${userInfo.ybCode}<br>正在编辑患者<span style="color: teal">【${huanZheXinXi.value.name}】</span><br>正在编辑【${name.value}】`,
           duration: 0,
           dangerouslyUseHTMLString: true,
           showClose: false
@@ -52,6 +62,7 @@ export default {
       }
     })
 
+
     onDeactivated(() => {
       name.value = '关闭'
       notify.close()