Commit ed46801a558a8ee7a728c771fdcc4c3bc488c0e2
1 parent
c3b571f302
Exists in
master
and in
6 other branches
最后诊断多选
Showing 1 changed file with 11 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
ed46801
| ... | ... | @@ -133,10 +133,18 @@ |
| 133 | 133 | query.addCriteria(Criteria.where("formData.TBSflbz").is(Integer.parseInt(tBSflbz))); |
| 134 | 134 | } |
| 135 | 135 | String lstZD = param.getLstZD();//最后诊断异常项 |
| 136 | - if (StringUtils.isNotEmpty(lstZD)) { | |
| 137 | - query.addCriteria(Criteria.where("formData.lstZD") | |
| 138 | - .elemMatch(Criteria.where("$eq").is(Integer.parseInt(lstZD)))); | |
| 136 | + if(StringUtils.isNotEmpty(hospitalId)&&"2100001605".equals(hospitalId)) {//隆化需求(前端存的数据格式是数组true和false) | |
| 137 | + if (StringUtils.isNotEmpty(lstZD)) { | |
| 138 | + //匹配下标,formData.lstZD.点后面是下标 | |
| 139 | + query.addCriteria(Criteria.where("formData.lstZD."+lstZD).is(true)); | |
| 140 | + } | |
| 141 | + }else { | |
| 142 | + if (StringUtils.isNotEmpty(lstZD)) { | |
| 143 | + query.addCriteria(Criteria.where("formData.lstZD") | |
| 144 | + .elemMatch(Criteria.where("$eq").is(Integer.parseInt(lstZD)))); | |
| 145 | + } | |
| 139 | 146 | } |
| 147 | + | |
| 140 | 148 | if (org.apache.commons.lang.StringUtils.isNotEmpty(param.getCheckDate())) { |
| 141 | 149 | String[] arrs = param.getCheckDate().split(" - "); |
| 142 | 150 | query.addCriteria(Criteria.where("created").gte(DateUtil.parseYMD(arrs[0])) |