liquanyu / regional-platform

Download as
Browse Code »

Commit 7382cbcfebe98d3e1018fcee0433254db3e27751

Authored by jiangjiazhi
2 parents ebe8175a91 00c4a5aa0f
Exists in master and in 3 other branches 0116, dev, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java View file @ 7382cbc
... ... @@ -56,16 +56,16 @@
56 56  
57 57 if (null != referVal) {
58 58 if(1 == referVal) {
59   - condition.and("charRefer", null, MongoOper.NE);
  59 + condition.and("charRefer", "", MongoOper.NE);
60 60 } else if(2 == referVal) {
61   - condition.and("charRefer", null, MongoOper.IS);
  61 + condition.and("charRefer", "", MongoOper.IS);
62 62 }
63 63 }
64 64 if (null != emergencyVal) {
65 65 if(1 == emergencyVal) {
66   - condition.and("emergencyChar", null, MongoOper.NE);
  66 + condition.and("emergencyChar", "", MongoOper.NE);
67 67 } else if(2 == emergencyVal) {
68   - condition.and("emergencyChar", null, MongoOper.IS);
  68 + condition.and("emergencyChar", "", MongoOper.IS);
69 69 }
70 70 }
71 71  
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java View file @ 7382cbc
... ... @@ -40,20 +40,20 @@
40 40 referValue.setCreateDate(System.currentTimeMillis());
41 41  
42 42 if(null == referValue.getCharRefer() || 0 == referValue.getCharRefer().length()) {
43   - referValue.setCharRefer(null);
  43 + referValue.setCharRefer("");
44 44 }
45 45 if(null == referValue.getEmergencyChar() || 0 == referValue.getEmergencyChar().length()) {
46   - referValue.setEmergencyChar(null);
  46 + referValue.setEmergencyChar("");
47 47 }
48 48 referConfigDao.addRefer(referValue);
49 49 }
50 50  
51 51 public void updateRefer(ReferValue referValue) {
52 52 if(null == referValue.getCharRefer() || 0 == referValue.getCharRefer().length()) {
53   - referValue.setCharRefer(null);
  53 + referValue.setCharRefer("");
54 54 }
55 55 if(null == referValue.getEmergencyChar() || 0 == referValue.getEmergencyChar().length()) {
56   - referValue.setEmergencyChar(null);
  56 + referValue.setEmergencyChar("");
57 57 }
58 58 MongoCondition mongoCondition = MongoCondition.newInstance("id",referValue.getId(), MongoOper.IS);
59 59 referValue.setModifiedDate(System.currentTimeMillis());
platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java View file @ 7382cbc
... ... @@ -34,6 +34,15 @@
34 34 private Object area;
35 35 private Object street;
36 36 private String foreignId;
  37 + private Integer orgType; //0 ¹«Ë¾ 1 Ò½Ôº
  38 +
  39 + public Integer getOrgType() {
  40 + return orgType;
  41 + }
  42 +
  43 + public void setOrgType(Integer orgType) {
  44 + this.orgType = orgType;
  45 + }
37 46  
38 47 Map<String, Departments> departmentsMap = new HashMap<>();
39 48  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 7382cbc
... ... @@ -342,6 +342,15 @@
342 342 organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true));
343 343 }
344 344  
  345 + //设置机构类型 0 公司 1 医院
  346 + if(null != organization.getType() &&
  347 + (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) ||
  348 + organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
  349 + organization.setOrgType(1);
  350 + } else {
  351 + organization.setOrgType(0);
  352 + }
  353 +
345 354 data.add(organization);
346 355 }
347 356 }