Commit d06e3cc32bc741e8f23856c6b7bfe41849dee0a7
1 parent
c8c258763e
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 6 additions and 6 deletions
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
d06e3cc
| ... | ... | @@ -617,7 +617,7 @@ |
| 617 | 617 | |
| 618 | 618 | if (null != lastRhTimeStart) { |
| 619 | 619 | if(null!=c1){ |
| 620 | - c1 = c1.where("lastRhTime").gte(lastRhTimeStart); | |
| 620 | + c1 = c1.and("lastRhTime").gte(lastRhTimeStart); | |
| 621 | 621 | }else { |
| 622 | 622 | c1 = Criteria.where("lastRhTime").gte(lastRhTimeStart); |
| 623 | 623 | } |
| ... | ... | @@ -632,7 +632,7 @@ |
| 632 | 632 | if (null != hScoreStart) { |
| 633 | 633 | if (null != hScoreStart) { |
| 634 | 634 | if(null!=c1){ |
| 635 | - c1 = c1.where("riskScore").gte(hScoreStart); | |
| 635 | + c1 = c1.and("riskScore").gte(hScoreStart); | |
| 636 | 636 | }else{ |
| 637 | 637 | c1 = Criteria.where("riskScore").gte(hScoreStart); |
| 638 | 638 | } |
| ... | ... | @@ -650,7 +650,7 @@ |
| 650 | 650 | |
| 651 | 651 | if (null != bookbuildingDateStart) { |
| 652 | 652 | if(c1!=null){ |
| 653 | - c1 = c1.where("bookbuildingDate").gte(bookbuildingDateStart); | |
| 653 | + c1 = c1.and("bookbuildingDate").gte(bookbuildingDateStart); | |
| 654 | 654 | }else{ |
| 655 | 655 | c1 = Criteria.where("bookbuildingDate").gte(bookbuildingDateStart); |
| 656 | 656 | } |
| ... | ... | @@ -673,7 +673,7 @@ |
| 673 | 673 | // Criteria c = null; |
| 674 | 674 | if (null != lastMensesStart) { |
| 675 | 675 | if(null!=c1){ |
| 676 | - c1 = c1.where("lastMenses").gte(lastMensesStart); | |
| 676 | + c1 = c1.and("lastMenses").gte(lastMensesStart); | |
| 677 | 677 | }else{ |
| 678 | 678 | c1 = Criteria.where("lastMenses").gte(lastMensesStart); |
| 679 | 679 | } |
| ... | ... | @@ -689,7 +689,7 @@ |
| 689 | 689 | |
| 690 | 690 | if (null != dueDateStart) { |
| 691 | 691 | if(null!=c1){ |
| 692 | - c1 = c1.where("dueDate").gte(dueDateStart); | |
| 692 | + c1 = c1.and("dueDate").gte(dueDateStart); | |
| 693 | 693 | }else{ |
| 694 | 694 | c1 = Criteria.where("dueDate").gte(dueDateStart); |
| 695 | 695 | } |
| ... | ... | @@ -703,7 +703,7 @@ |
| 703 | 703 | } |
| 704 | 704 | if (null != birthStart) { |
| 705 | 705 | if (null!=c1) { |
| 706 | - c1 = c1.where("birth").gte(birthStart); | |
| 706 | + c1 = c1.and("birth").gte(birthStart); | |
| 707 | 707 | }else { |
| 708 | 708 | c1 = Criteria.where("birth").gte(birthStart); |
| 709 | 709 | } |