Commit f8502f91c7680c3caf5ad94aba6c0880f4a0d477
1 parent
00460e9106
Exists in
master
and in
6 other branches
听力诊断模块
Showing 1 changed file with 9 additions and 34 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
f8502f9
| ... | ... | @@ -300,25 +300,13 @@ |
| 300 | 300 | babyModel.setBuildDoctor(null); |
| 301 | 301 | babyModel.setBuildDate(new Date()); |
| 302 | 302 | newBabyId = babyService.addOneBaby(babyModel).getId(); |
| 303 | - } | |
| 304 | 303 | |
| 305 | - BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); | |
| 306 | - earQuery.setBabyPatientId(babyId); | |
| 307 | - // earQuery.setCreateHospitalId(hospitalId); | |
| 308 | - List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); | |
| 309 | - BabyPatientExtendEar ear = null; | |
| 310 | - boolean isPass = false; | |
| 311 | - if (CollectionUtils.isNotEmpty(ears)) { | |
| 312 | - for (BabyPatientExtendEar er : ears) { | |
| 313 | - if (hospitalId.equals(er.getCreateHospitalId())) {//相同 | |
| 314 | - isPass = true; | |
| 315 | - break; | |
| 316 | - } else { | |
| 317 | - ear = er; | |
| 318 | - } | |
| 319 | - } | |
| 320 | - } | |
| 321 | - if (!isPass) { | |
| 304 | + | |
| 305 | + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); | |
| 306 | + earQuery.setBabyPatientId(babyId); | |
| 307 | + // earQuery.setCreateHospitalId(hospitalId); | |
| 308 | + List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); | |
| 309 | + BabyPatientExtendEar ear = ears.get(0); | |
| 322 | 310 | //如果不相同转诊档案 |
| 323 | 311 | if (!hospitalId.equals(ear.getCreateHospitalId())) { |
| 324 | 312 | ear.setId(UUID.randomUUID().toString().replace("-", "")); |
| 325 | 313 | |
| ... | ... | @@ -366,22 +354,9 @@ |
| 366 | 354 | babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(mother); |
| 367 | 355 | } |
| 368 | 356 | } |
| 369 | - } | |
| 370 | 357 | |
| 371 | - BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery(); | |
| 372 | - query.setBabyPatientId(babyId); | |
| 373 | - List<BabyPatientExtendEarBaby> babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(query); | |
| 374 | - isPass = false; | |
| 375 | - if (CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)) { | |
| 376 | - for (BabyPatientExtendEarBaby earBabys : babyPatientExtendEarBabies) { | |
| 377 | - if (hospitalId.equals(earBabys.getHospitalId())) {//相同 | |
| 378 | - isPass = true; | |
| 379 | - break; | |
| 380 | - } | |
| 381 | - } | |
| 382 | - } | |
| 383 | - | |
| 384 | - if (!isPass) { | |
| 358 | + BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery(); | |
| 359 | + query.setBabyPatientId(babyId); | |
| 385 | 360 | BabyPatientExtendEarBaby babyPatientExtendEarBaby = new BabyPatientExtendEarBaby(); |
| 386 | 361 | babyModel = babyService.getOneBabyById(newBabyId); |
| 387 | 362 | babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", "")); |
| 388 | 363 | |
| ... | ... | @@ -404,8 +379,8 @@ |
| 404 | 379 | babyPatientExtendEarBaby.setBabyEarId(ear.getId()); |
| 405 | 380 | babyPatientExtendEarBaby.setPersonId(babyModel.getPid()); |
| 406 | 381 | babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby); |
| 382 | + return true; | |
| 407 | 383 | } |
| 408 | - return true; | |
| 409 | 384 | } |
| 410 | 385 | return true; |
| 411 | 386 | } |