XMTT 5 years ago
parent
commit
a66a0c543f

+ 45 - 6
src/main/java/com/ekexiu/project/msconsole/doctor/DoctorService.java

@ -14,6 +14,8 @@ import org.jfw.util.StringUtil;
14 14
15 15
import java.sql.Connection;
16 16
import java.sql.SQLException;
17
import java.util.ArrayList;
18
import java.util.List;
17 19
18 20
/**
19 21
 * Created by TT on 2019/5/30.
@ -56,14 +58,30 @@ public class DoctorService {
56 58
57 59
    @Get
58 60
    @Path("/qo")
59
    public Doctor query(@JdbcConn Connection con,String id)throws SQLException {
60
        return doctorDao.query(con, id);
61
    public SessionDoctor query(@JdbcConn Connection con,String id)throws SQLException {
62
        return makeSessionDoctor(doctorDao.query(con, id));
61 63
    }
62 64
63 65
    @Get
64 66
    @Path("/pq")
65
    public PageQueryResult<Doctor> pageQuery(@JdbcConn Connection con, String hospital, @Nullable Boolean active,@Nullable String name,@Nullable String department,int pageSize,int pageNo)throws SQLException {
66
        return doctorDao.pageQuery(con, hospital, active, name == null ? null : "%" + name + "%", department == null ? null : "%" + department + "%", pageSize, pageNo);
67
    public PageQueryResult<SessionDoctor> pageQuery(@JdbcConn Connection con, String hospital, @Nullable Boolean active,@Nullable String name,@Nullable String department,int pageSize,int pageNo)throws SQLException {
68
        PageQueryResult<Doctor> pageQueryResult =  doctorDao.pageQuery(con, hospital, active, name == null ? null : "%" + name + "%", department == null ? null : "%" + department + "%", pageSize, pageNo);
69
        if (pageQueryResult != null) {
70
            List<Doctor> doctors = pageQueryResult.getData();
71
            List<SessionDoctor> sessionDoctors = new ArrayList<>();
72
            if (!doctors.isEmpty()) {
73
                for (Doctor doctor : doctors) {
74
                    sessionDoctors.add(makeSessionDoctor(doctor));
75
                }
76
                PageQueryResult<SessionDoctor> ret = new PageQueryResult<>();
77
                ret.setPageNo(pageQueryResult.getPageNo());
78
                ret.setPageSize(pageQueryResult.getPageSize());
79
                ret.setTotal(pageQueryResult.getTotal());
80
                ret.setData(sessionDoctors);
81
                return ret;
82
            }
83
        }
84
        return null;
67 85
    }
68 86
69 87
    @Get
@ -74,7 +92,28 @@ public class DoctorService {
74 92
75 93
    @Get
76 94
    @Path("/check")
77
    public Doctor queryByAccount(@JdbcConn Connection con,String account)throws SQLException {
78
        return doctorDao.queryByAccount(con, account);
95
    public SessionDoctor queryByAccount(@JdbcConn Connection con,String account)throws SQLException {
96
        return makeSessionDoctor(doctorDao.queryByAccount(con, account));
97
    }
98
99
    private static SessionDoctor makeSessionDoctor(Doctor doctor) {
100
        SessionDoctor sessionDoctor = new SessionDoctor();
101
        sessionDoctor.setAccount(doctor.getAccount());
102
        sessionDoctor.setName(doctor.getName());
103
        sessionDoctor.setHospital(doctor.getHospital());
104
        sessionDoctor.setDepartment(doctor.getDepartment());
105
        sessionDoctor.setId(doctor.getId());
106
        sessionDoctor.setClinicalTitle(doctor.getClinicalTitle());
107
        sessionDoctor.setTeachTitle(doctor.getTeachTitle());
108
        sessionDoctor.setPosition(doctor.getPosition());
109
        sessionDoctor.setDirection(doctor.getDirection());
110
        sessionDoctor.setDescp(doctor.getDescp());
111
        sessionDoctor.setImage(doctor.getImage());
112
        sessionDoctor.setActive(doctor.isActive());
113
        sessionDoctor.setCreateTime(doctor.getCreateTime());
114
        sessionDoctor.setModifyTime(doctor.getModifyTime());
115
        sessionDoctor.setCreator(doctor.getCreator());
116
        sessionDoctor.setModifier(doctor.getModifier());
117
        return sessionDoctor;
79 118
    }
80 119
}

+ 160 - 0
src/main/java/com/ekexiu/project/msconsole/doctor/SessionDoctor.java

@ -0,0 +1,160 @@
1
package com.ekexiu.project.msconsole.doctor;
2
3
import org.jfw.util.auth.AuthUser;
4
5
/**
6
 * Created by TT on 2019/6/13.
7
 */
