jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9713ad3c085c022a1605e39c48054df74fd6f5fe

Authored by jiangjiazhi
1 parent bb9fba0f1b
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

修改转诊

Showing 1 changed file with 7 additions and 7 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java View file @ 9713ad3
... ... @@ -83,7 +83,7 @@
83 83 sieveQuery.mysqlBuild((int) iSieveDao.count(sieveQuery.convertToQuery()));
84 84 mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit());
85 85 }
86   - return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, filed));
  86 + return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, "order").addOrder(Sort.Direction.DESC, "modified"));
87 87 }
88 88  
89 89 /**
90 90  
91 91  
92 92  
... ... @@ -119,13 +119,13 @@
119 119 public static void handOrder(SieveModel sieveModel) {
120 120 int days = DateUtil.getDays(sieveModel.getLastMenses(), DateUtil.formatDate(new Date()));
121 121 int order = 100;
122   - if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O.getId() && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) {
  122 + if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O.getId()) && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) {
123 123 order = 1;
124   - } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O1.getId() && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) {
  124 + } else if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O1.getId()) && days >= 140 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) {
125 125 order = 2;
126   - } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O2.getId() && null != sieveModel.getZtfx() && sieveModel.getZtfx() >= 1) {
  126 + } else if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O2.getId()) && null != sieveModel.getZtfx() && sieveModel.getZtfx() >= 1) {
127 127 order = 3;
128   - } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O3.getId() && null != sieveModel.getCqResult() && sieveModel.getCqResult() == ChanQResultEnums.CqResult.O.getId()) {
  128 + } else if (null != sieveModel.getStatus() && sieveModel.getStatus().equals(SieveStatusEnums.O3.getId()) && null != sieveModel.getCqResult() && sieveModel.getCqResult() == ChanQResultEnums.CqResult.O.getId()) {
129 129 order = 4;
130 130 }
131 131 sieveModel.setOrder(order);
... ... @@ -133,8 +133,8 @@
133 133  
134 134 public static void main(String[] args) {
135 135 SieveModel sieveModel = new SieveModel();
136   - sieveModel.setLastMenses(DateUtil.parseYMD("2016-4-5"));
137   - sieveModel.setStatus(2);
  136 + sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-2"));
  137 + sieveModel.setStatus(1);
138 138 handOrder(sieveModel);
139 139 System.out.print(sieveModel.getOrder());
140 140 }