Commit 5f56b8b96191cb68571d2dd23e50c84bfb84d620
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
View file @
5f56b8b
| ... | ... | @@ -361,7 +361,8 @@ |
| 361 | 361 | APPLY_DOCTOR AS applyDoctor, |
| 362 | 362 | APPLY_DEPT AS applyDept, |
| 363 | 363 | HOSPITAL_ID AS hospitalId, |
| 364 | - CHECKER AS checker | |
| 364 | + CHECKER AS checker, | |
| 365 | + PHONE AS phone | |
| 365 | 366 | FROM LIS_REPORT_TBL |
| 366 | 367 | <include refid="LisCondition"/> |
| 367 | 368 | AND PHONE IS NOT NULL AND VCCARDNO IS NOT NULL |
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
5f56b8b
| ... | ... | @@ -381,6 +381,19 @@ |
| 381 | 381 | * 高危因素 |
| 382 | 382 | */ |
| 383 | 383 | private String rFactor; |
| 384 | + /** | |
| 385 | + * 高危因素集合 | |
| 386 | + */ | |
| 387 | + private List<String> rFactorList; | |
| 388 | + | |
| 389 | + public List<String> getrFactorList() { | |
| 390 | + return rFactorList; | |
| 391 | + } | |
| 392 | + | |
| 393 | + public void setrFactorList(List<String> rFactorList) { | |
| 394 | + this.rFactorList = rFactorList; | |
| 395 | + } | |
| 396 | + | |
| 384 | 397 | private boolean norFactor; |
| 385 | 398 | |
| 386 | 399 | |
| ... | ... | @@ -1179,6 +1192,8 @@ |
| 1179 | 1192 | }else { |
| 1180 | 1193 | c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria(); |
| 1181 | 1194 | } |
| 1195 | + }else if(null!=rFactorList){ | |
| 1196 | + condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); | |
| 1182 | 1197 | } |
| 1183 | 1198 | if (-1 != yn) { |
| 1184 | 1199 | condition = condition.and("yn", yn, MongoOper.IS); |