Commit c8c258763ebdae9cbe286f93b5329231bf72bf90
1 parent
e32af0fc92
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 11 additions and 9 deletions
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
c8c2587
| ... | ... | @@ -669,21 +669,23 @@ |
| 669 | 669 | /*if(null!=c1){ |
| 670 | 670 | return new MongoCondition(condition.getCriteria().andOperator(new Criteria[]{c1})).toMongoQuery(); |
| 671 | 671 | }*/ |
| 672 | - /*Criteria c = null; | |
| 672 | + /**/ | |
| 673 | +// Criteria c = null; | |
| 673 | 674 | if (null != lastMensesStart) { |
| 674 | - c = Criteria.where("lastMenses").gte(lastMensesStart); | |
| 675 | - isAddStart = Boolean.TRUE; | |
| 675 | + if(null!=c1){ | |
| 676 | + c1 = c1.where("lastMenses").gte(lastMensesStart); | |
| 677 | + }else{ | |
| 678 | + c1 = Criteria.where("lastMenses").gte(lastMensesStart); | |
| 679 | + } | |
| 676 | 680 | } |
| 677 | 681 | if (null != lastMensesEnd) { |
| 678 | - if (isAddStart) { | |
| 679 | - c = c.lte(lastMensesEnd); | |
| 682 | + if (c1!=null) { | |
| 683 | + c1 = c1.lte(lastMensesEnd); | |
| 680 | 684 | } else { |
| 681 | - c = Criteria.where("lastMenses").lte(lastMensesEnd); | |
| 685 | + c1 = Criteria.where("lastMenses").lte(lastMensesEnd); | |
| 682 | 686 | } |
| 683 | 687 | } |
| 684 | - if (null != c) { | |
| 685 | - condition.andCondition(new MongoCondition(c)); | |
| 686 | - }*/ | |
| 688 | + | |
| 687 | 689 | |
| 688 | 690 | if (null != dueDateStart) { |
| 689 | 691 | if(null!=c1){ |