浏览代码

患者就诊信息和检测报告先按年份加住院号显示,点击后可以显示患者该次住院的多个诊断信息和多个检验检测报告

lsw 5 月之前
父节点
当前提交
c2541754b8

+ 56 - 122
admin-ui/src/views/work/check/index.vue

@@ -4,129 +4,63 @@
     <el-row :gutter="20" style="height: 100%">
       <!-- 列容器 -->
       <!-- 左边的列表,显示各个科室 -->
-      <el-col
-        :span="4"
-        style="
-          box-shadow: 0 3px 10px 0 rgb(0 0 0 / 6%);
-          border-right: 1px solid #f1f2f4;
-          overflow-y: auto;
-          height: 100%;
-        ">
-        <el-input
-          placeholder="输入部门关键字"
-          :clearable="true"
-          v-model="filterText">
-        </el-input>
+      <el-col :span="4" style="box-shadow: 0 3px 10px 0 rgb(0 0 0 / 6%); border-right: 1px solid #f1f2f4; overflow-y: auto; height: 100%">
+        <el-input placeholder="输入部门关键字" :clearable="true" v-model="filterText"></el-input>
         <div>
-          <div style="height: calc(-203px + 100vh);overflow-y: auto; margin-top: 3px">
-            <el-tree
-              :highlight-current="true"
-              class="filter-tree"
-              :data="deptOptions"
-              default-expand-all
-              :filter-node-method="filterNode"
-              @node-click="handleNodeClick"
-              ref="tree">
-            </el-tree>
+          <div style="height: calc(-203px + 100vh); overflow-y: auto; margin-top: 3px">
+            <el-tree :highlight-current="true" class="filter-tree" :data="deptOptions" default-expand-all :filter-node-method="filterNode" @node-click="handleNodeClick" ref="tree"></el-tree>
           </div>
         </div>
-
       </el-col>
       <!-- 患者诊断记录列表 -->
       <el-col :span="20" style="height: 100%">
         <el-form :model="queryParams" ref="queryForm" :inline="true" style="margin-top: 0">
           <el-form-item prop="physician">
-            <el-input
-              v-model="queryParams.physician"
-              placeholder="请输入主治医生"
-              clearable
-              @keyup.enter.native="handleQuery"
-              class="se" />
+            <el-input v-model="queryParams.physician" placeholder="请输入主治医生" clearable @keyup.enter.native="handleQuery" class="se" />
           </el-form-item>
           <el-form-item prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入患者姓名"
-              clearable
-              @keyup.enter.native="handleQuery"
-              class="se" />
+            <el-input v-model="queryParams.name" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery" class="se" />
           </el-form-item>
-          <el-form-item >
-            <el-date-picker
-              v-model="dischargeTime"
-              type="daterange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              value-format="yyyy-MM-dd"
-            />
+          <el-form-item>
+            <el-date-picker v-model="dischargeTime" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd" />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" @click="resetQuery"
-              >重置</el-button
-            >
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-table
-          :data="patientList"
-          border
-          @selection-change="selects"
-          height="calc(100vh - 230px)">
+        <el-table :data="patientList" border @selection-change="selects" height="calc(100vh - 230px)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="科室" align="center" prop="department" />
           <el-table-column label="患者姓名" align="center" prop="name" />
           <el-table-column label="主治医生" align="center" prop="physician" />
-          <el-table-column
-            label="出院方式"
-            align="center"
-            prop="dischargeMethod">
+          <el-table-column label="出院方式" align="center" prop="dischargeMethod">
             <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.discharge_method"
-                :value="scope.row.dischargeMethod"></dict-tag>
+              <dict-tag :options="dict.type.discharge_method" :value="scope.row.dischargeMethod"></dict-tag>
             </template>
           </el-table-column>
