Commit dc2ff214aa82313c850e0afd9fe0f6cf3b86c1c0
1 parent
5f18ce6e2d
Exists in
master
and in
6 other branches
bbbbbb
Showing 1 changed file with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
dc2ff21
| ... | ... | @@ -828,6 +828,7 @@ |
| 828 | 828 | } |
| 829 | 829 | |
| 830 | 830 | // 建档孕周 1=孕早期(0~12周) 2=孕中期(13-27) 3=孕晚期(28~42) |
| 831 | + // ageType 1=全部年龄 2=20岁以下 3=20-30岁 4=30-40岁 5=40岁以上 | |
| 831 | 832 | private void doFilter(List<Patients> patients, Integer ageType, Integer patientType) { |
| 832 | 833 | if(patientType != null) { |
| 833 | 834 | Iterator<Patients> iterator = patients.iterator(); |
| 834 | 835 | |
| 835 | 836 | |
| ... | ... | @@ -853,15 +854,15 @@ |
| 853 | 854 | iterator.remove(); |
| 854 | 855 | continue; |
| 855 | 856 | } |
| 856 | - if(ageType == 2 && age >= 20) { | |
| 857 | + if(ageType == 2 && age > 20) { | |
| 857 | 858 | iterator.remove(); |
| 858 | 859 | continue; |
| 859 | 860 | } |
| 860 | - if(ageType == 3 && age >= 30) { | |
| 861 | + if(ageType == 3 && (age > 30 || age < 20)) { | |
| 861 | 862 | iterator.remove(); |
| 862 | 863 | continue; |
| 863 | 864 | } |
| 864 | - if(ageType == 4 && age >= 40) { | |
| 865 | + if(ageType == 4 && (age > 40 || age < 30)) { | |
| 865 | 866 | iterator.remove(); |
| 866 | 867 | continue; |
| 867 | 868 | } |