1
0
lsw 3 тижнів тому
батько
коміт
801d94f58f

+ 6 - 2
admin-ui/src/views/work/visit/index.vue

@@ -12,10 +12,10 @@
           <el-form-item prop="physician" v-if="user.roleName == '超级管理员' || user.roleName == '管理员'">
             <el-input v-model="queryParams.physician" placeholder="请输入主治医生" clearable @keyup.enter.native="handleQuery" class="inp" />
           </el-form-item>
-          <el-form-item prop="name">
+          <el-form-item prop="name" label="患者姓名">
             <el-input v-model="queryParams.name" placeholder="请输入患者姓名" clearable @keyup.enter.native="handleQuery" class="inp" />
           </el-form-item>
-          <el-form-item>
+          <el-form-item label="出院日期">
             <el-date-picker v-model="dateRange" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd" />
           </el-form-item>
           <el-form-item>
@@ -100,6 +100,10 @@ export default {
   },
   methods: {
     getList() {
+      if (this.dateRange) {
+        this.queryParams.dateBegin = this.dateRange[0];
+        this.queryParams.dateEnd = this.dateRange[1];
+      }
       this.get({ url: '/work/visit/patientCard', data: this.queryParams }).then((response) => {
         this.response = response;
       });

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

@@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId !=null">
                 AND u.user_id=#{userId}
             </if>
+            <if test="dateBegin != null  and dateBegin != ''"> AND v.discharge_time BETWEEN #{dateBegin} AND #{dateEnd} + INTERVAL 1 DAY</if>
             <if test="deptId !=null and deptId != 0">
                 AND (v.dept_id = #{deptId} OR v.dept_id IN (SELECT s.dept_id FROM sys_dept s WHERE s.parent_id in (SELECT s.dept_id FROM sys_dept s WHERE find_in_set( #{deptId}, parent_id ))))
             </if>