-          <el-table-column
-            label="出院时间"
-            align="center"
-            prop="dischargeTime" />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width">
+          <el-table-column label="出院时间" align="center" prop="dischargeTime" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-search"
-                @click="op('search', scope.row)"
-                >查看</el-button
-              >
+              <el-button size="mini" type="text" icon="el-icon-search" @click="op('search', scope.row)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          v-if="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination v-if="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import window from '@/views/work/check/window.vue'
+import window from '@/views/work/check/window.vue';
 export default {
   dicts: ['discharge_method'],
   name: 'checkUser',
   data() {
     return {
-      dischargeTime:[],
-      filterText:'',
+      dischargeTime: [],
+      filterText: '',
       total: 0,
       // 选中数组
       ids: [],
@@ -148,10 +82,10 @@ export default {
         name: undefined,
         department: undefined,
         deptId: undefined,
-        startTime:undefined,
+        startTime: undefined,
         endTime: undefined
-      },
-    }
+      }
+    };
   },
   watch: {
     dischargeTime(newVal) {
@@ -159,7 +93,7 @@ export default {
         this.queryParams.startTime = newVal[0].toString(); // 开始日期
         this.queryParams.endTime = newVal[1].toString(); // 结束日期
       }
-      if(!newVal){
+      if (!newVal) {
         this.queryParams.startTime = ''; // 开始日期
         this.queryParams.endTime = ''; // 结束日期
         this.handleQuery();
@@ -170,7 +104,7 @@ export default {
     }
   },
   created() {
-    this.getDepartment()
+    this.getDepartment();
   },
   methods: {
     filterNode(value, data) {
@@ -181,67 +115,67 @@ export default {
     reset() {
       this.form = {
         physician: undefined,
-        name: undefined,
-      }
-      this.resetForm('form')
+        name: undefined
+      };
+      this.resetForm('form');
     },
     /** 查询患者列表*/
     getList() {
       this.get({
         url: '/work/visit/patientCard',
         data: {
-          ...this.queryParams,
-        },
+          ...this.queryParams
+        }
       }).then((response) => {
-        this.patientList = response.rows
-        this.total = response.total
-      })
+        this.patientList = response.rows;
+        this.total = response.total;
+      });
     },
     /** 查询部门 */
     getDepartment() {
       this.get({
-        url: '/system/user/deptTree',
+        url: '/system/user/deptTree'
       }).then((response) => {
-        this.deptOptions = response.data
-        if(response.data.id != null){
+        this.deptOptions = response.data;
+        if (response.data.id != null) {
           this.queryParams.deptId = response.data[0].id;
         }
         this.getList();
-      })
+      });
     },
     handleNodeClick(data) {
-      if(this.queryParams.deptId === data.id){
+      if (this.queryParams.deptId === data.id) {
         return;
       }
-      this.queryParams.deptId = data.id
-      this.getList()
+      this.queryParams.deptId = data.id;
+      this.getList();
     },
     selects(rows) {
-      this.ids = rows.map((item) => item.id)
+      this.ids = rows.map((item) => item.id);
     },
     op(tag, row) {
-      console.log(row.patId)
+      console.log(row.patId);
       this.iframe({
         obj: window,
-        param: { id: row.patId },
-        title: '查看患者信息',
-        width: '90%',
-        height: '90%',
-        scroll: true,
-      })
+        param: { id: row.patId,blh:row.blh },
+        title: '查看'+row.name+'患者信息',
+        width: '85%',
+        height: '85%',
+        scroll: true
+      });
     },
     handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.dischargeTime = [];
-      this.queryParams.startTime='';
-      this.queryParams.endTime='';
+      this.queryParams.startTime = '';
+      this.queryParams.endTime = '';
       this.resetForm('queryForm');
-      this.handleQuery()
-    },
-  },
-}
+      this.handleQuery();
+    }
+  }
+};
 </script>

+ 92 - 149
admin-ui/src/views/work/check/window.vue

@@ -1,101 +1,47 @@
 <template>
-  <div id="check-window" style="width:100%;">
+  <div id="check-window" style="width: 100%">
     <el-row class="tac" :gutter="10">
       <el-col :span="4">
