Commit 8d4044c586654daf9b6347d24893db8da5f7b7c3

Authored by jiangjiazhi
1 parent 300bf50bdc

全部孕妇管理增加按照排序

Showing 1 changed file with 37 additions and 35 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ 8d4044c
... ... @@ -10,7 +10,7 @@
10 10  
11 11 /**
12 12 * 高危孕妇管理查询
13   - * <p>
  13 + * <p/>
14 14 * Created by Administrator on 2016/6/22 0022.
15 15 */
16 16 @Form
17 17  
18 18  
19 19  
20 20  
... ... @@ -156,22 +156,24 @@
156 156 /**
157 157 * 排序策略枚举
158 158 */
159   - private enum OrderEnum{
160   - DESC("1","DESC"),ASC("2","ASC");
161   - private OrderEnum(String id,String order){
  159 + private enum OrderEnum {
  160 + DESC("1", "DESC"), ASC("2", "ASC");
  161 +
  162 + private OrderEnum(String id, String order) {
162 163 this.id
163   - =id;
164   - this.order=order;
  164 + = id;
  165 + this.order = order;
165 166 }
  167 +
166 168 private String id;
167 169 private String order;
168 170  
169   - public static String valueOfOrder(String id){
170   - if(org.apache.commons.lang.StringUtils.isEmpty(id)){
  171 + public static String valueOfOrder(String id) {
  172 + if (org.apache.commons.lang.StringUtils.isEmpty(id)) {
171 173 return DESC.order;
172 174 }
173   - for(OrderEnum order:values()){
174   - if(order.id.equals(id)){
  175 + for (OrderEnum order : values()) {
  176 + if (order.id.equals(id)) {
175 177 return order.order;
176 178 }
177 179 }
178 180  
179 181  
180 182  
181 183  
... ... @@ -182,25 +184,27 @@
182 184 /**
183 185 * 排序字段枚举
184 186 */
185   - private enum SortEnum{
186   - SORT_MODIFIED("1","modified"),//按更新时间排
187   - SORT_BUILD_DATE("2","bookbuildingDate"),//按建档时间排
188   - SORT_DUE_TIME("3","lastMenses"),//按孕产期排
189   - SORT_DUE_DETE("4","lastMenses");//按当前孕周排
190   - private SortEnum(String id,String sort){
191   - this.id=id
  187 + private enum SortEnum {
  188 + SORT_MODIFIED("1", "modified"),//按更新时间排
  189 + SORT_BUILD_DATE("2", "bookbuildingDate"),//按建档时间排
  190 + SORT_DUE_TIME("3", "lastMenses"),//按孕产期排
  191 + SORT_DUE_DETE("4", "lastMenses");//按当前孕周排
  192 +
  193 + private SortEnum(String id, String sort) {
  194 + this.id = id
192 195 ;
193   - this.sort=sort;
  196 + this.sort = sort;
194 197 }
  198 +
195 199 private String id;
196 200 private String sort;
197 201  
198   - public static String valueOfOrder(String id){
199   - if(org.apache.commons.lang.StringUtils.isEmpty(id)){
  202 + public static String valueOfOrder(String id) {
  203 + if (org.apache.commons.lang.StringUtils.isEmpty(id)) {
200 204 return SORT_MODIFIED.sort;
201 205 }
202   - for(SortEnum order:values()){
203   - if(order.id.equals(id)){
  206 + for (SortEnum order : values()) {
  207 + if (order.id.equals(id)) {
204 208 return order.sort;
205 209 }
206 210 }
... ... @@ -209,13 +213,6 @@
209 213 }
210 214  
211 215 public String getSort() {
212   - /*if(SortEnum.SORT_DUE_DETE.sort.equals(sort)){
213   - if("1".equals(order)){
214   - order=OrderEnum.ASC.order;
215   - }else if("2".equals(order)){
216   - order=OrderEnum.DESC.order;
217   - }
218   - }*/
219 216 return SortEnum.valueOfOrder(sort);
220 217 }
221 218  
... ... @@ -224,6 +221,13 @@
224 221 }
225 222  
226 223 public String getOrder() {
  224 + if (SortEnum.SORT_DUE_DETE.sort.equals(sort)) {
  225 + if (OrderEnum.DESC.id.equals(order)) {
  226 + order = OrderEnum.ASC.id;
  227 + } else if (OrderEnum.ASC.id.equals(order)) {
  228 + order = OrderEnum.DESC.id;
  229 + }
  230 + }
227 231 return OrderEnum.valueOfOrder(order);
228 232 }
229 233  
... ... @@ -485,8 +489,6 @@
485 489 }
486 490  
487 491  
488   -
489   -
490 492 public String getNextCheckTime() {
491 493 return nextCheckTime;
492 494 }
493 495  
... ... @@ -592,9 +594,9 @@
592 594 }
593 595  
594 596 public Date capStart() {
595   - if (StringUtils.isNotEmpty(startDueWeek) ) {
  597 + if (StringUtils.isNotEmpty(startDueWeek)) {
596 598 int start = NumberUtils.toInt(startDueWeek, 0);
597   - Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start*7));
  599 + Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start * 7));
598 600 return endDate;
599 601 }
600 602 return null;
... ... @@ -602,8 +604,8 @@
602 604  
603 605 public Date capEnd() {
604 606 if (StringUtils.isNotEmpty(endDueWeek)) {
605   - int end = NumberUtils.toInt(endDueWeek, 0);
606   - Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7)-6);
  607 + int end = NumberUtils.toInt(endDueWeek, 0);
  608 + Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end * 7) - 6);
607 609 return endDate;
608 610 }
609 611 return null;