Commit 3d0a0d0bb42218dfd95af5e49a311c2eb32d0c44
1 parent
6b98405b66
Exists in
master
and in
6 other branches
儿童听筛加字段
Showing 2 changed files with 27 additions and 1 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java
View file @
3d0a0d0
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml
View file @
3d0a0d0
| ... | ... | @@ -410,24 +410,47 @@ |
| 410 | 410 | </if> |
| 411 | 411 | |
| 412 | 412 | </if> |
| 413 | + <if test="srcSkill != null and srcSkill == 3"> | |
| 414 | + <if test="scrIspass != null and scrIspass ==1"> | |
| 415 | + and( | |
| 416 | + abr_left =1 | |
| 417 | + and abr_right = 1 | |
| 418 | + ) | |
| 419 | + </if> | |
| 420 | + <if test="scrIspass != null and scrIspass ==2"> | |
| 421 | + and( | |
| 422 | + abr_left =-1 | |
| 423 | + and abr_right = -1 | |
| 424 | + ) | |
| 425 | + </if> | |
| 426 | + <if test="scrIspass == null"> | |
| 427 | + and( | |
| 428 | + abr_left is not null | |
| 429 | + or abr_right is not null | |
| 430 | + ) | |
| 431 | + </if> | |
| 432 | + </if> | |
| 413 | 433 | |
| 414 | 434 | <if test="leftRight!= null and leftRight == 1"> |
| 415 | 435 | <if test="scrIspass != null and scrIspass ==1"> |
| 416 | 436 | and( |
| 417 | 437 | oae_left =1 |
| 418 | 438 | and aabr_left = 1 |
| 439 | + and abr_left = 1 | |
| 419 | 440 | ) |
| 420 | 441 | </if> |
| 421 | 442 | <if test="scrIspass != null and scrIspass ==2"> |
| 422 | 443 | and( |
| 423 | 444 | oae_left =-1 |
| 424 | 445 | and aabr_left = -1 |
| 446 | + and abr_left = -1 | |
| 425 | 447 | ) |
| 426 | 448 | </if> |
| 427 | 449 | <if test="scrIspass == null"> |
| 428 | 450 | and( |
| 429 | 451 | oae_left is not null |
| 430 | 452 | or aabr_left is not null |
| 453 | + or abr_left is not null | |
| 431 | 454 | ) |
| 432 | 455 | </if> |
| 433 | 456 | </if> |
| 434 | 457 | |
| 435 | 458 | |
| ... | ... | @@ -437,18 +460,21 @@ |
| 437 | 460 | and( |
| 438 | 461 | oae_right =1 |
| 439 | 462 | and aabr_right = 1 |
| 463 | + and abr_right = 1 | |
| 440 | 464 | ) |
| 441 | 465 | </if> |
| 442 | 466 | <if test="scrIspass != null and scrIspass ==2"> |
| 443 | 467 | and( |
| 444 | 468 | oae_right =-1 |
| 445 | 469 | and aabr_right = -1 |
| 470 | + and abr_right = -1 | |
| 446 | 471 | ) |
| 447 | 472 | </if> |
| 448 | 473 | <if test="scrIspass == null"> |
| 449 | 474 | and( |
| 450 | 475 | oae_right is not null |
| 451 | 476 | or aabr_right is not null |
| 477 | + or abr_right is not null | |
| 452 | 478 | ) |
| 453 | 479 | </if> |
| 454 | 480 |