-        <el-menu
-          default-active="1"
-          class="el-menu-vertical-demo"
-          style="height: 200px">
-          <el-submenu :index="`year`" v-for="year in Object.keys(timeGroup)">
-            <template slot="title">{{ year }}年</template>
-            <el-submenu
-              :index="`${year}-${month}`"
-              v-for="month in Object.keys(timeGroup[year])">
+        <el-menu default-active="1" class="el-menu-vertical-demo" style="height: 200px">
+          <div @click="current.obrId = id" style="padding-top: 10px;padding-left: 56px; color: #1890ff; font-size: 15px" :index="`year`" v-for="year in Object.keys(timeGroup)">{{ year }} -{{param.blh}}</div>
+          <!-- <el-submenu :index="`year`" v-for="year in Object.keys(timeGroup)">
+            <template slot="title" @click="current.obrId = id">{{ year }} -{{ id }}</template>
+                      <el-submenu :index="`${year}-${month}`" v-for="month in Object.keys(timeGroup[year])">
               <template slot="title">{{ month }}月</template>
-              <el-submenu
-                :index="`${year}-${month}-${day}`"
-                v-for="day in Object.keys(timeGroup[year][month])">
+              <el-submenu :index="`${year}-${month}-${day}`" v-for="day in Object.keys(timeGroup[year][month])">
                 <template slot="title">{{ day }}日</template>
-                <el-menu-item
-                  :index="`${year}-${month}-${day}-${obrIdAndTime.time}`"
-                  v-for="obrIdAndTime in timeGroup[year][month][day]"
-                  @click="current.obrId = obrIdAndTime.obrId">
-                  {{ obrIdAndTime.time }}
+                <el-menu-item :index="`${year}-${month}-${day}-${obrIdAndTime.time}`" v-for="obrIdAndTime in timeGroup[year][month][day]" @click="current.obrId = obrIdAndTime.obrId">
+                  {{ obrIdAndTime.obrId }}
                 </el-menu-item>
               </el-submenu>
             </el-submenu>
-          </el-submenu>
+          </el-submenu> -->
         </el-menu>
       </el-col>
 
       <el-col :span="20" style="overflow-y: scroll">
-        <el-descriptions
-          class="margin-top"
-          title="详细检测报告"
-          :column="3"
-          border>
-          <el-descriptions-item
-            v-for="item in fillReportItem(reportItemLabelList)"
-            :key="item.key"
-            :label="item.label">
-            <span v-if="current.obr[item.key] && item.key !== 'signs'">{{
-              current.obr[item.key]
-            }}</span>
-            <span v-else-if="item.key === 'signs'">{{
-              mapSigns(current.obr[item.key])
-            }}</span>
+        <el-descriptions class="margin-top" title="详细检测报告" :column="3" border>
+          <el-descriptions-item v-for="item in fillReportItem(reportItemLabelList)" :key="item.key" :label="item.label">
+            <span v-if="current.obr[item.key] && item.key !== 'signs'">{{ current.obr[item.key] }}</span>
+            <span v-else-if="item.key === 'signs'">{{ mapSigns(current.obr[item.key]) }}</span>
             <span v-else>{{ '' }}</span>
           </el-descriptions-item>
         </el-descriptions>
 
         <div id="patient-check-projects-table">
           <el-table width="100%" stripe :data="current.obxList">
