diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java index f317bed..a4d1f01 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java @@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -135,7 +136,8 @@ public class SieveService { } public static void handOrder(SieveModel sieveModel) { - int days = DateUtil.getDays(sieveModel.getLastMenses(), DateUtil.formatDate(new Date())); + + int days = DateUtil.getDays(sieveModel.getLastMenses(), new Date()); int order = 100; if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O.getId()) && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { order = 1; @@ -150,10 +152,25 @@ public class SieveService { } public static void main(String[] args) { - SieveModel sieveModel = new SieveModel(); - sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-5")); - sieveModel.setStatus(1); - handOrder(sieveModel); - System.out.print(sieveModel.getOrder()); + new Thread(){ + @Override + public void run() { + SieveModel sieveModel = new SieveModel(); + sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-15")); + sieveModel.setStatus(1); + handOrder(sieveModel); + System.out.print("1:"+sieveModel.getOrder()); + } + }.start(); + new Thread(){ + @Override + public void run() { + SieveModel sieveModel = new SieveModel(); + sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-1")); + sieveModel.setStatus(1); + handOrder(sieveModel); + System.out.print("2:"+sieveModel.getOrder()); + } + }.start(); } } \ No newline at end of file