Commit b45ceab3b0016bf20595970e68c53d4553c9ff8b
1 parent
f7edfc0f24
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 6 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
b45ceab
| ... | ... | @@ -3399,11 +3399,13 @@ |
| 3399 | 3399 | babyQuery.setQueryNo(request.getQueryNo()); |
| 3400 | 3400 | //滦平、隆化-儿保管理-全部 加健康/高危筛选 |
| 3401 | 3401 | babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null); |
| 3402 | - //用隆华新口腔模块中数据筛选 牙齿异常2项 | |
| 3403 | - babyQuery.setOralCheckYn(YnEnums.YES.getId()); | |
| 3404 | - babyQuery.setYcsz(null!=request.getCyNumType()?request.getCyNumType().toString():""); | |
| 3405 | - babyQuery.setQcStart(null!=request.getQcNumType()?2==request.getCyNumType()?"1":"":""); | |
| 3406 | 3402 | System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString()); |
| 3403 | + //用隆华新口腔模块中数据筛选 牙齿异常2项 | |
| 3404 | + if(null!=request.getCyNumType()||null!=request.getQcNumType()){ | |
| 3405 | + babyQuery.setOralCheckYn(YnEnums.YES.getId()); | |
| 3406 | + babyQuery.setYcsz(null!=request.getCyNumType()?request.getCyNumType().toString():""); | |
| 3407 | + babyQuery.setQcStart(null!=request.getQcNumType()?2==request.getQcNumType()?"1":"":""); | |
| 3408 | + } | |
| 3407 | 3409 | //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选(这里牙齿异常2项不用了，用隆华新做的口腔模块代替) |
| 3408 | 3410 | if(StringUtils.isNotEmpty(request.getMildAnaemia())||StringUtils.isNotEmpty(request.getModerateAnaemia())|| |
| 3409 | 3411 | StringUtils.isNotEmpty(request.getHeartMurmur())){//||null!=request.getCyNumType()||null!=request.getQcNumType() |