Commit 3905412ad6da8b800eb4e5480729dd56af5489f5
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
3905412
... | ... | @@ -194,10 +194,10 @@ |
194 | 194 | |
195 | 195 | //建立儿童隐藏档案 |
196 | 196 | if (babyModel != null) { |
197 | - if(babyModel.getYn()!=YnEnums.YES.getId()){ | |
197 | + if (babyModel.getYn() != YnEnums.YES.getId()) { | |
198 | 198 | babyModel.setYn(YnEnums.YES.getId()); |
199 | 199 | babyModel.setModified(new Date()); |
200 | - babyModel.setEnable("0"); | |
200 | + babyModel.setEnable("1"); | |
201 | 201 | babyService.updateOneBaby(babyModel, babyId); |
202 | 202 | } |
203 | 203 | } |
... | ... | @@ -208,7 +208,7 @@ |
208 | 208 | List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); |
209 | 209 | if (CollectionUtils.isNotEmpty(ears)) { |
210 | 210 | BabyPatientExtendEar ear = ears.get(0); |
211 | - if(ear.getStatus()!=YnEnums.YES.getId()){ | |
211 | + if (ear.getStatus() != YnEnums.YES.getId()) { | |
212 | 212 | ear.setStatus(YnEnums.YES.getId()); |
213 | 213 | babyPatientExtendEarService.updateBabyPatientExtendEar(ear); |
214 | 214 | } |
215 | 215 | |
216 | 216 | |
217 | 217 | |
218 | 218 | |
219 | 219 | |
220 | 220 | |
221 | 221 | |
222 | 222 | |
223 | 223 | |
224 | 224 | |
225 | 225 | |
226 | 226 | |
227 | 227 | |
228 | 228 | |
229 | 229 | |
... | ... | @@ -228,78 +228,83 @@ |
228 | 228 | BabyModel babyModel = babyService.getOneBabyById(babyId); |
229 | 229 | |
230 | 230 | //隐藏档案儿童Id |
231 | - String newBabyId = ""; | |
231 | + String newBabyId = babyId; | |
232 | 232 | //建立儿童隐藏档案 |
233 | 233 | if (babyModel != null) { |
234 | - //如果相同,不建立 | |
235 | - if (!babyModel.getHospitalId().equals(hospitalId)) { | |
234 | + BabyModelQuery babyQuery = new BabyModelQuery(); | |
235 | + babyQuery.setHospitalId(hospitalId); | |
236 | + babyQuery.setPid(babyModel.getPid()); | |
237 | + | |
238 | + List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyQuery); | |
239 | + if (CollectionUtils.isEmpty(babyModels)) { | |
236 | 240 | babyModel.setHospitalId(hospitalId); |
237 | - babyModel.setYn(YnEnums.NO.getId()); | |
241 | + babyModel.setYn(YnEnums.YES.getId()); | |
238 | 242 | babyModel.setCreated(new Date()); |
239 | 243 | babyModel.setId(null); |
240 | - babyModel.setEnable("1"); | |
244 | + babyModel.setEnable("0"); | |
245 | + babyModel.setBuildType(3); | |
241 | 246 | babyModel.setBuildDoctor(null); |
242 | 247 | babyModel.setBuildDate(new Date()); |
243 | 248 | newBabyId = babyService.addOneBaby(babyModel).getId(); |
244 | - } else { | |
245 | - newBabyId = babyModel.getId(); | |
246 | 249 | } |
247 | - } | |
248 | 250 | |
249 | - BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); | |
250 | - earQuery.setBabyPatientId(babyId); | |
251 | + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); | |
252 | + earQuery.setBabyPatientId(babyId); | |
251 | 253 | |
252 | - List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); | |
253 | - if (CollectionUtils.isNotEmpty(ears)) { | |
254 | - BabyPatientExtendEar ear = ears.get(0); | |
255 | - //如果相同,则已经存在,不处理 | |
256 | - if (!newBabyId.equals(babyId)) { | |
257 | - ear.setId(UUID.randomUUID().toString().replace("-", "")); | |
258 | - ear.setBabyPatientId(newBabyId); | |
259 | - ear.setStatus(YnEnums.NO.getId()); | |
260 | - babyPatientExtendEarService.addBabyPatientExtendEar(ear); | |
254 | + List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); | |
255 | + if (CollectionUtils.isNotEmpty(ears)) { | |
256 | + BabyPatientExtendEar ear = ears.get(0); | |
257 | + //如果相同,则已经存在,不处理 | |
258 | + if (!newBabyId.equals(babyId)) { | |
259 | + ear.setId(UUID.randomUUID().toString().replace("-", "")); | |
260 | + ear.setBabyPatientId(newBabyId); | |
261 | + ear.setStatus(YnEnums.NO.getId()); | |
262 | + babyPatientExtendEarService.addBabyPatientExtendEar(ear); | |
261 | 263 | |
262 | - //儿童基本信息 | |
263 | - BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery(); | |
264 | - earBirthQuery.setBabyPatientId(babyId); | |
264 | + //儿童基本信息 | |
265 | + BabyPatientExtendEarBirthQuery earBirthQuery = new BabyPatientExtendEarBirthQuery(); | |
266 | + earBirthQuery.setBabyPatientId(babyId); | |
265 | 267 | |
266 | - List<BabyPatientExtendEarBirth> earBirths = babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(earBirthQuery); | |
267 | - if (CollectionUtils.isNotEmpty(earBirths)) { | |
268 | - BabyPatientExtendEarBirth earBirth = earBirths.get(0); | |
269 | - earBirth.setId(UUID.randomUUID().toString().replace("-", "")); | |
270 | - earBirth.setBabyPatientId(newBabyId); | |
271 | - earBirth.setBabyEarId(ear.getId()); | |
272 | - babyPatientExtendEarBirthService.addBabyPatientExtendEarBirth(earBirth); | |
273 | - } | |
268 | + List<BabyPatientExtendEarBirth> earBirths = babyPatientExtendEarBirthService.queryBabyPatientExtendEarBirth(earBirthQuery); | |
269 | + if (CollectionUtils.isNotEmpty(earBirths)) { | |
270 | + BabyPatientExtendEarBirth earBirth = earBirths.get(0); | |
271 | + earBirth.setId(UUID.randomUUID().toString().replace("-", "")); | |
272 | + earBirth.setBabyPatientId(newBabyId); | |
273 | + earBirth.setBabyEarId(ear.getId()); | |
274 | + babyPatientExtendEarBirthService.addBabyPatientExtendEarBirth(earBirth); | |
275 | + } | |
274 | 276 | |
275 | - //儿童家庭信息 | |
276 | - BabyPatientExtendEarFamilyQuery familyQuery = new BabyPatientExtendEarFamilyQuery(); | |
277 | - familyQuery.setBabyPatientId(babyId); | |
277 | + //儿童家庭信息 | |
278 | + BabyPatientExtendEarFamilyQuery familyQuery = new BabyPatientExtendEarFamilyQuery(); | |
279 | + familyQuery.setBabyPatientId(babyId); | |
278 | 280 | |
279 | - List<BabyPatientExtendEarFamily> families = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(familyQuery); | |
280 | - if (CollectionUtils.isNotEmpty(families)) { | |
281 | - BabyPatientExtendEarFamily family = families.get(0); | |
282 | - family.setId(UUID.randomUUID().toString().replace("-", "")); | |
283 | - family.setBabyPatientId(newBabyId); | |
284 | - family.setBabyEarId(ear.getId()); | |
285 | - babyPatientExtendEarFamilyService.addBabyPatientExtendEarFamily(family); | |
286 | - } | |
281 | + List<BabyPatientExtendEarFamily> families = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(familyQuery); | |
282 | + if (CollectionUtils.isNotEmpty(families)) { | |
283 | + BabyPatientExtendEarFamily family = families.get(0); | |
284 | + family.setId(UUID.randomUUID().toString().replace("-", "")); | |
285 | + family.setBabyPatientId(newBabyId); | |
286 | + family.setBabyEarId(ear.getId()); | |
287 | + babyPatientExtendEarFamilyService.addBabyPatientExtendEarFamily(family); | |
288 | + } | |
287 | 289 | |
288 | - //儿童家庭信息 | |
289 | - BabyPatientExtendEarMotherQuery motherQuery = new BabyPatientExtendEarMotherQuery(); | |
290 | - motherQuery.setBabyPatientId(babyId); | |
290 | + //儿童家庭信息 | |
291 | + BabyPatientExtendEarMotherQuery motherQuery = new BabyPatientExtendEarMotherQuery(); | |
292 | + motherQuery.setBabyPatientId(babyId); | |
291 | 293 | |
292 | - List<BabyPatientExtendEarMother> mothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(motherQuery); | |
293 | - if (CollectionUtils.isNotEmpty(mothers)) { | |
294 | - BabyPatientExtendEarMother mother = mothers.get(0); | |
295 | - mother.setId(UUID.randomUUID().toString().replace("-", "")); | |
296 | - mother.setBabyPatientId(newBabyId); | |
297 | - mother.setBabyEarId(ear.getId()); | |
298 | - babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(mother); | |
294 | + List<BabyPatientExtendEarMother> mothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(motherQuery); | |
295 | + if (CollectionUtils.isNotEmpty(mothers)) { | |
296 | + BabyPatientExtendEarMother mother = mothers.get(0); | |
297 | + mother.setId(UUID.randomUUID().toString().replace("-", "")); | |
298 | + mother.setBabyPatientId(newBabyId); | |
299 | + mother.setBabyEarId(ear.getId()); | |
300 | + babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(mother); | |
301 | + } | |
299 | 302 | } |
300 | 303 | } |
304 | + return true; | |
305 | + } else { | |
306 | + return false; | |
301 | 307 | } |
302 | - return true; | |
303 | 308 | } |
304 | 309 | |
305 | 310 | |
... | ... | @@ -497,7 +502,7 @@ |
497 | 502 | List<BabyPatientExtendEarMother> babyPatientExtendEarMothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(babyPatientExtendEarMotherQuery); |
498 | 503 | if (CollectionUtils.isNotEmpty(babyPatientExtendEarMothers)) { |
499 | 504 | babyEarResult.setPatientExtendEarMother(babyPatientExtendEarMothers.get(0)); |
500 | - }else{ | |
505 | + } else { | |
501 | 506 | BabyPatientExtendEarMother babyPatientExtendEarMother = new BabyPatientExtendEarMother(); |
502 | 507 | babyPatientExtendEarMother.setAbortionHistoryType("{}"); |
503 | 508 | babyPatientExtendEarMother.setViralInfectionHistoryType("{}"); |
... | ... | @@ -519,7 +524,7 @@ |
519 | 524 | List<BabyPatientExtendEarFamily> babyPatientExtendEarFamilies = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(babyPatientExtendEarFamilyQuery); |
520 | 525 | if (CollectionUtils.isNotEmpty(babyPatientExtendEarFamilies)) { |
521 | 526 | babyEarResult.setPatientExtendEarFamily(babyPatientExtendEarFamilies.get(0)); |
522 | - }else{ | |
527 | + } else { | |
523 | 528 | BabyPatientExtendEarFamily family = new BabyPatientExtendEarFamily(); |
524 | 529 | family.setBadLifeHistory("{}"); |
525 | 530 | family.setDeatRelationship("{}"); |
... | ... | @@ -532,7 +537,7 @@ |
532 | 537 | |
533 | 538 | if (CollectionUtils.isNotEmpty(babyPatientExtendEarBirths)) { |
534 | 539 | babyEarResult.setBabyBirth(babyPatientExtendEarBirths.get(0)); |
535 | - }else{ | |
540 | + } else { | |
536 | 541 | babyEarResult.setBabyBirth(new BabyPatientExtendEarBirth()); |
537 | 542 | } |
538 | 543 | objectResponse.setData(babyEarResult); |
539 | 544 | |
540 | 545 | |
541 | 546 | |
542 | 547 | |
543 | 548 | |
544 | 549 | |
... | ... | @@ -1280,23 +1285,24 @@ |
1280 | 1285 | |
1281 | 1286 | /** |
1282 | 1287 | * 获取当前医院机构里医院列表 |
1288 | + * | |
1283 | 1289 | * @param hospitalId |
1284 | 1290 | * @return |
1285 | 1291 | */ |
1286 | - public List<String> getOrgHospitalIds(String hospitalId){ | |
1292 | + public List<String> getOrgHospitalIds(String hospitalId) { | |
1287 | 1293 | List<String> hospitalIds = new ArrayList<>(); |
1288 | - String groupId= groupsFacade.findItemIdByCurrentUserId(hospitalId); | |
1289 | - if(org.apache.commons.lang.StringUtils.isNotEmpty(groupId)) { | |
1294 | + String groupId = groupsFacade.findItemIdByCurrentUserId(hospitalId); | |
1295 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupId)) { | |
1290 | 1296 | OrganizationGroupsItems groupsItems = groupsFacade.findById(groupId); |
1291 | - if (groupsItems!=null) { | |
1297 | + if (groupsItems != null) { | |
1292 | 1298 | List<Integer> hIds = groupsItems.gethId(); |
1293 | - for(Integer hd:hIds){ | |
1299 | + for (Integer hd : hIds) { | |
1294 | 1300 | hospitalIds.add(String.valueOf(hd)); |
1295 | 1301 | } |
1296 | - }else{ | |
1302 | + } else { | |
1297 | 1303 | hospitalIds.add(hospitalId); |
1298 | 1304 | } |
1299 | - }else{ | |
1305 | + } else { | |
1300 | 1306 | hospitalIds.add(hospitalId); |
1301 | 1307 | } |
1302 | 1308 | |
... | ... | @@ -1309,7 +1315,7 @@ |
1309 | 1315 | * @param babyId 听力筛查id |
1310 | 1316 | * @return |
1311 | 1317 | */ |
1312 | - public BaseResponse findBabyEarSrc(String babyId,Integer userId) { | |
1318 | + public BaseResponse findBabyEarSrc(String babyId, Integer userId) { | |
1313 | 1319 | BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); |
1314 | 1320 | query.setBabyId(babyId); |
1315 | 1321 | query.setStatus(0); |
... | ... | @@ -1317,7 +1323,7 @@ |
1317 | 1323 | //当前登录人医院Id |
1318 | 1324 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
1319 | 1325 | List hospitalIds = getOrgHospitalIds(hospitalId); |
1320 | - String[] checkHospitalIds = (String[])hospitalIds.toArray(new String[hospitalIds.size()]); | |
1326 | + String[] checkHospitalIds = (String[]) hospitalIds.toArray(new String[hospitalIds.size()]); | |
1321 | 1327 | query.setCheckHospitalIds(checkHospitalIds); |
1322 | 1328 | List<BabyPatientExtendEarScreen> babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryBabyPatientExtendEarScreen(query); |
1323 | 1329 | |
1324 | 1330 | |
1325 | 1331 | |
1326 | 1332 | |
1327 | 1333 | |
1328 | 1334 | |
1329 | 1335 | |
1330 | 1336 | |
1331 | 1337 | |
1332 | 1338 | |
1333 | 1339 | |
1334 | 1340 | |
1335 | 1341 | |
... | ... | @@ -1369,31 +1375,31 @@ |
1369 | 1375 | data.put("highRiskCauseStr", hfBuff.toString()); |
1370 | 1376 | data.put("highRiskCause", highArr); |
1371 | 1377 | } |
1372 | - data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft()==null?"":babyPatientExtendEarScreen.getOaeLeft()); | |
1378 | + data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft() == null ? "" : babyPatientExtendEarScreen.getOaeLeft()); | |
1373 | 1379 | data.put("oaeLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeLeft() == null ? 0 : babyPatientExtendEarScreen.getOaeLeft())); |
1374 | - data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight()==null?"":babyPatientExtendEarScreen.getOaeRight()); | |
1380 | + data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight() == null ? "" : babyPatientExtendEarScreen.getOaeRight()); | |
1375 | 1381 | data.put("oaeRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeRight() == null ? 0 : babyPatientExtendEarScreen.getOaeRight())); |
1376 | - data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft()==null?"":babyPatientExtendEarScreen.getAabrLeft()); | |
1382 | + data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft() == null ? "" : babyPatientExtendEarScreen.getAabrLeft()); | |
1377 | 1383 | data.put("aabrLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrLeft() == null ? 0 : babyPatientExtendEarScreen.getAabrLeft())); |
1378 | - data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight()==null?"":babyPatientExtendEarScreen.getAabrRight()); | |
1384 | + data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight() == null ? "" : babyPatientExtendEarScreen.getAabrRight()); | |
1379 | 1385 | data.put("aabrRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrRight() == null ? 0 : babyPatientExtendEarScreen.getAabrRight())); |
1380 | - data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() ==null?"":babyPatientExtendEarScreen.getGjb2Del35()); | |
1386 | + data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() == null ? "" : babyPatientExtendEarScreen.getGjb2Del35()); | |
1381 | 1387 | data.put("gjb2Del35Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del35())); |
1382 | - data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() ==null?"":babyPatientExtendEarScreen.getGjb2Del176()); | |
1388 | + data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() == null ? "" : babyPatientExtendEarScreen.getGjb2Del176()); | |
1383 | 1389 | data.put("gjb2Del176Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del176() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del176())); |
1384 | - data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235() ==null?"":babyPatientExtendEarScreen.getGjb2Del235()); | |
1390 | + data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235() == null ? "" : babyPatientExtendEarScreen.getGjb2Del235()); | |
1385 | 1391 | data.put("gjb2Del235Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del235() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del235())); |
1386 | - data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299()==null?"":babyPatientExtendEarScreen.getGjb2Del299()); | |
1392 | + data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299() == null ? "" : babyPatientExtendEarScreen.getGjb2Del299()); | |
1387 | 1393 | data.put("gjb2Del299Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del299() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del299())); |
1388 | - data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a4538()); | |
1394 | + data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538() == null ? "" : babyPatientExtendEarScreen.getGjb3Slc26a4538()); | |
1389 | 1395 | data.put("gjb3Slc26a4538Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4538() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a4538())); |
1390 | - data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a42168()); | |
1396 | + data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168() == null ? "" : babyPatientExtendEarScreen.getGjb3Slc26a42168()); | |
1391 | 1397 | data.put("gjb3Slc26a42168Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a42168() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a42168())); |
1392 | - data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7()); | |
1398 | + data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() == null ? "" : babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7()); | |
1393 | 1399 | data.put("gjb3Slc26a4Ivs7Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7())); |
1394 | - data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494()==null?"":babyPatientExtendEarScreen.getRrna1494()); | |
1400 | + data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494() == null ? "" : babyPatientExtendEarScreen.getRrna1494()); | |
1395 | 1401 | data.put("rrna1494Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1494() == null ? 0 : babyPatientExtendEarScreen.getRrna1494())); |
1396 | - data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() ==null?"":babyPatientExtendEarScreen.getRrna1555()); | |
1402 | + data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() == null ? "" : babyPatientExtendEarScreen.getRrna1555()); | |
1397 | 1403 | data.put("rrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1555() == null ? 0 : babyPatientExtendEarScreen.getRrna1555())); |
1398 | 1404 | data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType());//1=复筛 2=诊断 |
1399 | 1405 | data.put("processOptionTypeStr", babyPatientExtendEarScreen.getProcessOptionType() == null ? "初诊" : babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断 |
... | ... | @@ -1520,7 +1526,7 @@ |
1520 | 1526 | * @param earScreenListRequest |
1521 | 1527 | * @return |
1522 | 1528 | */ |
1523 | - public BaseResponse findListBabyEarSrc(EarScreenListRequest earScreenListRequest,Integer userId) { | |
1529 | + public BaseResponse findListBabyEarSrc(EarScreenListRequest earScreenListRequest, Integer userId) { | |
1524 | 1530 | BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); |
1525 | 1531 | screenQuery.setSrcStartTime(earScreenListRequest.getSrcStartTime()); |
1526 | 1532 | screenQuery.setSrcEndTime(earScreenListRequest.getSrcEndTime()); |
... | ... | @@ -1534,7 +1540,7 @@ |
1534 | 1540 | //当前登录人医院Id |
1535 | 1541 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
1536 | 1542 | List hospitalIds = getOrgHospitalIds(hospitalId); |
1537 | - String[] checkHospitalIds = (String[])hospitalIds.toArray(new String[hospitalIds.size()]); | |
1543 | + String[] checkHospitalIds = (String[]) hospitalIds.toArray(new String[hospitalIds.size()]); | |
1538 | 1544 | screenQuery.setCheckHospitalIds(checkHospitalIds); |
1539 | 1545 | |
1540 | 1546 | //如果查询号不为空,根据查询号查询儿童档案表,获取儿童档案Id |
1541 | 1547 | |
1542 | 1548 | |
... | ... | @@ -1543,13 +1549,13 @@ |
1543 | 1549 | babyQuery.setQueryNo(earScreenListRequest.getKeyWord()); |
1544 | 1550 | //查询建档记录 |
1545 | 1551 | List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
1546 | - if(CollectionUtils.isNotEmpty(models)){ | |
1552 | + if (CollectionUtils.isNotEmpty(models)) { | |
1547 | 1553 | List<String> babyIds = new ArrayList<>(); |
1548 | - for(BabyModel babyModel:models){ | |
1554 | + for (BabyModel babyModel : models) { | |
1549 | 1555 | babyIds.add(babyModel.getId()); |
1550 | 1556 | } |
1551 | 1557 | screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()])); |
1552 | - }else{ | |
1558 | + } else { | |
1553 | 1559 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据"); |
1554 | 1560 | } |
1555 | 1561 | } |