liquanyu / regional-platform

Download as
Browse Code »

Commit 454ee3b0f45a2632cdfe76b27180f019c31b9553

Authored by jiangjiazhi
2 parents cb592d89fa a7112efb5a
Exists in master and in 3 other branches 0116, dev, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java View file @ 454ee3b
... ... @@ -40,18 +40,34 @@
40 40 }
41 41 if (null != referVal) {
42 42 if(1 == referVal) {
43   - condition.and("charRefer", null, MongoOper.NE);
  43 + condition.andCondition(new MongoCondition("charRefer", null, MongoOper.NE).orCondition(new MongoCondition("charRefer", "", MongoOper.NE)));
44 44 } else if(2 == referVal) {
45   - condition.and("charRefer", null, MongoOper.IS);
  45 + condition.orCondition(new MongoCondition[] {new MongoCondition("charRefer", null, MongoOper.IS), new MongoCondition("charRefer", "", MongoOper.IS)});
46 46 }
47 47 }
48 48 if (null != emergencyVal) {
49 49 if(1 == emergencyVal) {
50   - condition.and("emergencyChar", null, MongoOper.NE);
  50 + condition.andCondition(new MongoCondition("emergencyChar", null, MongoOper.NE).orCondition(new MongoCondition("emergencyChar", "", MongoOper.NE)));
  51 +
51 52 } else if(2 == emergencyVal) {
52   - condition.and("emergencyChar", null, MongoOper.IS);
  53 + condition.orCondition(new MongoCondition[]{new MongoCondition("emergencyChar", null, MongoOper.IS), new MongoCondition("emergencyChar", "", MongoOper.IS)});
53 54 }
54 55 }
  56 +
  57 +// if (null != referVal) {
  58 +// if(1 == referVal) {
  59 +// condition.and("charRefer", null, MongoOper.NE);
  60 +// } else if(2 == referVal) {
  61 +// condition.and("charRefer", null, MongoOper.IS);
  62 +// }
  63 +// }
  64 +// if (null != emergencyVal) {
  65 +// if(1 == emergencyVal) {
  66 +// condition.and("emergencyChar", null, MongoOper.NE);
  67 +// } else if(2 == emergencyVal) {
  68 +// condition.and("emergencyChar", null, MongoOper.IS);
  69 +// }
  70 +// }
55 71  
56 72 if(null != yn) {
57 73 condition.and("yn", yn, MongoOper.IS);
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java View file @ 454ee3b
... ... @@ -29,10 +29,10 @@
29 29 referConfigQuery.setNeed("true");
30 30 if(null != referConfigQuery.getNeed()) {
31 31 referConfigQuery.mysqlBuild((int) referConfigDao.queryCount(mongoQuery));
32   - mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()).addOrder(Sort.Direction.DESC, "name");
  32 + mongoQuery.start(referConfigQuery.getOffset()).end(referConfigQuery.getLimit()).addOrder(Sort.Direction.ASC, "name");
33 33 }
34 34  
35   - return referConfigDao.queryRefer(mongoQuery);
  35 + return referConfigDao.queryRefer(mongoQuery.addOrder(Sort.Direction.DESC, "createDate"));
36 36 }
37 37  
38 38 public void addRefer(ReferValue referValue) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 454ee3b
... ... @@ -148,6 +148,7 @@
148 148 }
149 149  
150 150 RolesQuery rolesQuery = new RolesQuery();
  151 + rolesQuery.setYn(YnEnums.YES.getId());
151 152 rolesQuery.setName(name);
152 153 if(0 < rolesService.queryRolesCount(rolesQuery)) {
153 154 ResultUtils.buildResultAndWrite(response,ErrorCodeConstants.NAME_EXIST, "角色名称已存在");
... ... @@ -194,6 +195,7 @@
194 195 }
195 196  
196 197 RolesQuery rolesQuery = new RolesQuery();
  198 + rolesQuery.setYn(YnEnums.YES.getId());
197 199 rolesQuery.setName(name);
198 200 if(0 < rolesService.queryRolesCount(rolesQuery)) {
199 201 ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在");