Commit 7efe38fa7d28adc03a0933edcaaf68b81c58bf39
1 parent
69a09d0aa7
Exists in
master
and in
2 other branches
update
Showing 2 changed files with 7 additions and 5 deletions
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
7efe38f
| ... | ... | @@ -694,9 +694,6 @@ |
| 694 | 694 | condition = condition.and("isHistory", false, MongoOper.EXISTS); |
| 695 | 695 | } |
| 696 | 696 | |
| 697 | - if (null != isDeliver) { | |
| 698 | - condition = condition.and("isDeliver", isDeliver, MongoOper.IS); | |
| 699 | - } | |
| 700 | 697 | if (null != isComplete) { |
| 701 | 698 | condition = condition.and("isComplete", isComplete, MongoOper.IS); |
| 702 | 699 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
7efe38f
| ... | ... | @@ -149,7 +149,13 @@ |
| 149 | 149 | patientsQuery.setBookbuildingDateEnd(checkEnd); |
| 150 | 150 | patientsQuery.setFmDateStart(fmStart); |
| 151 | 151 | patientsQuery.setFmDateEnd(fmEnd); |
| 152 | - patientsQuery.setTypeList(Arrays.asList(1, 3)); | |
| 152 | + if (StringUtils.isNotEmpty(isDeliver)){ | |
| 153 | + patientsQuery.setTypeList(isDeliver.equals("0") ? Arrays.asList(3) : Arrays.asList(1)); | |
| 154 | + }else | |
| 155 | + { | |
| 156 | + patientsQuery.setTypeList(Arrays.asList(1, 3)); | |
| 157 | + } | |
| 158 | + | |
| 153 | 159 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 154 | 160 | patientsQuery.setNeed("need"); |
| 155 | 161 | patientsQuery.setLimit(limit); |
| ... | ... | @@ -165,7 +171,6 @@ |
| 165 | 171 | |
| 166 | 172 | patientsQuery.setQueryNo(key); |
| 167 | 173 | patientsQuery.setFollowupStatus(followupStatus); |
| 168 | - patientsQuery.setIsDeliver(isDeliver); | |
| 169 | 174 | //排查儿童建档时的零时建档 |
| 170 | 175 | patientsQuery.setBuildType(1); |
| 171 | 176 |