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 c387fb76..af82963 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 @@ -119,9 +119,9 @@ public class SieveService { public static void handOrder(SieveModel sieveModel) { int days = DateUtil.getDays(sieveModel.getLastMenses(), DateUtil.formatDate(new Date())); int order = 100; - if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O.getId() && days >= 100 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { + if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O.getId() && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { order = 1; - } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O1.getId() && days >= 100 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { + } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O1.getId() && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) { order = 2; } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O2.getId() && null != sieveModel.getZtfx() && sieveModel.getZtfx() >= 1) { order = 3;