-            <el-table-column
-              label="医技观察项目"
-              align="center"
-              prop="mecTechObsProject"></el-table-column>
-            <el-table-column
-              label="医技项目名称"
-              align="center"
-              prop="mecTechObsName"></el-table-column>
-            <el-table-column
-              label="观察值"
-              align="center"
-              prop="obsProjectDetail"></el-table-column>
-            <el-table-column
-              label="项目结果信息"
-              align="center"
-              prop="projectInfo"></el-table-column>
-            <el-table-column
-              label="单位代码"
-              align="center"
-              prop="unitCode"></el-table-column>
-            <el-table-column
-              label="单位名称"
-              align="center"
-              prop="result"></el-table-column>
-            <el-table-column
-              label="参值范围"
-              align="center"
-              prop="result"></el-table-column>
-            <el-table-column
-              label="高低标志"
-              align="center"
-              prop="sign"></el-table-column>
-            <el-table-column
-              label="微生物观察分类"
-              align="center"
-              prop="obsClassification"></el-table-column>
-            <el-table-column
-              label="检验方法"
-              align="center"
-              prop="testMethod"></el-table-column>
+            <el-table-column label="医技观察项目" align="center" prop="mecTechObsProject"></el-table-column>
+            <el-table-column label="医技项目名称" align="center" prop="mecTechObsName"></el-table-column>
+            <el-table-column label="观察值" align="center" prop="obsProjectDetail"></el-table-column>
+            <el-table-column label="项目结果信息" align="center" prop="projectInfo"></el-table-column>
+            <el-table-column label="单位代码" align="center" prop="unitCode"></el-table-column>
+            <el-table-column label="单位名称" align="center" prop="result"></el-table-column>
+            <el-table-column label="参值范围" align="center" prop="result"></el-table-column>
+            <el-table-column label="高低标志" align="center" prop="sign"></el-table-column>
+            <el-table-column label="微生物观察分类" align="center" prop="obsClassification"></el-table-column>
+            <el-table-column label="检验方法" align="center" prop="testMethod"></el-table-column>
           </el-table>
-          <el-pagination
-            :page-count.sync="obxPaginationParams.pageNum"
-            :total="obxPaginationParams.total"
-            :page-size="obxPaginationParams.pageSize" @current-change="handleCurrentPageChange">
-          </el-pagination>
+          <el-pagination :page-count.sync="obxPaginationParams.pageNum" :total="obxPaginationParams.total" :page-size="obxPaginationParams.pageSize" @current-change="handleCurrentPageChange"></el-pagination>
         </div>
       </el-col>
     </el-row>
@@ -103,7 +49,7 @@
 </template>
 
 <script>
