Commit 9deefe85cfd9718c0dec34f56010f55fd0e1dc0b
1 parent
043e92c9b4
Exists in
master
and in
6 other branches
隆化两癌-宫颈癌查询列表bug
Showing 1 changed file with 12 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
9deefe8
... | ... | @@ -116,10 +116,18 @@ |
116 | 116 | |
117 | 117 | /*20201021 wtt 陵城需求 start */ |
118 | 118 | String fklcjczd = param.getFklcjczd();//妇科检查临床诊断异常项 |
119 | - if (StringUtils.isNotEmpty(fklcjczd)) { | |
120 | - query.addCriteria(Criteria.where("formData.fklcjczd") | |
121 | - .elemMatch(Criteria.where("$eq").is(Integer.parseInt(fklcjczd)))); | |
119 | + if(StringUtils.isNotEmpty(hospitalId)&&"2100001605".equals(hospitalId)){//隆化需求(前端存的数据格式是数组true和false) | |
120 | + if (StringUtils.isNotEmpty(fklcjczd)) { | |
121 | + //匹配下标,formData.fklcjczd.点后面是下标 | |
122 | + query.addCriteria(Criteria.where("formData.fklcjczd."+fklcjczd).is(true)); | |
123 | + } | |
124 | + }else { | |
125 | + if (StringUtils.isNotEmpty(fklcjczd)) { | |
126 | + query.addCriteria(Criteria.where("formData.fklcjczd") | |
127 | + .elemMatch(Criteria.where("$eq").is(Integer.parseInt(fklcjczd)))); | |
128 | + } | |
122 | 129 | } |
130 | + | |
123 | 131 | String tBSflbz = param.gettBSflbz();//TBS分类报告结果 |
124 | 132 | if (StringUtils.isNotEmpty(tBSflbz)) { |
125 | 133 | query.addCriteria(Criteria.where("formData.TBSflbz").is(Integer.parseInt(tBSflbz))); |
... | ... | @@ -154,6 +162,7 @@ |
154 | 162 | } |
155 | 163 | } |
156 | 164 | query.with(new Sort(Sort.Direction.DESC, "created")); |
165 | + System.out.println(query.toString()); | |
157 | 166 | long count = mongoTemplate.count(query, CervicalCancerModel.class); |
158 | 167 | param.mysqlBuild((int) count); |
159 | 168 | query.skip(param.getOffset()).limit(param.getLimit()); |