Commit d51a6249320047720b2b6cc3db76e356bc67c476
1 parent
199f10f63d
Exists in
master
and in
6 other branches
两癌
Showing 1 changed file with 16 additions and 64 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
d51a624
... | ... | @@ -1176,21 +1176,11 @@ |
1176 | 1176 | { |
1177 | 1177 | Criteria c = Criteria.where("areaId").is(organization.getAreaId()); |
1178 | 1178 | query.addCriteria(c); |
1179 | - if (request.getPosition() != null) | |
1180 | - { | |
1181 | - Criteria c1 = Criteria.where("position").is(request.getPosition()); | |
1182 | - query.addCriteria(c1); | |
1183 | - } | |
1184 | 1179 | } |
1185 | 1180 | else if (request.getPosition() == 3) |
1186 | 1181 | { |
1187 | 1182 | Criteria c = Criteria.where("cityId").is(organization.getCityId()); |
1188 | 1183 | query.addCriteria(c); |
1189 | - if (request.getPosition() != null) | |
1190 | - { | |
1191 | - Criteria c1 = Criteria.where("position").is(request.getPosition()); | |
1192 | - query.addCriteria(c1); | |
1193 | - } | |
1194 | 1184 | } |
1195 | 1185 | |
1196 | 1186 | if (StringUtils.isNotEmpty(request.getOptDate())) { |
1197 | 1187 | |
... | ... | @@ -1209,12 +1199,14 @@ |
1209 | 1199 | query.addCriteria(Criteria.where("examineDate").gte(start).lte(end)); |
1210 | 1200 | } |
1211 | 1201 | |
1202 | + if (request.getStartYear() != null && request.getEndYear() != null && request.getStartQuarter() != null && request.getEndquarter() != null) { | |
1203 | + Integer yearQuarterStart = Integer.parseInt(String.valueOf(request.getStartYear())+request.getStartQuarter()); | |
1204 | + Integer yearQuarterEnd = Integer.parseInt(String.valueOf(request.getEndYear())+request.getEndquarter()); | |
1205 | + query.addCriteria(Criteria.where("yearQuarter").gte(yearQuarterStart).lte(yearQuarterEnd)); | |
1206 | + } | |
1212 | 1207 | if (request.getStartYear() != null && request.getEndYear() != null) { |
1213 | 1208 | query.addCriteria(Criteria.where("year").gte(request.getStartYear()).lte(request.getEndYear())); |
1214 | 1209 | } |
1215 | - if (request.getStartQuarter() != null && request.getEndquarter() != null) { | |
1216 | - query.addCriteria(Criteria.where("quarter").gte(request.getStartQuarter()).lte(request.getEndquarter())); | |
1217 | - } | |
1218 | 1210 | if (StringUtils.isNotEmpty(request.getOptUser())) |
1219 | 1211 | { |
1220 | 1212 | Criteria c = Criteria.where("optUser").is(request.getOptUser()); |
1221 | 1213 | |
1222 | 1214 | |
1223 | 1215 | |
... | ... | @@ -1227,64 +1219,20 @@ |
1227 | 1219 | query.addCriteria(c); |
1228 | 1220 | } |
1229 | 1221 | |
1230 | - List <Map <String, Object>> datas = new ArrayList <>(); | |
1231 | 1222 | Criteria c = Criteria.where("type").is(request.getType()); |
1232 | 1223 | query.addCriteria(c); |
1233 | - List<CancerExamineModel> list = mongoTemplate.find(query, CancerExamineModel.class); | |
1224 | + Criteria c1 = Criteria.where("yn").is(YnEnums.YES.getId()); | |
1225 | + query.addCriteria(c1); | |
1234 | 1226 | |
1227 | + List <Map <String, Object>> datas = new ArrayList <>(); | |
1228 | + List<CancerExamineModel> list = mongoTemplate.find(query, CancerExamineModel.class); | |
1235 | 1229 | if (CollectionUtils.isNotEmpty(list)) |
1236 | 1230 | { |
1237 | 1231 | for (CancerExamineModel model : list) |
1238 | 1232 | { |
1239 | - if (model.getType() == 1) | |
1240 | - { | |
1241 | - CervicalCancerListRequest cervicalCancerListRequest = new CervicalCancerListRequest(); | |
1242 | - cervicalCancerListRequest.setOrgProvinceId(model.getProvinceId()); | |
1243 | - cervicalCancerListRequest.setOrgCityId(model.getCityId()); | |
1244 | - cervicalCancerListRequest.setOrgAreaId(model.getAreaId()); | |
1245 | - cervicalCancerListRequest.setQuarter(model.getQuarter()); | |
1246 | - cervicalCancerListRequest.setYear(model.getYear()); | |
1247 | - BaseObjectResponse response1 = cervicalCancerService.queryCervicalCancerCount( cervicalCancerListRequest, userId); | |
1248 | - Object obj = response1.getData(); | |
1249 | - if (obj != null) | |
1250 | - { | |
1251 | - Map<String,Object> result = (Map<String,Object>)obj; | |
1252 | - Object obj1 = result.get("datas"); | |
1253 | - if (obj1 != null) | |
1254 | - { | |
1255 | - List<Map<String, Object>> data = (List <Map <String, Object>>)obj1; | |
1256 | - if(CollectionUtils.isNotEmpty(data)) | |
1257 | - { | |
1258 | - datas.addAll(data); | |
1259 | - } | |
1260 | - } | |
1261 | - } | |
1262 | - | |
1263 | - } | |
1264 | - else | |
1265 | - { | |
1266 | - CancerScreeningRequest cancerScreeningRequest = new CancerScreeningRequest(); | |
1267 | - cancerScreeningRequest.setOrgProvinceId(model.getProvinceId()); | |
1268 | - cancerScreeningRequest.setOrgCityId(model.getCityId()); | |
1269 | - cancerScreeningRequest.setOrgAreaId(model.getAreaId()); | |
1270 | - cancerScreeningRequest.setQuarter(model.getQuarter()); | |
1271 | - cancerScreeningRequest.setYear(model.getYear()); | |
1272 | - BaseObjectResponse response1 = queryCancerScreeningCount(cancerScreeningRequest,userId); | |
1273 | - Object obj = response1.getData(); | |
1274 | - if (obj != null) | |
1275 | - { | |
1276 | - Map<String,Object> result = (Map<String,Object>)obj; | |
1277 | - Object obj1 = result.get("datas"); | |
1278 | - if (obj1 != null) | |
1279 | - { | |
1280 | - List<Map<String, Object>> data = (List <Map <String, Object>>)obj1; | |
1281 | - if(CollectionUtils.isNotEmpty(data)) | |
1282 | - { | |
1283 | - datas.addAll(data); | |
1284 | - } | |
1285 | - } | |
1286 | - } | |
1287 | - } | |
1233 | + Map<String, String> data = model.getData(); | |
1234 | + data.put("areaName",CommonsHelper.getName1(model.getAreaId(),basicConfigService)); | |
1235 | + datas.add((Map)data); | |
1288 | 1236 | } |
1289 | 1237 | } |
1290 | 1238 | try { |
... | ... | @@ -1293,6 +1241,7 @@ |
1293 | 1241 | if (request.getType() == 1) |
1294 | 1242 | { |
1295 | 1243 | cnames.put("areaName","项目县(区)"); |
1244 | + cnames.put("totalNum","本地区35-64岁妇女数"); | |
1296 | 1245 | cnames.put("ndrws","年度任务数"); |
1297 | 1246 | cnames.put("jcrs","检查人数"); |
1298 | 1247 | cnames.put("jwjcrs","检查人数中既往接受过宫颈癌"); |
1299 | 1248 | |
... | ... | @@ -1335,10 +1284,12 @@ |
1335 | 1284 | cnames.put("zzblqt","其他恶性肿瘤"); |
1336 | 1285 | cnames.put("sfqk","随访人数"); |
1337 | 1286 | cnames.put("bjbb","治疗人数"); |
1287 | + cnames.put("remark","备注"); | |
1338 | 1288 | } |
1339 | 1289 | else |
1340 | 1290 | { |
1341 | 1291 | cnames.put("areaName","项目县(区)"); |
1292 | + cnames.put("totalNum","本地区35-64岁妇女数"); | |
1342 | 1293 | cnames.put("ndrws","年度任务数"); |
1343 | 1294 | cnames.put("jcrs","检查人数"); |
1344 | 1295 | cnames.put("jwjcrs","检查人数中既往接受过乳腺癌检查的人数"); |
... | ... | @@ -1377,6 +1328,7 @@ |
1377 | 1328 | cnames.put("tnm3qys","III期及以上"); |
1378 | 1329 | cnames.put("sfqksfrs","随访人数"); |
1379 | 1330 | cnames.put("sfqkzlrs","治疗人数"); |
1331 | + cnames.put("remark","备注"); | |
1380 | 1332 | } |
1381 | 1333 | response.setContentType("application/octet-stream"); |
1382 | 1334 | response.setCharacterEncoding("UTF-8"); |