Commit 3752abdd3387e4bee148677e1180fc68eb03b0fd
1 parent
6fa7f3557b
Exists in
master
and in
8 other branches
update code
Showing 3 changed files with 38 additions and 9 deletions
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
3752abd
| ... | ... | @@ -595,8 +595,7 @@ |
| 595 | 595 | //消息类型 |
| 596 | 596 | Integer smsType = template.getSmsType(); |
| 597 | 597 | |
| 598 | -// //发送频次 | |
| 599 | -// Integer sendFreq = template.getSendFrequency(); | |
| 598 | + | |
| 600 | 599 | // |
| 601 | 600 | // //发送日期类型 SendDateEnums枚举类 |
| 602 | 601 | // Integer sendDateType = template.getSendDateType(); |
| 603 | 602 | |
| 604 | 603 | |
| ... | ... | @@ -736,12 +735,42 @@ |
| 736 | 735 | } |
| 737 | 736 | else if (smsType == SmsServiceEnums.CJCXTX.getId()) |
| 738 | 737 | { |
| 739 | - //查询符合条件的孕妇 | |
| 740 | - List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 741 | - if (CollectionUtils.isNotEmpty(patients)) | |
| 738 | + | |
| 739 | + //发送频次 | |
| 740 | + Integer sendFreq = template.getSendFrequency(); | |
| 741 | + | |
| 742 | + if (sendFreq == SendFrequencyEnums.YEAR.getId()) | |
| 742 | 743 | { |
| 743 | 744 | |
| 745 | + //GL(0,"公历","0,1,2","0,1,2,3"),NL(1,"农历","0,1,2","0,1,2,3"),TSRQ(2,"特殊日期","0,2","1,2,3"),SLRQ(3,"生理日期","0","1,2,3"); | |
| 746 | + Integer sendDateType = template.getSendDateType(); | |
| 747 | + if (sendDateType == SendDateEnums.SLRQ.getId()) | |
| 748 | + { | |
| 749 | + //孕妇为孕周 | |
| 750 | + Integer specialDateType = template.getSpecialDateType(); | |
| 751 | + | |
| 752 | + if (specialDateType == SpecialDateEnums.YZ.getId()) | |
| 753 | + { | |
| 754 | + Integer start = template.getStart(); | |
| 755 | + Integer end = template.getEnd(); | |
| 756 | + | |
| 757 | + if (start != null && end != null) | |
| 758 | + { | |
| 759 | + | |
| 760 | + //查询符合条件的孕妇 | |
| 761 | + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 762 | + if (CollectionUtils.isNotEmpty(patients)) | |
| 763 | + { | |
| 764 | + | |
| 765 | + } | |
| 766 | + } | |
| 767 | + | |
| 768 | + } | |
| 769 | + } | |
| 770 | + | |
| 744 | 771 | } |
| 772 | + | |
| 773 | + | |
| 745 | 774 | } |
| 746 | 775 | |
| 747 | 776 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
3752abd
| ... | ... | @@ -183,7 +183,7 @@ |
| 183 | 183 | if (pat != null) |
| 184 | 184 | { |
| 185 | 185 | BookbuildingRecordResult result = new BookbuildingRecordResult(); |
| 186 | - Organization org = organizationService.getOrganization(pat.getHospitalId()); | |
| 186 | + Organization org = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId())); | |
| 187 | 187 | if (org != null) |
| 188 | 188 | { |
| 189 | 189 | result.setBookbuildHospital(org.getName()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
View file @
3752abd
| ... | ... | @@ -140,7 +140,7 @@ |
| 140 | 140 | |
| 141 | 141 | //医院Id |
| 142 | 142 | @FormParam |
| 143 | - private Integer hospitalId; | |
| 143 | + private String hospitalId; | |
| 144 | 144 | |
| 145 | 145 | //服务状态 |
| 146 | 146 | @FormParam |
| 147 | 147 | |
| ... | ... | @@ -476,11 +476,11 @@ |
| 476 | 476 | this.childbirthAreaId = childbirthAreaId; |
| 477 | 477 | } |
| 478 | 478 | |
| 479 | - public Integer getHospitalId() { | |
| 479 | + public String getHospitalId() { | |
| 480 | 480 | return hospitalId; |
| 481 | 481 | } |
| 482 | 482 | |
| 483 | - public void setHospitalId(Integer hospitalId) { | |
| 483 | + public void setHospitalId(String hospitalId) { | |
| 484 | 484 | this.hospitalId = hospitalId; |
| 485 | 485 | } |
| 486 | 486 |