5 Commits 939840c930 ... 15b2222d3a

Author SHA1 Message Date
  lmx 15b2222d3a 患者信息 8 months ago
  lmx d0fb39c595 Merge remote-tracking branch 'origin/dev1.0' into dev1.0 8 months ago
  ljm\李 e2c4f5f471 9527 8 months ago
  lzf c8d5b85e02 测试 8 months ago
  lmx b0d15a117a feat:患者信息 8 months ago
3 changed files with 26 additions and 22 deletions
  1. 8 11
      admin-ui/src/views/work/visit/index.vue
  2. 17 11
      admin-ui/src/views/work/visit/search.vue
  3. 1 0
      test.java

+ 8 - 11
admin-ui/src/views/work/patient/index.vue → admin-ui/src/views/work/visit/index.vue

@@ -1,15 +1,9 @@
 <template>
   <div class="app-container">
-    <!-- 行容器 -->
     <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-tree :data="deptOptions" @node-click="handleNodeClick">
-
-        </el-tree>
+        <el-tree :data="deptOptions" @node-click="handleNodeClick" :default-expand-all="true"></el-tree>
       </el-col>
-      <!-- 患者诊断记录列表 -->
       <el-col :span="20" style="height: 100%">
         <el-form :model="queryParams" ref="queryForm" :inline="true" >
           <el-form-item prop="physician">
@@ -41,14 +35,13 @@
           </el-table-column>
         </el-table>
         <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 search from "@/views/work/patient/search.vue";
+import search from "@/views/work/visit/search.vue";
 export default {
   dicts:['discharge_method'],
   name: 'User',
@@ -73,7 +66,8 @@ export default {
         pageSize:10,
         physician: undefined,
         patientName:undefined,
-        departmentName:undefined,
+        department:undefined,
+        deptId:undefined,
       },
     };
   },
@@ -93,6 +87,7 @@ export default {
     },
     /** 查询患者列表*/
     getList(){
+      console.log(this.deptId)
       this.get({
         url:'/work/visit/patientCard',
         data: {
@@ -109,10 +104,12 @@ export default {
         url:'/system/user/deptTree'
       }).then((response) => {
         this.deptOptions = response.data;
+        this.queryParams.deptId = response.data[0].id;
+        this.getList();
       });
     },
     handleNodeClick(data){
-      this.queryParams.departmentName = data.label;
+      this.queryParams.deptId = data.id;
       this.getList();
     },
     selects(rows) {

+ 17 - 11
admin-ui/src/views/work/patient/search.vue → admin-ui/src/views/work/visit/search.vue

@@ -2,7 +2,6 @@
   <div class="container" style="height: 80vh; width: 87vw">
     <el-row :gutter="10">
       <el-col :span="5">
-        <!-- 左边的导航菜单 -->
         <div class="left-body">
           <el-menu :default-active="activeNow" @open="handleOpen" :unique-opened="true">
             <el-menu-item index="1" @click="activePatient(1)">
@@ -23,7 +22,7 @@
                     <span>{{month}}月</span>
                   </template>
                   <el-menu-item v-for="item in days" @click="getCard(item.id); activePatient(2); getDgList()" :key="item.id" :index="item.id.toString()">
-                    {{year}}年{{month}}月{{item.day}}日
+                    {{item.day}}日 {{item.HH}}:{{item.MM}}:{{item.SS}}
                   </el-menu-item>
                 </el-submenu>
               </el-submenu>
@@ -32,11 +31,8 @@
         </div>
       </el-col>
       <el-col :span="19">
-        <!-- 右边的信息显示 -->
         <div class="right-body">
-          <!-- 患者基本信息/亲属 -->
           <div class="patient-info-nk" v-if="active === 1">
-            <!-- 患者基本信息 -->
             <div class="patient-info">
               <el-descriptions  style="width: 69vw; margin-top: 10px" title="患者信息" :column="3" border>
                 <el-descriptions-item label="患者标识符" v-if="patientInfo">{{patientInfo.patientCode}}</el-descriptions-item>
@@ -60,7 +56,7 @@
                 <el-descriptions-item label="婴儿序号" v-if="patientInfo">{{patientInfo.yexh}}</el-descriptions-item>
               </el-descriptions>
             </div>
-            <!-- 患者亲属 -->
+
             <div class="patient-nk" style="margin-top: 10px">
               <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>
@@ -73,9 +69,8 @@
               <pagination v-show="totalNk > 0" :total="totalNk" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getNkList" />
             </div>
           </div>
-          <!-- 诊断信息 -->
+
           <div class="dg-info" v-if="active === 2">
-            <!-- 单次就诊的详细信息 -->
             <div class="pv">
               <el-descriptions :column="3" border style="width: 69vw; margin-top: 10px"  title="就诊信息">
                 <el-descriptions-item label="患者类别">
@@ -100,7 +95,7 @@
                 <el-descriptions-item label="出区原因">{{pvList.reasonArea}}</el-descriptions-item>
               </el-descriptions>
             </div>
-            <!-- 诊断结果列表 -->
+
             <div class="dg" style="margin-top: 10px">
               <el-table style=" width:69vw;" height="calc(75vh - 270px)" :data="dgList" highlight-current-row>
                 <el-table-column label="诊断名称" align="center" prop="diagnosticName"></el-table-column>
@@ -179,7 +174,7 @@ export default {
     this.getNkList();
   },
   methods:{
-    handleOpen(index, indexPath){
+    handleOpen(index){
       if(index === "2"){
         this.activeIndex();
       }
@@ -238,6 +233,7 @@ export default {
         }
       }).then( (response) => {
         this.timeList = response.rows;
+        console.log(this.timeList)
         this.groupDates(this.timeList);
       })
     },
@@ -246,6 +242,9 @@ export default {
         this.year = date.admissionTime.substring(0, 4);
         this.month = date.admissionTime.substring(5, 7);
         this.day = date.admissionTime.substring(8, 10);
+        this.HH = date.admissionTime.substring(11,13);
+        this.MM = date.admissionTime.substring(14,16);
+        this.SS = date.admissionTime.substring(17,20);
         this.id = date.id;
         if (!this.groupedDates[this.year]) {
           this.groupedDates[this.year] = {};
@@ -253,7 +252,14 @@ export default {
         if (!this.groupedDates[this.year][this.month]) {
           this.groupedDates[this.year][this.month] = [];
         }
-        this.groupedDates[this.year][this.month].push({id: this.id, day: this.day});
+        this.groupedDates[this.year][this.month].push(
+          {
+            id: this.id,
+            day: this.day,
+            HH: this.HH,
+            MM: this.MM,
+            SS: this.SS
+          });
       })
       this.$forceUpdate();
     },

+ 1 - 0
test.java

@@ -0,0 +1 @@
+修改后上传,测四git