优化医生开方

java/fs-service/src/main/java/com/fs/his/param/FsPrescribeListDParam.java

@@ -1,12 +1,8 @@
 package com.fs.his.param;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.Map;
 
 @Data
 public class FsPrescribeListDParam extends BaseParam implements Serializable {
@@ -20,12 +16,7 @@ public class FsPrescribeListDParam extends BaseParam implements Serializable {
     Long companyUserId;
 
     /** 开始时间 */
-    @JsonIgnore
     private String beginTime;
     /** 结束时间 */
-    @JsonIgnore
     private String endTime;
-
-
-
 }

ylrz-doctorui/src/views/electronicPrescribe/prescribe/index.vue

@@ -1,5 +1,35 @@
 <template>
   <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="患者姓名" prop="patientName">
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="处方编号" prop="prescribeCode">
+        <el-input v-model="queryParams.prescribeCode" placeholder="请输入处方编号" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="处方类型" prop="prescribeType">
+        <el-select v-model="queryParams.prescribeType" placeholder="处方类型" clearable size="small">
+          <el-option label="西药" :value="1" />
+          <el-option label="中药" :value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          size="small"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
     <el-table v-loading="loading" :data="list">
       <el-table-column label="处方编号" prop="prescribeCode" min-width="160" />
       <el-table-column label="患者" prop="patientName" width="100" />
@@ -102,6 +132,7 @@ export default {
       list: [],
       total: 0,
       queryParams: { pageNum: 1, pageSize: 10, type: 1 },
+      dateRange: [],
       detailOpen: false,
       detail: { prescribe: {}, drugs: [] },
       currentRow: {},
@@ -118,12 +149,23 @@ export default {
   methods: {
     getList() {
       this.loading = true
+      this.queryParams.beginTime = this.dateRange && this.dateRange[0] ? this.dateRange[0] : undefined
+      this.queryParams.endTime = this.dateRange && this.dateRange[1] ? this.dateRange[1] : undefined
       getPrescribeList(this.queryParams).then(res => {
         this.list = res.data.list || []
         this.total = res.data.total || 0
         this.loading = false
       })
     },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
     handleView(row) {
       getPrescribe(row.prescribeId).then(res => {
         this.detail = res.data || { prescribe: {}, drugs: [] }

ylrz-doctorui/src/views/electronicPrescribe/prescribeAudit/index.vue

@@ -1,5 +1,35 @@
 <template>
   <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+      <el-form-item label="患者姓名" prop="patientName">
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="处方编号" prop="prescribeCode">
+        <el-input v-model="queryParams.prescribeCode" placeholder="请输入处方编号" clearable size="small" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="处方类型" prop="prescribeType">
+        <el-select v-model="queryParams.prescribeType" placeholder="处方类型" clearable size="small">
+          <el-option label="西药" :value="1" />
+          <el-option label="中药" :value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          size="small"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
     <el-tabs v-model="activeTab" @tab-click="handleTab">
       <el-tab-pane label="待审核" name="1" />
       <el-tab-pane label="已审核" name="2" />
@@ -68,6 +98,7 @@ export default {
       list: [],
       total: 0,
       queryParams: { pageNum: 1, pageSize: 10, type: 2, status: 1 },
+      dateRange: [],
       auditOpen: false,
       auditMode: '',
       auditReason: '',
@@ -82,12 +113,23 @@ export default {
     getList() {
       this.loading = true
       this.queryParams.status = Number(this.activeTab)
+      this.queryParams.beginTime = this.dateRange && this.dateRange[0] ? this.dateRange[0] : undefined
+      this.queryParams.endTime = this.dateRange && this.dateRange[1] ? this.dateRange[1] : undefined
       getPrescribeList(this.queryParams).then(res => {
         this.list = res.data.list || []
         this.total = res.data.total || 0
         this.loading = false
       })
     },
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
     handleTab() {
       this.queryParams.pageNum = 1
       this.getList()