diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
index 56403df..867735d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
@@ -10,7 +10,7 @@ import java.util.Date;
 
 /**
  * 高危孕妇管理查询
- * <p>
+ * <p/>
  * Created by Administrator on 2016/6/22 0022.
  */
 @Form
@@ -156,22 +156,24 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     /**
      * 排序策略枚举
      */
-    private enum OrderEnum{
-        DESC("1","DESC"),ASC("2","ASC");
-        private OrderEnum(String id,String order){
+    private enum OrderEnum {
+        DESC("1", "DESC"), ASC("2", "ASC");
+
+        private OrderEnum(String id, String order) {
             this.id
-                    =id;
-            this.order=order;
+                    = id;
+            this.order = order;
         }
+
         private String id;
         private String order;
 
-        public static String valueOfOrder(String id){
-            if(org.apache.commons.lang.StringUtils.isEmpty(id)){
+        public static String valueOfOrder(String id) {
+            if (org.apache.commons.lang.StringUtils.isEmpty(id)) {
                 return DESC.order;
             }
-            for(OrderEnum order:values()){
-                if(order.id.equals(id)){
+            for (OrderEnum order : values()) {
+                if (order.id.equals(id)) {
                     return order.order;
                 }
             }
@@ -182,25 +184,27 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     /**
      * 排序字段枚举
      */
-    private enum SortEnum{
-        SORT_MODIFIED("1","modified"),//按更新时间排
-        SORT_BUILD_DATE("2","bookbuildingDate"),//按建档时间排
-        SORT_DUE_TIME("3","lastMenses"),//按孕产期排
-        SORT_DUE_DETE("4","lastMenses");//按当前孕周排
-        private SortEnum(String id,String sort){
-            this.id=id
+    private enum SortEnum {
+        SORT_MODIFIED("1", "modified"),//按更新时间排
+        SORT_BUILD_DATE("2", "bookbuildingDate"),//按建档时间排
+        SORT_DUE_TIME("3", "lastMenses"),//按孕产期排
+        SORT_DUE_DETE("4", "lastMenses");//按当前孕周排
+
+        private SortEnum(String id, String sort) {
+            this.id = id
             ;
-            this.sort=sort;
+            this.sort = sort;
         }
+
         private String id;
         private String sort;
 
-        public static String valueOfOrder(String id){
-            if(org.apache.commons.lang.StringUtils.isEmpty(id)){
+        public static String valueOfOrder(String id) {
+            if (org.apache.commons.lang.StringUtils.isEmpty(id)) {
                 return SORT_MODIFIED.sort;
             }
-            for(SortEnum order:values()){
-                if(order.id.equals(id)){
+            for (SortEnum order : values()) {
+                if (order.id.equals(id)) {
                     return order.sort;
                 }
             }
@@ -209,13 +213,6 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     }
 
     public String getSort() {
-        /*if(SortEnum.SORT_DUE_DETE.sort.equals(sort)){
-            if("1".equals(order)){
-                order=OrderEnum.ASC.order;
-            }else if("2".equals(order)){
-                order=OrderEnum.DESC.order;
-            }
-        }*/
         return SortEnum.valueOfOrder(sort);
     }
 
@@ -224,6 +221,13 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     }
 
     public String getOrder() {
+        if (SortEnum.SORT_DUE_DETE.sort.equals(sort)) {
+            if (OrderEnum.DESC.id.equals(order)) {
+                order = OrderEnum.ASC.id;
+            } else if (OrderEnum.ASC.id.equals(order)) {
+                order = OrderEnum.DESC.id;
+            }
+        }
         return OrderEnum.valueOfOrder(order);
     }
 
@@ -485,8 +489,6 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     }
 
 
-
-
     public String getNextCheckTime() {
         return nextCheckTime;
     }
@@ -592,9 +594,9 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     }
 
     public Date capStart() {
-        if (StringUtils.isNotEmpty(startDueWeek) ) {
+        if (StringUtils.isNotEmpty(startDueWeek)) {
             int start = NumberUtils.toInt(startDueWeek, 0);
-            Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start*7));
+            Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start * 7));
             return endDate;
         }
         return null;
@@ -602,8 +604,8 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
 
     public Date capEnd() {
         if (StringUtils.isNotEmpty(endDueWeek)) {
-            int  end = NumberUtils.toInt(endDueWeek, 0);
-            Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7)-6);
+            int end = NumberUtils.toInt(endDueWeek, 0);
+            Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end * 7) - 6);
             return endDate;
         }
         return null;