-import service from '@/utils/request'
+import service from '@/utils/request';
 
 export default {
   name: 'checkWindow',
@@ -111,18 +57,19 @@ export default {
     param: {
       type: Object,
       default: () => {
-        return { id: '' }
-      },
-    },
+        return { id: '' };
+      }
+    }
   },
   data() {
     return {
+      id: '',
       current: {
         obrId: '',
         obrAllList: [],
         obr: {},
         obxAllList: [],
-        obxList: [],
+        obxList: []
       },
       timeGroup: {},
       reportItemLabelList: [
@@ -138,38 +85,34 @@ export default {
         // { key: "applyDoctorName", label: "申请医生" },
         // { key: "testingDoctorName", label: "检验医生信息名称" },
         { key: 'reviewDoctorName', label: '审核医生' },
-        { key: 'reportDate', label: '报告单日期' },
+        { key: 'reportDate', label: '报告单日期' }
       ],
-      obxPaginationParams:{
+      obxPaginationParams: {
         pageNum: 1, //当前页数
         pageSize: 5, //每页数据数量
         total: 0 //总共数据量
       },
       testPatId: 24502 //测试用的patId  测试值:24502, 24503, 24504, 24656
-    }
+    };
   },
   watch: {
     'current.obrId'(newValue) {
-      this.current.obr = this.current.obrAllList.find(
-        (item) => item.id === newValue
-      )
-      this.current.obxList = this.current.obxAllList.filter(
-        (item) => item.obrId === newValue
-      )
+      this.current.obr = this.current.obrAllList.find((item) => item.id === newValue);
+      this.current.obxList = this.current.obxAllList.filter((item) => item.obrId === newValue);
     },
     'current.obxList'(newValue) {
       // 将obxList每个obx对象的sign替换成对应意义
-      if(newValue) {
-      // console.log(newValue)
+      if (newValue) {
+        // console.log(newValue)
 
-      const rs = newValue.map(item => {
-        if(item) {
-        console.log(item)
+        const rs = newValue.map((item) => {
+          if (item) {
+            console.log(item);
 
-        item.sign = this.mapHighSign(item.sign)
-        }
-      })
-        console.log(rs)
+            item.sign = this.mapHighSign(item.sign);
+          }
+        });
+        console.log(rs);
       }
     }
   },
@@ -179,12 +122,16 @@ export default {
       // this.testPatId要改为this.$props.param.id
       // this.$props.param.id = this.testPatId //后续数据库更新后需要把这行代码注释掉
       service({
-        url: `/work/request/patid/${this.$props.param.id}`,
+        url: `/work/request/patid/${this.$props.param.id}`
       }).then((response) => {
-        this.current.obrAllList = response.rows
+        this.current.obrAllList = response.rows;
+        if (response.rows.length > 0) {
+          this.id = response.rows[0].id;
+          this.current.obrId=this.id;
+        }
         // 得到obrAllList的数据后接着生成timeGroup
-        this.handleObrList(response.rows)
-      })
+        this.handleObrList(response.rows);
+      });
     },
     // 获取所有检查项目的所有检测结果,通过检测项目标识obrId来取出对应检测结果,默认获取第一页的数据
     getObxAllList() {
@@ -196,32 +143,30 @@ export default {
           ...this.obxPaginationParams
         }
       }).then((response) => {
-        this.current.obxAllList = response.rows
-        this.obxPaginationParams.total = response.total
-              if(this.current.obrId!=='') {
-
-         this.current.obxList = this.current.obxAllList.filter(item => item.obrId === this.current.obrId)
+        this.current.obxAllList = response.rows;
+        this.obxPaginationParams.total = response.total;
+        if (this.current.obrId !== '') {
+          this.current.obxList = this.current.obxAllList.filter((item) => item.obrId === this.current.obrId);
         }
-      })
+      });
     },
     // 分页组件页面变化时请求对应页的检测结果
     handleCurrentPageChange(newPage) {
-      this.obxPaginationParams.pageNum = newPage
-      this.getObxAllList()
-
+      this.obxPaginationParams.pageNum = newPage;
+      this.getObxAllList();
     },
     fillReportItem(reportItemLabelList) {
-      const filledList = [...reportItemLabelList]
+      const filledList = [...reportItemLabelList];
 
-      const remainder = filledList.length % 3
+      const remainder = filledList.length % 3;
       if (remainder !== 0) {
-        const num = 3 - remainder
+        const num = 3 - remainder;
 
         for (let i = num; i > 0; i--) {
-          filledList.push({ key: ``, label: '' })
+          filledList.push({ key: ``, label: '' });
         }
       }
-      return filledList
+      return filledList;
     },
     /**
      * 映射危机标志的对应含义
@@ -231,11 +176,11 @@ export default {
     mapSigns(signs) {
       switch (signs) {
         case '0':
-          return '正常'
+          return '正常';
         case '1':
-          return '危机'
+          return '危机';
         default:
-          return ''
+          return '';
       }
     },
     /**
@@ -246,13 +191,13 @@ export default {
     mapHighSign(sign) {
       switch (sign) {
         case '0':
-          return '正常'
+          return '正常';
         case '1':
-          return '偏低'
+          return '偏低';
         case '2':
-          return '偏高'
+          return '偏高';
         default:
-          return ''
+          return '';
       }
     },
     /**
@@ -267,12 +212,12 @@ export default {
      */
     handleDate(dateString) {
       //先把年月日和当天时间分离 2024-07-23 12:28:42->['2024-07-23','12:28:42']
-      const [yearMonthDay, time] = dateString.split(' ')
+      const [yearMonthDay, time] = dateString.split(' ');
 
       //接着把年月日分离 '2024-07-23'->['2024','07','23']
-      const [year, month, day] = yearMonthDay.split('-')
+      const [year, month, day] = yearMonthDay.split('-');
 
-      return { year, month, day, time }
+      return { year, month, day, time };
     },
     /**
      * 处理日期数组
@@ -296,21 +241,21 @@ export default {
      * ```
      */
     organizeDates(orcIdAndTimeList) {
-      const result = {}
+      const result = {};
       orcIdAndTimeList.forEach((item) => {
-        const { year, month, day, time } = item.reportCompleteTime
+        const { year, month, day, time } = item.reportCompleteTime;
         if (!result[year]) {
-          result[year] = {}
+          result[year] = {};
         }
         if (!result[year][month]) {
-          result[year][month] = {}
+          result[year][month] = {};
         }
         if (!result[year][month][day]) {
-          result[year][month][day] = []
+          result[year][month][day] = [];
         }
-        result[year][month][day].push({ obrId: item.obrId, time: time })
-      })
-      return result
+        result[year][month][day].push({ obrId: item.obrId, time: time });
+      });
+      return result;
     },
     /**
      * 处理current.obrAllList
@@ -319,21 +264,19 @@ export default {
     handleObrList(obrAllList) {
       // 从current.obrAllList获取对象{obrId: '',reportCompleteTime: {year, month, day, time}}数组
       const orcIdAndTimeList = obrAllList.map((item) => {
+        const handledDate = this.handleDate(item.reportCompleteTime);
+        return { obrId: item.id, reportCompleteTime: handledDate };
+      });
 
-        const handledDate = this.handleDate(item.reportCompleteTime)
-        return { obrId: item.id, reportCompleteTime: handledDate }
-      })
-
-
-      this.timeGroup = this.organizeDates(orcIdAndTimeList)
-    },
+      this.timeGroup = this.organizeDates(orcIdAndTimeList);
+    }
   },
   // 当弹窗组件创建时请求当前患者所有检查项目信息
   created() {
-    this.getObrAllListAndGenerateTime()
-    this.getObxAllList()
-  },
-}
+    this.getObrAllListAndGenerateTime();
+    this.getObxAllList();
+  }
+};
 </script>
 
 <style scoped>

+ 3 - 3
admin-ui/src/views/work/visit/search.vue

@@ -47,7 +47,7 @@
                 <el-descriptions-item label="性别" v-if="patientInfo">
                   <dict-tag :options="dict.type.patient_sex" :value="patientInfo.sex" />
                 </el-descriptions-item>
-                <el-descriptions-item label="身份证号" v-if="patientInfo">{{ patientInfo.sfzh -descriptions-item>
+                <el-descriptions-item label="身份证号" v-if="patientInfo">{{ patientInfo.sfzh }}</el-descriptions-item>
                 <el-descriptions-item label="居住地址" v-if="patientInfo">{{ patientInfo.address }}</el-descriptions-item>
                 <el-descriptions-item label="联系电话" v-if="patientInfo">{{ patientInfo.phone }}</el-descriptions-item>
                 <el-descriptions-item label="婚姻状况" v-if="patientInfo">
@@ -67,8 +67,8 @@
               <el-table style="width: 69vw" height="calc(75vh - 270px)" :data="nkList" highlight-current-row>
                 <el-table-column label="姓名" align="center" prop="name"></el-table-column>
                 <el-table-column label="所属关系" align="center" prop="kinship"></el-table-column>
-                <el-table-column label="近亲地址" align="center" prop="address"></el-table-column>}}</el-descriptions-item>
-                <el-descriptions-item label="出生时间" v-if="patientInfo">{{ patientInfo.birthDate }}</el
+                <el-table-column label="近亲地址" align="center" prop="address"></el-table-column>}}
+                <el-descriptions-item label="出生时间" v-if="patientInfo">{{ patientInfo.birthDate }}</el-descriptions-item>
                 <el-table-column label="联系电话" align="center" prop="phone"></el-table-column>
                 <el-table-column label="工作名称" align="center" prop="workName"></el-table-column>
                 <el-table-column label="工作类别" align="center" prop="workCode"></el-table-column>

+ 5 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/dto/PatientCardDto.java

@@ -54,5 +54,10 @@ public class PatientCardDto extends BaseData {
     private Date endTime;
 
 
+    @ApiModelProperty(value = "病历号")
+    @TableField(exist = false)
+    private String blh;
+
+
 }
 

+ 1 - 0
ruoyi-admin/src/main/resources/mapper/work/VisitMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             v.department,
             v.physician,
             tb_patient.`name`,
+            tb_patient.blh,
             v.discharge_method,
             v.discharge_time,
             v.id as visit_id,