jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 303aad3f74b6ce32e433351868c206d6aa2d8593

Authored by hujiaqi
2 parents 78cc460208 15f469e893
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java View file @ 303aad3
... ... @@ -61,13 +61,19 @@
61 61 return obj.getId();
62 62 }
63 63  
  64 +
  65 + private boolean isstart = false;
  66 +
64 67 @Override
65 68 public void rebuildDefaultRoles() {
66   - OrganizationQuery query = new OrganizationQuery();
67   - query.setYn(1);
68   - List<Organization> list = masterOrganizationMapper.queryOrganization(query);
69   - for (Organization obj:list) {
70   - addDefaultRoles(obj);
  69 + if (!isstart) {
  70 + isstart = true;
  71 + OrganizationQuery query = new OrganizationQuery();
  72 + query.setYn(1);
  73 + List<Organization> list = masterOrganizationMapper.queryOrganization(query);
  74 + for (Organization obj : list) {
  75 + addDefaultRoles(obj);
  76 + }
71 77 }
72 78 }
73 79  
platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java View file @ 303aad3
... ... @@ -11,8 +11,27 @@
11 11 private String id;
12 12 private String name;
13 13 private String idCard;
  14 + private String cardNum;
  15 + private String phone;
14 16 private String hospitalId;
15 17 private String jsonData;
  18 +
  19 +
  20 + public String getCardNum() {
  21 + return cardNum;
  22 + }
  23 +
  24 + public void setCardNum(String cardNum) {
  25 + this.cardNum = cardNum;
  26 + }
  27 +
  28 + public String getPhone() {
  29 + return phone;
  30 + }
  31 +
  32 + public void setPhone(String phone) {
  33 + this.phone = phone;
  34 + }
16 35  
17 36 public String getId() {
18 37 return id;
platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java View file @ 303aad3
... ... @@ -14,6 +14,8 @@
14 14 private String id;
15 15 private String idCard;
16 16 private String hospitalId;
  17 + private String cardNum;
  18 + private String phone;
17 19  
18 20 public String getId() {
19 21 return id;
... ... @@ -39,6 +41,23 @@
39 41 this.hospitalId = hospitalId;
40 42 }
41 43  
  44 + public String getCardNum() {
  45 + return cardNum;
  46 + }
  47 +
  48 + public void setCardNum(String cardNum) {
  49 + this.cardNum = cardNum;
  50 + }
  51 +
  52 + public String getPhone() {
  53 + return phone;
  54 + }
  55 +
  56 + public void setPhone(String phone) {
  57 + this.phone = phone;
  58 + }
  59 +
  60 +
42 61 @Override
43 62 public MongoQuery convertToQuery() {
44 63 MongoCondition condition=MongoCondition.newInstance();
... ... @@ -50,6 +69,12 @@
50 69 }
51 70 if(null!=id){
52 71 condition= condition.and("id",id, MongoOper.IS);
  72 + }
  73 + if(null!=cardNum){
  74 + condition= condition.and("cardNum",cardNum, MongoOper.IS);
  75 + }
  76 + if(null!=phone){
  77 + condition= condition.and("phone",phone, MongoOper.IS);
53 78 }
54 79 return condition.toMongoQuery();
55 80 }
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 303aad3
... ... @@ -508,12 +508,12 @@
508 508 {
509 509 for(MessageContent message : messageContents)
510 510 {
511   -// //判断当前短信是否已经发送 通过短信ID和孕妇ID
512   -// boolean isExist = SaveMessageService.isExistSms(baby.getId(), message.getId());
513   -// if (isExist)
514   -// {
515   -// continue;
516   -// }
  511 + //判断当前短信是否已经发送 通过短信ID和儿童ID
  512 + boolean isExist = SaveMessageService.isExistSms(baby.getId(), message.getId());
  513 + if (isExist)
  514 + {
  515 + continue;
  516 + }
517 517 String messageContent = "【"+messagePrefix+"】" + message.getContent();
518 518 MessageRequest request = getMessageRequest( messageContent,baby.getMphone(),ServiceObjEnums.BABYOBJ.getId(), SmsServiceEnums.YBZD.getId(),
519 519 baby.getHospitalId(),message.getId(),baby.getId());
... ... @@ -639,6 +639,12 @@
639 639 for(MessageContent message : messageContents)
640 640 {
641 641  
  642 + //判断当前短信是否已经发送 通过短信ID和产妇ID
  643 + boolean isExist = SaveMessageService.isExistSms(pat.getId(), message.getId());
  644 + if (isExist)
  645 + {
  646 + continue;
  647 + }
642 648 String messageContent = "【"+messagePrefix+"】" + message.getContent();
643 649  
644 650 MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.CHANOBJ.getId(), SmsServiceEnums.YBZD.getId(),
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java View file @ 303aad3
... ... @@ -34,9 +34,11 @@
34 34 public static final String center_statistics_url= PropertiesUtils.getPropertyValue("center_statistics_url");
35 35  
36 36 @RequestMapping(value = "/bookArchive",method = RequestMethod.GET)
37   - public void queryBookArchive(HttpServletResponse response, String idCard, String hospitalId) {
  37 + public void queryBookArchive(HttpServletResponse response, String idCard, String hospitalId,String cardNum,String phone) {
38 38 ArchiveDataQuery query = new ArchiveDataQuery();
39 39 query.setIdCard(idCard);
  40 + query.setCardNum(cardNum);
  41 + query.setPhone(phone);
40 42 // query.setHospitalId(hospitalId);
41 43 List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
42 44 if (list!=null && list.size() > 0) {
43 45  
44 46  
... ... @@ -46,13 +48,22 @@
46 48 }
47 49 }
48 50  
  51 +
49 52 @RequestMapping(value = "/bookArchive",method = RequestMethod.POST)
50   - public void addBookArchive(HttpServletResponse response, String idCard, String hospitalId, String jsonData, String name) {
  53 + public void addBookArchive(HttpServletResponse response,
  54 + String idCard,
  55 + String hospitalId,
  56 + String jsonData,
  57 + String name,
  58 + String cardNum,
  59 + String phone) {
51 60 ArchiveData data = new ArchiveData();
52 61 data.setId(hospitalId+":"+idCard);
53 62 data.setHospitalId(hospitalId);
54 63 data.setIdCard(idCard);
55 64 data.setName(name);
  65 + data.setCardNum(cardNum);
  66 + data.setPhone(phone);
56 67 data.setJsonData(jsonData);
57 68 archiveDataServicer.saveArchiveData(data);
58 69 writeString(response,"success");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 303aad3
... ... @@ -231,7 +231,7 @@
231 231 page = page == null ? 1 : page;
232 232  
233 233 usersQuery.setNeed("true");
234   - usersQuery.setSort("account desc");
  234 + usersQuery.setSort("modified desc");
235 235 usersQuery.setYn(YnEnums.YES.getId());
236 236 usersQuery.setDeptId(deptId);
237 237 usersQuery.setKeyword(keyword);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java View file @ 303aad3
... ... @@ -57,35 +57,16 @@
57 57 List<Users> list = usersService.queryUsers(usersQuery);
58 58 List<Integer> data = new ArrayList<>();
59 59 if (CollectionUtils.isNotEmpty(list)) {
60   - //用户角色
61   - if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())) {
62   - List<Organization> list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId()));
63   - if(CollectionUtils.isNotEmpty(list2)){
64   - for(Organization organization:list2){
65   - data.add(organization.getId());
66   - }
67   - }
68   - } else if(UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())){
69   - List<Organization> list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId()));
70   - if(CollectionUtils.isNotEmpty(list2)){
71   - for(Organization organization:list2){
72   - data.add(organization.getId());
73   - }
74   - }
75   - /*UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery();
76   - userOrganizationMapsQuery.setUserId(list.get(0).getId());
77   - userOrganizationMapsQuery.setYn(YnEnums.YES.getId());
78   - List<UserOrganizationMaps> list1 = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery);
79   - if(CollectionUtils.isNotEmpty(list1)){
80   - for(UserOrganizationMaps userOrganizationMaps:list1){
81   - data.add(userOrganizationMaps.getOrgId());
82   - }
83   - }*/
  60 +
  61 + /**/ //用户角色
  62 + if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())||UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())) {
  63 + data.add(list.get(0).getOrgId());
84 64 } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) {
85 65 return null;
86 66 }
  67 + return data;
87 68 }
88   - return data;
  69 + return null;
89 70 }
90 71 public String getHospitalId(Integer userId){
91 72 List<Integer> list = matchOrgId(userId);