8
public class SessionDoctor implements AuthUser {
9
    private String id;
10
    private String hospital;
11
    private String department;
12
    private String account;
13
    private String name;
14
    private String clinicalTitle;
15
    private String teachTitle;
16
    private String position;
17
    private String direction;
18
    private String image;
19
    private String descp;
20
    private boolean active;
21
22
    private String createTime;
23
    private String modifyTime;
24
    private String creator;
25
    private String modifier;
26
27
    @Override
28
    public boolean hasAuthority(int i) {
29
        return true;
30
    }
31
32
    @Override
33
    public String getId() {
34
        return id;
35
    }
36
37
    public void setId(String id) {
38
        this.id = id;
39
    }
40
41
    public String getHospital() {
42
        return hospital;
43
    }
44
45
    public void setHospital(String hospital) {
46
        this.hospital = hospital;
47
    }
48
49
    public String getDepartment() {
50
        return department;
51
    }
52
53
    public void setDepartment(String department) {
54
        this.department = department;
55
    }
56
57
    public String getAccount() {
58
        return account;
59
    }
60
61
    public void setAccount(String account) {
62
        this.account = account;
63
    }
64
65
    public String getName() {
66
        return name;
67
    }
68
69
    public void setName(String name) {
70
        this.name = name;
71
    }
72
73
    public String getClinicalTitle() {
74
        return clinicalTitle;
75
    }
76
77
    public void setClinicalTitle(String clinicalTitle) {
78
        this.clinicalTitle = clinicalTitle;
79
    }
80
81
    public String getTeachTitle() {
82
        return teachTitle;
83
    }
84
85
    public void setTeachTitle(String teachTitle) {
86
        this.teachTitle = teachTitle;
87
    }
88
89
    public String getPosition() {
90
        return position;
91
    }
92
93
    public void setPosition(String position) {
94
        this.position = position;
95
    }
96
97
    public String getDirection() {
98
        return direction;
99
    }
100
101
    public void setDirection(String direction) {
102
        this.direction = direction;
103
    }
104
105
    public String getImage() {
106
        return image;
107
    }
108
109
    public void setImage(String image) {
110
        this.image = image;
111
    }
112
113
    public String getDescp() {
114
        return descp;
115
    }
116
117
    public void setDescp(String descp) {
118
        this.descp = descp;
119
    }
120
121
    public boolean isActive() {
122
        return active;
123
    }
124
125
    public void setActive(boolean active) {
126
        this.active = active;
127
    }
128
129
    public String getCreateTime() {
130
        return createTime;
131
    }
132
133
    public void setCreateTime(String createTime) {
134
        this.createTime = createTime;
135
    }
136
137
    public String getModifyTime() {
138
        return modifyTime;
139
    }
140
141
    public void setModifyTime(String modifyTime) {
142
        this.modifyTime = modifyTime;
143
    }
144
145
    public String getCreator() {
146
        return creator;
147
    }
148
149
    public void setCreator(String creator) {
150
        this.creator = creator;
151
    }
152
153
    public String getModifier() {
154
        return modifier;
155
    }
156
157
    public void setModifier(String modifier) {
158
        this.modifier = modifier;
159
    }
160
}

+ 4 - 0
src/main/java/com/ekexiu/project/msconsole/system/service/SysService.java

@ -170,6 +170,10 @@ public class SysService {
170 170
        sessionUser.setDescp(hospital.getDescp());
171 171
        sessionUser.setImage(hospital.getImage());
172 172
        sessionUser.setActive(hospital.isActive());
173
        sessionUser.setCreateTime(hospital.getCreateTime());
174
        sessionUser.setModifyTime(hospital.getModifyTime());
175
        sessionUser.setCreator(hospital.getCreator());
176
        sessionUser.setModifier(hospital.getModifier());
173 177
        return sessionUser;
174 178
    }
175 179
}

+ 37 - 0
src/main/java/com/ekexiu/project/msconsole/system/vo/SessionUser.java

@ -19,6 +19,11 @@ public class SessionUser implements AuthUser {
19 19
    private String image;
20 20
    private boolean active;
21 21
22
    private String createTime;
23
    private String modifyTime;
24
    private String creator;
25
    private String modifier;
26
22 27
    @Override
23 28
    public boolean hasAuthority(int i) {
24 29
        return true;
@ -119,4 +124,36 @@ public class SessionUser implements AuthUser {
119 124
    public void setActive(boolean active) {
120 125
        this.active = active;
121 126
    }
127
128
    public String getCreateTime() {
129
        return createTime;
130
    }
131
132
    public void setCreateTime(String createTime) {
133
        this.createTime = createTime;
134
    }
135
136
    public String getModifyTime() {
137
        return modifyTime;
138
    }
139
140
    public void setModifyTime(String modifyTime) {
141
        this.modifyTime = modifyTime;
142
    }
143
144
    public String getCreator() {
145
        return creator;
146
    }
147
148
    public void setCreator(String creator) {
149
        this.creator = creator;
150
    }
151
152
    public String getModifier() {
153
        return modifier;
154
    }
155
156
    public void setModifier(String modifier) {
157
        this.modifier = modifier;
158
    }
122 159
}