Commit 9a3fba6627128600663a1772e0935ef67f4dd397
1 parent
f3c6d79dce
Exists in
master
and in
6 other branches
随访列表分页数据
Showing 4 changed files with 65 additions and 66 deletions
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java
- platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FollowUpRequest.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUpQuery.java
View file @
9a3fba6
... | ... | @@ -121,17 +121,17 @@ |
121 | 121 | private Integer enalble; |
122 | 122 | |
123 | 123 | //随访开始日期 |
124 | - private Date followUpStartTime; | |
124 | + private String followUpStartTime; | |
125 | 125 | //随访结束日期 |
126 | - private Date followUpEndTime; | |
126 | + private String followUpEndTime; | |
127 | 127 | //查询关键字 姓名、联系方式、就诊卡 |
128 | 128 | private String keyWord; |
129 | 129 | //来源:1.本院、2.*医院、3.其他、4.全部 |
130 | 130 | private Integer source; |
131 | 131 | //预约复查开始时间 |
132 | - private Date nextStartTime; | |
132 | + private String nextStartTime; | |
133 | 133 | //预约复查结束时间 |
134 | - private Date nextEndTime; | |
134 | + private String nextEndTime; | |
135 | 135 | //获取sql语句 |
136 | 136 | private String sqlStr; |
137 | 137 | |
138 | 138 | |
139 | 139 | |
140 | 140 | |
... | ... | @@ -155,18 +155,22 @@ |
155 | 155 | return isArtifiCochlea; |
156 | 156 | } |
157 | 157 | |
158 | - public void setIsArtifiCochlea(Integer isArtifiCochlea) { | |
159 | - this.isArtifiCochlea = isArtifiCochlea; | |
158 | + public String getId() { | |
159 | + return id; | |
160 | 160 | } |
161 | 161 | |
162 | - public String getSqlStr() { | |
163 | - return sqlStr; | |
162 | + public void setId(String id) { | |
163 | + this.id = id; | |
164 | 164 | } |
165 | 165 | |
166 | - public void setSqlStr(String sqlStr) { | |
167 | - this.sqlStr = sqlStr; | |
166 | + public String getBabyId() { | |
167 | + return babyId; | |
168 | 168 | } |
169 | 169 | |
170 | + public void setBabyId(String babyId) { | |
171 | + this.babyId = babyId; | |
172 | + } | |
173 | + | |
170 | 174 | public String[] getBabyIds() { |
171 | 175 | return babyIds; |
172 | 176 | } |
... | ... | @@ -175,6 +179,18 @@ |
175 | 179 | this.babyIds = babyIds; |
176 | 180 | } |
177 | 181 | |
182 | + public Date getFollowTime() { | |
183 | + return followTime; | |
184 | + } | |
185 | + | |
186 | + public void setFollowTime(Date followTime) { | |
187 | + this.followTime = followTime; | |
188 | + } | |
189 | + | |
190 | + public void setIsArtifiCochlea(Integer isArtifiCochlea) { | |
191 | + this.isArtifiCochlea = isArtifiCochlea; | |
192 | + } | |
193 | + | |
178 | 194 | public String[] getCheckHospitalIds() { |
179 | 195 | return checkHospitalIds; |
180 | 196 | } |
181 | 197 | |
182 | 198 | |
183 | 199 | |
... | ... | @@ -183,19 +199,19 @@ |
183 | 199 | this.checkHospitalIds = checkHospitalIds; |
184 | 200 | } |
185 | 201 | |
186 | - public Date getFollowUpStartTime() { | |
202 | + public String getFollowUpStartTime() { | |
187 | 203 | return followUpStartTime; |
188 | 204 | } |
189 | 205 | |
190 | - public void setFollowUpStartTime(Date followUpStartTime) { | |
206 | + public void setFollowUpStartTime(String followUpStartTime) { | |
191 | 207 | this.followUpStartTime = followUpStartTime; |
192 | 208 | } |
193 | 209 | |
194 | - public Date getFollowUpEndTime() { | |
210 | + public String getFollowUpEndTime() { | |
195 | 211 | return followUpEndTime; |
196 | 212 | } |
197 | 213 | |
198 | - public void setFollowUpEndTime(Date followUpEndTime) { | |
214 | + public void setFollowUpEndTime(String followUpEndTime) { | |
199 | 215 | this.followUpEndTime = followUpEndTime; |
200 | 216 | } |
201 | 217 | |
202 | 218 | |
203 | 219 | |
204 | 220 | |
205 | 221 | |
206 | 222 | |
... | ... | @@ -215,48 +231,28 @@ |
215 | 231 | this.source = source; |
216 | 232 | } |
217 | 233 | |
218 | - public Date getNextStartTime() { | |
234 | + public String getNextStartTime() { | |
219 | 235 | return nextStartTime; |
220 | 236 | } |
221 | 237 | |
222 | - public void setNextStartTime(Date nextStartTime) { | |
238 | + public void setNextStartTime(String nextStartTime) { | |
223 | 239 | this.nextStartTime = nextStartTime; |
224 | 240 | } |
225 | 241 | |
226 | - public Date getNextEndTime() { | |
242 | + public String getNextEndTime() { | |
227 | 243 | return nextEndTime; |
228 | 244 | } |
229 | 245 | |
230 | - public void setNextEndTime(Date nextEndTime) { | |
246 | + public void setNextEndTime(String nextEndTime) { | |
231 | 247 | this.nextEndTime = nextEndTime; |
232 | 248 | } |
233 | 249 | |
234 | - public String getId() { | |
235 | - return id; | |
250 | + public String getSqlStr() { | |
251 | + return sqlStr; | |
236 | 252 | } |
237 | 253 | |
238 | - | |
239 | - public void setId(String id) { | |
240 | - this.id = id; | |
241 | - | |
242 | - } | |
243 | - | |
244 | - public String getBabyId() { | |
245 | - return babyId; | |
246 | - } | |
247 | - | |
248 | - public void setBabyId(String babyId) { | |
249 | - this.babyId = babyId; | |
250 | - } | |
251 | - | |
252 | - public Date getFollowTime() { | |
253 | - return followTime; | |
254 | - } | |
255 | - | |
256 | - | |
257 | - public void setFollowTime(Date followTime) { | |
258 | - this.followTime = followTime; | |
259 | - | |
254 | + public void setSqlStr(String sqlStr) { | |
255 | + this.sqlStr = sqlStr; | |
260 | 256 | } |
261 | 257 | |
262 | 258 | public String getFollowAddr() { |
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml
View file @
9a3fba6
... | ... | @@ -268,6 +268,15 @@ |
268 | 268 | <include refid="orderAndLimit"/> |
269 | 269 | </select> |
270 | 270 | |
271 | + <select id="queryBabyPatientExtendEarFollowUpCount" resultType="int" | |
272 | + parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery"> | |
273 | + select count(1) from ( | |
274 | + select * from baby_patient_extend_ear_follow_up | |
275 | + <include refid="BabyPatientExtendEarFollowUpCondition"/> | |
276 | + GROUP BY baby_id | |
277 | + ) bpef | |
278 | + </select> | |
279 | + | |
271 | 280 | <select id="queryBabyPatientExtendEarFollowUpByBaby" resultMap="BabyPatientExtendEarFollowUpResultMap" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery"> |
272 | 281 | select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,ifdel,ifclose,hospital_id,modify_time,modify_id,create_time,create_id,enalble |
273 | 282 | from baby_patient_extend_ear_follow_up |
... | ... | @@ -281,12 +290,7 @@ |
281 | 290 | </select> |
282 | 291 | |
283 | 292 | |
284 | - <select id="queryBabyPatientExtendEarFollowUpCount" resultType="int" | |
285 | - parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery"> | |
286 | - select count(1) from baby_patient_extend_ear_follow_up | |
287 | - <include refid="BabyPatientExtendEarFollowUpCondition"/> | |
288 | - GROUP BY baby_id | |
289 | - </select> | |
293 | + | |
290 | 294 | |
291 | 295 | |
292 | 296 | </mapper> |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
View file @
9a3fba6
... | ... | @@ -321,7 +321,7 @@ |
321 | 321 | query.setNextEndTime(fur.getNextEndTime()); |
322 | 322 | query.setSource(fur.getSource()); |
323 | 323 | //分页信息 |
324 | - // query.setNeed("1"); | |
324 | + query.setNeed("1"); | |
325 | 325 | query.setSort("create_time"); |
326 | 326 | query.setLimit(fur.getLimit()); |
327 | 327 | query.setPage(fur.getPage()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FollowUpRequest.java
View file @
9a3fba6
1 | 1 | package com.lyms.platform.operate.web.request; |
2 | 2 | |
3 | -import java.util.Date; | |
4 | - | |
5 | 3 | /** |
6 | 4 | * @auther yangfei |
7 | 5 | * @createTime 2017年05月15日 15时24分 |
8 | 6 | |
... | ... | @@ -9,9 +7,9 @@ |
9 | 7 | */ |
10 | 8 | public class FollowUpRequest extends BasePageQueryRequest{ |
11 | 9 | //随访开始日期 |
12 | - private Date followUpStartTime; | |
10 | + private String followUpStartTime; | |
13 | 11 | //随访结束日期 |
14 | - private Date followUpEndTime; | |
12 | + private String followUpEndTime; | |
15 | 13 | //随访医生 |
16 | 14 | private String followDoctorId; |
17 | 15 | //查询关键字 姓名、联系方式、就诊卡 |
18 | 16 | |
19 | 17 | |
20 | 18 | |
21 | 19 | |
22 | 20 | |
... | ... | @@ -25,24 +23,23 @@ |
25 | 23 | //干预治疗 0-未干预治疗,1-人工耳蜗,2-助听器,3-手术 |
26 | 24 | private String [] interCure; |
27 | 25 | //预约复查开始时间 |
28 | - private Date nextStartTime; | |
26 | + private String nextStartTime; | |
29 | 27 | //预约复查结束时间 |
30 | - private Date nextEndTime; | |
28 | + private String nextEndTime; | |
31 | 29 | |
32 | - | |
33 | - public Date getFollowUpStartTime() { | |
30 | + public String getFollowUpStartTime() { | |
34 | 31 | return followUpStartTime; |
35 | 32 | } |
36 | 33 | |
37 | - public void setFollowUpStartTime(Date followUpStartTime) { | |
38 | - this.followUpStartTime = followUpStartTime; | |
34 | + public String getFollowUpEndTime() { | |
35 | + return followUpEndTime; | |
39 | 36 | } |
40 | 37 | |
41 | - public Date getFollowUpEndTime() { | |
42 | - return followUpEndTime; | |
38 | + public void setFollowUpStartTime(String followUpStartTime) { | |
39 | + this.followUpStartTime = followUpStartTime; | |
43 | 40 | } |
44 | 41 | |
45 | - public void setFollowUpEndTime(Date followUpEndTime) { | |
42 | + public void setFollowUpEndTime(String followUpEndTime) { | |
46 | 43 | this.followUpEndTime = followUpEndTime; |
47 | 44 | } |
48 | 45 | |
49 | 46 | |
50 | 47 | |
51 | 48 | |
52 | 49 | |
... | ... | @@ -89,22 +86,24 @@ |
89 | 86 | public String[] getInterCure() { |
90 | 87 | return interCure; |
91 | 88 | } |
89 | + | |
92 | 90 | public void setInterCure(String[] interCure) { |
93 | 91 | this.interCure = interCure; |
94 | 92 | } |
95 | - public Date getNextStartTime() { | |
93 | + | |
94 | + public String getNextStartTime() { | |
96 | 95 | return nextStartTime; |
97 | 96 | } |
98 | 97 | |
99 | - public void setNextStartTime(Date nextStartTime) { | |
98 | + public void setNextStartTime(String nextStartTime) { | |
100 | 99 | this.nextStartTime = nextStartTime; |
101 | 100 | } |
102 | 101 | |
103 | - public Date getNextEndTime() { | |
102 | + public String getNextEndTime() { | |
104 | 103 | return nextEndTime; |
105 | 104 | } |
106 | 105 | |
107 | - public void setNextEndTime(Date nextEndTime) { | |
106 | + public void setNextEndTime(String nextEndTime) { | |
108 | 107 | this.nextEndTime = nextEndTime; |
109 | 108 | } |
110 | 109 | } |