Commit 0057bc6a3e51034c7973312fc56317e1bec5492b
1 parent
8ac55336d0
Exists in
master
and in
6 other branches
听力诊断模块
Showing 2 changed files with 58 additions and 22 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
0057bc6
| ... | ... | @@ -263,6 +263,50 @@ |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /** |
| 266 | + * mogodb建立隐藏档案 | |
| 267 | + * | |
| 268 | + * @param babyId | |
| 269 | + * @param hospitalId | |
| 270 | + * @param enable | |
| 271 | + * @return | |
| 272 | + */ | |
| 273 | + public String addhideMongoBaby(String babyId, String hospitalId, String enable) { | |
| 274 | + if (StringUtils.isEmpty(babyId) || StringUtils.isEmpty(hospitalId)) { | |
| 275 | + return null; | |
| 276 | + } | |
| 277 | + | |
| 278 | + BabyModel babyModel = babyService.getOneBabyById(babyId); | |
| 279 | + | |
| 280 | + //建立儿童隐藏档案 | |
| 281 | + if (babyModel != null) { | |
| 282 | + BabyModelQuery babyQuery = new BabyModelQuery(); | |
| 283 | + babyQuery.setHospitalId(hospitalId); | |
| 284 | + babyQuery.setPid(babyModel.getPid()); | |
| 285 | + | |
| 286 | + List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyQuery); | |
| 287 | + if (CollectionUtils.isEmpty(babyModels)) { | |
| 288 | + babyModel.setHospitalId(hospitalId); | |
| 289 | + babyModel.setYn(YnEnums.YES.getId()); | |
| 290 | + babyModel.setCreated(new Date()); | |
| 291 | + babyModel.setId(null); | |
| 292 | + //2-隐藏建档 0--转诊 | |
| 293 | + babyModel.setEnable(enable); | |
| 294 | + //隐藏建档需要baby来源id | |
| 295 | + if (enable.equals("2")) { | |
| 296 | + if (StringUtils.isEmpty(babyModel.getSource())) { | |
| 297 | + babyModel.setSource(babyId); | |
| 298 | + } | |
| 299 | + } | |
| 300 | + babyModel.setBuildType(3); | |
| 301 | + babyModel.setBuildDoctor(null); | |
| 302 | + babyModel.setBuildDate(new Date()); | |
| 303 | + return babyService.addOneBaby(babyModel).getId(); | |
| 304 | + } | |
| 305 | + } | |
| 306 | + return null; | |
| 307 | + } | |
| 308 | + | |
| 309 | + /** | |
| 266 | 310 | * 增加儿童隐藏建档 |
| 267 | 311 | * |
| 268 | 312 | * @param babyId 儿童档案Id |
| ... | ... | @@ -295,7 +339,9 @@ |
| 295 | 339 | babyModel.setEnable(enable); |
| 296 | 340 | //隐藏建档需要baby来源id |
| 297 | 341 | if (enable.equals("2")) { |
| 298 | - babyModel.setSource(babyId); | |
| 342 | + if (StringUtils.isEmpty(babyModel.getSource())) { | |
| 343 | + babyModel.setSource(babyId); | |
| 344 | + } | |
| 299 | 345 | } |
| 300 | 346 | babyModel.setBuildType(3); |
| 301 | 347 | babyModel.setBuildDoctor(null); |
| ... | ... | @@ -305,7 +351,6 @@ |
| 305 | 351 | |
| 306 | 352 | BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); |
| 307 | 353 | earQuery.setBabyPatientId(babyId); |
| 308 | - // earQuery.setCreateHospitalId(hospitalId); | |
| 309 | 354 | List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); |
| 310 | 355 | BabyPatientExtendEar ear = ears.get(0); |
| 311 | 356 | //如果不相同转诊档案 |
| ... | ... | @@ -399,7 +444,6 @@ |
| 399 | 444 | BabyEarBase babyEarBase = babyEarAddRequest.getBase(); |
| 400 | 445 | //获取儿童信息 |
| 401 | 446 | IBasicRequestConvert<BabyModel> convert = babyEarBase; |
| 402 | - | |
| 403 | 447 | //儿童基本信息 |
| 404 | 448 | BabyModel baby = convert.convertToDataModel(); |
| 405 | 449 | //儿童出生信息 |
| 406 | 450 | |
| ... | ... | @@ -417,11 +461,10 @@ |
| 417 | 461 | |
| 418 | 462 | if (null != baby) { |
| 419 | 463 | String pid = null; |
| 420 | - if (StringUtils.isNotEmpty(baby.getId())) {//修改儿童信息 | |
| 421 | - BabyModel babyModel = babyService.getOneBabyById(baby.getId()); | |
| 422 | - //跟距母亲证件号查询儿童person信息 | |
| 464 | + if (StringUtils.isNotEmpty(baby.getPid())) {//更新本院儿童信息 | |
| 465 | + //根据pid查询儿童信息并进行更新 | |
| 423 | 466 | PersonModelQuery personModelQuery = new PersonModelQuery(); |
| 424 | - personModelQuery.setId(babyModel.getPid()); | |
| 467 | + personModelQuery.setId(baby.getPid()); | |
| 425 | 468 | List<PersonModel> babyP = personService.queryPersons(personModelQuery); |
| 426 | 469 | if (CollectionUtils.isNotEmpty(babyP)) { |
| 427 | 470 | PersonModel personModel = babyP.get(0); |
| 428 | 471 | |
| 429 | 472 | |
| ... | ... | @@ -433,23 +476,13 @@ |
| 433 | 476 | personService.updatePerson(personModel, personModel.getId()); |
| 434 | 477 | } |
| 435 | 478 | } else {//新增儿童信息 |
| 436 | - //处理儿童person信息 | |
| 437 | 479 | pid = handBabyPerson(baby).getId(); |
| 438 | 480 | } |
| 439 | - | |
| 440 | - babyEarAddResult.setpId(pid); | |
| 481 | + //babyId | |
| 441 | 482 | String babyPatientId = ""; |
| 442 | - | |
| 443 | - BabyModelQuery babyQuery = new BabyModelQuery(); | |
| 444 | - babyQuery.setPid(pid); | |
| 445 | - babyQuery.setHospitalId(hId); | |
| 446 | - List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyQuery); | |
| 447 | - | |
| 448 | - if (CollectionUtils.isNotEmpty(babyModels)) {//修改 | |
| 449 | - BabyModel babyModel = babyModels.get(0); | |
| 450 | - baby.setId(babyModel.getId()); | |
| 451 | - babyService.updateOneBaby(baby, babyModel.getId()); | |
| 452 | - babyPatientId = babyModel.getId(); | |
| 483 | + if (StringUtils.isNotEmpty(baby.getId())) {//更新本院儿童信息 | |
| 484 | + babyService.updateOneBaby(baby, baby.getId()); | |
| 485 | + babyPatientId = baby.getId(); | |
| 453 | 486 | } else {//新增 |
| 454 | 487 | baby.setId(null); |
| 455 | 488 | baby.setPid(pid); |
| ... | ... | @@ -459,6 +492,8 @@ |
| 459 | 492 | baby.setCreated(new Date()); |
| 460 | 493 | babyPatientId = babyService.addOneBaby(baby).getId(); |
| 461 | 494 | } |
| 495 | + | |
| 496 | + babyEarAddResult.setpId(pid); | |
| 462 | 497 | babyEarAddResult.setBabyId(babyPatientId); |
| 463 | 498 | |
| 464 | 499 | //数据转换 |
| ... | ... | @@ -1307,7 +1342,7 @@ |
| 1307 | 1342 | } |
| 1308 | 1343 | babyEarBirthView.setFetuEmbarras(fetuStr); |
| 1309 | 1344 | |
| 1310 | - String apgarScore =""; | |
| 1345 | + String apgarScore = ""; | |
| 1311 | 1346 | if (babyPatientExtendEarBirth.getApgarScoreOne() != null && babyPatientExtendEarBirth.getApgarScoreFive() != null && babyPatientExtendEarBirth.getApgarScoreTen() != null) { |
| 1312 | 1347 | apgarScore = babyPatientExtendEarBirth.getApgarScoreOne() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreFive() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreTen() + UnitConstants.FEN; |
| 1313 | 1348 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
View file @
0057bc6
| ... | ... | @@ -178,6 +178,7 @@ |
| 178 | 178 | babyModel.setMcertTypeId(mcertTypeId); |
| 179 | 179 | babyModel.setmLevelId(mLevelId); |
| 180 | 180 | babyModel.setId(babyId); |
| 181 | + babyModel.setPid(pid); | |
| 181 | 182 | babyModel.setMremark(remark); |
| 182 | 183 | babyModel.setVcCardNo(vcCardNo); |
| 183 | 184 | babyModel.setServiceType(serviceType); |