Commit 629238f3a89ab6c403c1bb487679a23fc8c8f024
1 parent
804e142653
Exists in
master
and in
6 other branches
承德-两癌-宫颈癌个案导出增加检查套餐筛选
Showing 1 changed file with 6 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
629238f
| ... | ... | @@ -162,6 +162,7 @@ |
| 162 | 162 | if (StringUtils.isNotEmpty(idCardNo)) { |
| 163 | 163 | query.addCriteria(Criteria.where("idCardNo").is(idCardNo)); |
| 164 | 164 | } |
| 165 | + //承德市妇幼定制 检查套餐 | |
| 165 | 166 | Integer checkPackage = param.getCheckPackage(); |
| 166 | 167 | if (null!=checkPackage) { |
| 167 | 168 | query.addCriteria(Criteria.where("checkPackage").is(checkPackage)); |
| ... | ... | @@ -314,6 +315,11 @@ |
| 314 | 315 | if (StringUtils.isNotEmpty(keyword)) { |
| 315 | 316 | Criteria c = new Criteria().orOperator(Criteria.where("name").is(keyword), Criteria.where("phone").is(keyword)); |
| 316 | 317 | query.addCriteria(c); |
| 318 | + } | |
| 319 | + //承德市妇幼定制 检查套餐 | |
| 320 | + Integer checkPackage = param.getCheckPackage(); | |
| 321 | + if (null!=checkPackage) { | |
| 322 | + query.addCriteria(Criteria.where("checkPackage").is(checkPackage)); | |
| 317 | 323 | } |
| 318 | 324 | String hasAcceptTreatment = param.getHasAcceptTreatment(); |
| 319 | 325 | if (StringUtils.isNotEmpty(hasAcceptTreatment)) { |