shiyang / regional-platform

Download as
Browse Code »

Commit c1d53bea483c42c7257dbc0a48f20d3753bdc67b

Authored by jiangjiazhi
2 parents 6da04246e7 28fc239dd0
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java View file @ c1d53be
... ... @@ -180,7 +180,7 @@
180 180  
181 181 @RequestMapping(value = "/querySmsList", method = RequestMethod.GET)
182 182 @ResponseBody
183   - public BaseResponse querySmsList(@RequestParam(required = false) String hospitalId,
  183 + public BaseResponse querySmsList(@RequestParam(required = false) String hospitalName,
184 184 @RequestParam(required = false) String phone,
185 185 @RequestParam(required = false) Integer smsType,
186 186 @RequestParam(required = false) Integer smsStatus,
... ... @@ -190,7 +190,7 @@
190 190 @RequestParam(required = false) String actualTime,
191 191 @RequestParam(required = false) Integer page,
192 192 @RequestParam(required = false) Integer limit) {
193   - return smsConfigFacade.querySmsList(hospitalId, phone, smsType, smsStatus, content,planTime,actualTime,objType, page, limit);
  193 + return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content,planTime,actualTime,objType, page, limit);
194 194 }
195 195 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ c1d53be
... ... @@ -702,7 +702,7 @@
702 702 bm.setServiceType(b.getServiceType());
703 703 bm.setVcCardNo(b.getVcCardNo());
704 704 bm.setHospitalId(b.getHospitalId());
705   - bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar()));
  705 + bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgarScore()));
706 706  
707 707 if (b.getHighRisk() == null) {
708 708 bm.setLastHighRisk(0);
... ... @@ -834,7 +834,7 @@
834 834 result.setBabyHead(model.getBabyHead());
835 835 result.setDeliverOrg(model.getDeliverOrg());
836 836 result.setMalformation(model.getMalformation());
837   - result.setApgar(JsonUtil.str2Obj(model.getApgarScore(), Map.class));
  837 + result.setApgarScore(JsonUtil.str2Obj(model.getApgarScore(), Map.class));
838 838  
839 839  
840 840 result.setHighRisk(model.getHighRisk());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ c1d53be
... ... @@ -631,8 +631,34 @@
631 631 return objectResponse;
632 632 }
633 633  
634   - public BaseListResponse querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime,Integer objType, Integer page, Integer limit)
  634 + public BaseListResponse querySmsList(String hospitalName, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime,Integer objType, Integer page, Integer limit)
635 635 {
  636 +
  637 + OrganizationQuery organizationQuery = new OrganizationQuery();
  638 +
  639 + organizationQuery.setYn(YnEnums.YES.getId());
  640 + organizationQuery.setKeyword(hospitalName);
  641 +
  642 +
  643 + String hospitalIds = "";
  644 + List<Organization> orgs = organizationService.queryHospitals(organizationQuery);
  645 + if (CollectionUtils.isNotEmpty(orgs))
  646 + {
  647 + for(int i = 0 ; i< orgs.size() ; i++)
  648 + {
  649 + String orgId = orgs.get(i).getId()+"";
  650 + if (i == orgs.size() -1)
  651 + {
  652 + hospitalIds+=orgId;
  653 + }
  654 + else
  655 + {
  656 + hospitalIds+=orgId+",";
  657 + }
  658 + }
  659 + }
  660 +
  661 +
636 662 String planTimeStart = "";
637 663 String planTimeEnd = "";
638 664 if (StringUtils.isNotEmpty(planTime))
... ... @@ -651,7 +677,7 @@
651 677 }
652 678 List<Map<String,String>> list = new ArrayList<>();
653 679  
654   - SmsResult sms = MessageCenterService.querySmsList(hospitalId, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd,objType, page, limit);
  680 + SmsResult sms = MessageCenterService.querySmsList(hospitalIds, phone, smsType, smsStatus, content, planTimeStart, planTimeEnd, actualTimeStart, actualTimeEnd,objType, page, limit);
655 681  
656 682 if (sms != null && sms.getList() != null )
657 683 {
... ... @@ -681,7 +707,7 @@
681 707 if (obj.getPlanTime() != null && obj.getPlanTime() > 0)
682 708 {
683 709 long pt = (long)obj.getPlanTime() * 1000;
684   - String strpt = DateUtil.getyyyy_MM_dd(new Date(pt));
  710 + String strpt = DateUtil.getyyyy_MM_dd_hms(new Date(pt));
685 711 map.put("planTime", strpt);
686 712 }
687 713 else
... ... @@ -692,7 +718,7 @@
692 718 if (obj.getActualTime() != null && obj.getActualTime() > 0)
693 719 {
694 720 long pt = (long)obj.getActualTime() * 1000;
695   - String strpt = DateUtil.getyyyy_MM_dd(new Date(pt));
  721 + String strpt = DateUtil.getyyyy_MM_dd_hms(new Date(pt));
696 722 map.put("actualTime", strpt);
697 723 }
698 724 else
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ c1d53be
... ... @@ -109,7 +109,7 @@
109 109 private String deliverOrg;
110 110  
111 111 //apgar评分
112   - private Map<String,String> apgar;
  112 + private Map<String,String> apgarScore;
113 113  
114 114 //是否畸形 0非畸形 1畸形
115 115 private Integer malformation;
116 116  
... ... @@ -475,12 +475,12 @@
475 475 this.vcCardNo = vcCardNo;
476 476 }
477 477  
478   - public Map<String, String> getApgar() {
479   - return apgar;
  478 + public Map<String, String> getApgarScore() {
  479 + return apgarScore;
480 480 }
481 481  
482   - public void setApgar(Map<String, String> apgar) {
483   - this.apgar = apgar;
  482 + public void setApgarScore(Map<String, String> apgarScore) {
  483 + this.apgarScore = apgarScore;
484 484 }
485 485  
486 486 public String getMremark() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ c1d53be
... ... @@ -92,7 +92,7 @@
92 92 private Integer malformation;
93 93  
94 94 //apgar评分
95   - private Map<String,Object> apgar;
  95 + private Map<String,Object> apgarScore;
96 96  
97 97 //建档医生
98 98 private Map<String,String> buildDoctor;
99 99  
... ... @@ -487,12 +487,12 @@
487 487 this.vcCardNo = vcCardNo;
488 488 }
489 489  
490   - public Map<String, Object> getApgar() {
491   - return apgar;
  490 + public Map<String, Object> getApgarScore() {
  491 + return apgarScore;
492 492 }
493 493  
494   - public void setApgar(Map<String, Object> apgar) {
495   - this.apgar = apgar;
  494 + public void setApgarScore(Map<String, Object> apgarScore) {
  495 + this.apgarScore = apgarScore;
496 496 }
497 497 }