jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6492ad0365451b5f49c36c1a54b81bd5e6745ff2

Authored by yangfei
2 parents 139319feca e08b8dae10
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 6492ad0
... ... @@ -1479,7 +1479,9 @@
1479 1479 // Date baby = parseDate("2018-02-01");
1480 1480 // int weeks = daysBetween(baby, new Date()) / 7;
1481 1481 // String weekAge = String.valueOf(weeks);
1482   -// System.out.print(weekAge);
  1482 +
  1483 + Date baby = parseDate("2018-04-07");
  1484 + System.out.println(baby.getTime());
1483 1485 }
1484 1486  
1485 1487 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 6492ad0
... ... @@ -335,6 +335,18 @@
335 335 return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊");
336 336 }
337 337  
  338 +
  339 +
  340 + //修改申请单状态
  341 + updateApplyOrder(model, antExAddRequest.getParentId());
  342 +
  343 + final Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId());
  344 + model.setPid(patients.getPid());
  345 +
  346 + antenatalExaminationService.addOneBabyAnt(model);
  347 +
  348 +
  349 +
338 350 /** 验证产检券是否可用 可用就改为已使用状态 */
339 351 if (StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) {
340 352 BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
341 353  
... ... @@ -345,14 +357,7 @@
345 357 }
346 358 }
347 359  
348   - //修改申请单状态
349   - updateApplyOrder(model, antExAddRequest.getParentId());
350 360  
351   - final Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId());
352   - model.setPid(patients.getPid());
353   -
354   - antenatalExaminationService.addOneBabyAnt(model);
355   -
356 361 final String antId = model.getId();
357 362  
358 363 commonThreadPool.execute(new Runnable() {
... ... @@ -571,7 +576,7 @@
571 576 commonThreadPool.execute(new Runnable() {
572 577 @Override
573 578 public void run() {
574   - // stopWatch.stop();
  579 + // stopWatch.stop();
575 580 /** 把优惠券设置为已使用状态 */
576 581 //stopWatch.start("couponService.use");
577 582 couponService.use(hospitalId, excAddRequest.getCouponCode(), userId, chuId);
... ... @@ -3181,7 +3186,7 @@
3181 3186 for (DiagnoseItemModel item : items)
3182 3187 {
3183 3188 if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XT.getId()).equals(item.getValueOne()) &&
3184   - compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getBloodSugar()) && CollectionUtils.isNotEmpty(item.getRiskIds()))
  3189 + compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getBloodSugar()) && CollectionUtils.isNotEmpty(item.getRiskIds()))
3185 3190 {
3186 3191 list.addAll(item.getRiskIds());
3187 3192 }
... ... @@ -3399,17 +3404,17 @@
3399 3404  
3400 3405 if (StringUtils.isNotEmpty(antExcAddRequest.getXqjq()))
3401 3406 {
3402   - // 辅助检查——肾功能
3403   - List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.sgn.getId());
3404   - if (CollectionUtils.isNotEmpty(items)) {
3405   - //血清肌酐
3406   - for (DiagnoseItemModel item : items) {
3407   - if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XQJG.getId()).equals(item.getValueOne())
3408   - && compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getXqjq()) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
3409   - list.addAll(item.getRiskIds());
3410   - }
3411   - }
3412   - }
  3407 + // 辅助检查——肾功能
  3408 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.sgn.getId());
  3409 + if (CollectionUtils.isNotEmpty(items)) {
  3410 + //血清肌酐
  3411 + for (DiagnoseItemModel item : items) {
  3412 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.XQJG.getId()).equals(item.getValueOne())
  3413 + && compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getXqjq()) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3414 + list.addAll(item.getRiskIds());
  3415 + }
  3416 + }
  3417 + }
3413 3418 }
3414 3419  
3415 3420 if (StringUtils.isNotEmpty(antExcAddRequest.getXnsd()))
3416 3421  
3417 3422  
3418 3423  
3419 3424  
3420 3425  
... ... @@ -3428,17 +3433,286 @@
3428 3433 }
3429 3434  
3430 3435  
  3436 + if (StringUtils.isNotEmpty(antExcAddRequest.getSyjg()) && StringUtils.isNotEmpty(antExcAddRequest.getSyjgSelect()))
  3437 + {
  3438 + if ("yang".equals(antExcAddRequest.getSyjg()) && "2".equals(antExcAddRequest.getSyjgSelect())) {
  3439 + // 辅助检查——梅毒血清实验
  3440 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.md.getId());
  3441 + if (CollectionUtils.isNotEmpty(items)) {
  3442 + //实验结果——阳性（+）已确诊
  3443 + for (DiagnoseItemModel item : items) {
  3444 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SYJGYXYQZ.getId()).equals(item.getValueOne())
  3445 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3446 + list.addAll(item.getRiskIds());
  3447 + }
  3448 + }
  3449 + }
  3450 + }
  3451 + }
3431 3452  
3432 3453  
3433   - }
  3454 + if (StringUtils.isNotEmpty(antExcAddRequest.getSyjg()) && StringUtils.isNotEmpty(antExcAddRequest.getSyjgSelect()))
  3455 + {
  3456 + if ("yang".equals(antExcAddRequest.getSyjg()) && "1".equals(antExcAddRequest.getSyjgSelect())) {
  3457 + // 辅助检查——梅毒血清实验
  3458 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.md.getId());
  3459 + if (CollectionUtils.isNotEmpty(items)) {
  3460 + //实验结果——阳性（+）初诊结果
  3461 + for (DiagnoseItemModel item : items) {
  3462 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SYJGYXCZJG.getId()).equals(item.getValueOne())
  3463 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3464 + list.addAll(item.getRiskIds());
  3465 + }
  3466 + }
  3467 + }
  3468 + }
  3469 + }
3434 3470  
3435 3471  
  3472 + if (StringUtils.isNotEmpty(antExcAddRequest.getHivkt()) && StringUtils.isNotEmpty(antExcAddRequest.getHivktSelect()))
  3473 + {
  3474 + if ("yang".equals(antExcAddRequest.getHivkt()) && "2".equals(antExcAddRequest.getHivktSelect())) {
  3475 + // 辅助检查——梅毒血清实验
  3476 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.md.getId());
  3477 + if (CollectionUtils.isNotEmpty(items)) {
  3478 + //HIV抗体检测——阳性（+）已确诊
  3479 + for (DiagnoseItemModel item : items) {
  3480 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.HIVYQZ.getId()).equals(item.getValueOne())
  3481 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3482 + list.addAll(item.getRiskIds());
  3483 + }
  3484 + }
  3485 + }
  3486 + }
  3487 + }
3436 3488  
3437 3489  
  3490 + if (StringUtils.isNotEmpty(antExcAddRequest.getHivkt()) && StringUtils.isNotEmpty(antExcAddRequest.getHivktSelect()))
  3491 + {
  3492 + if ("yang".equals(antExcAddRequest.getHivkt()) && "1".equals(antExcAddRequest.getHivktSelect())) {
  3493 + // 辅助检查——梅毒血清实验
  3494 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.md.getId());
  3495 + if (CollectionUtils.isNotEmpty(items)) {
  3496 + //HIV抗体检测——阳性（+）初诊结果
  3497 + for (DiagnoseItemModel item : items) {
  3498 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.HIVCZJG.getId()).equals(item.getValueOne())
  3499 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3500 + list.addAll(item.getRiskIds());
  3501 + }
  3502 + }
  3503 + }
  3504 + }
  3505 + }
3438 3506  
3439 3507  
  3508 + if (antExcAddRequest.getFksxHistory() != null && antExcAddRequest.getFksxHistory().size() > 0)
  3509 + {
  3510 + //妇科手术史（盆腔手术史）
  3511 + Map map = antExcAddRequest.getFksxHistory();
  3512 + if ("yes".equals(map.get("yesOrNo")))
  3513 + {
  3514 + //异位妊娠手术
  3515 + if ("true".equals(map.get("ywrsss")))
  3516 + {
  3517 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
  3518 + if (CollectionUtils.isNotEmpty(items)) {
  3519 + for (DiagnoseItemModel item : items) {
  3520 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YWRSSS.getId()).equals(item.getValueOne())
  3521 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3522 + list.addAll(item.getRiskIds());
  3523 + }
  3524 + }
  3525 + }
  3526 + }
3440 3527  
3441   - List<Map<String,String>> riskList = diagnoseConfigFacde.getRiskName(list);
  3528 + //子宫肌瘤剥除
  3529 + if ("true".equals(map.get("zgjlbc")))
  3530 + {
  3531 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
  3532 + if (CollectionUtils.isNotEmpty(items)) {
  3533 + for (DiagnoseItemModel item : items) {
  3534 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.ZGJLXC.getId()).equals(item.getValueOne())
  3535 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3536 + list.addAll(item.getRiskIds());
  3537 + }
  3538 + }
  3539 + }
  3540 + }
  3541 +
  3542 + //剖宫产
  3543 + if ("true".equals(map.get("pgc")))
  3544 + {
  3545 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
  3546 + if (CollectionUtils.isNotEmpty(items)) {
  3547 + for (DiagnoseItemModel item : items) {
  3548 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.PGC.getId()).equals(item.getValueOne())
  3549 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3550 + list.addAll(item.getRiskIds());
  3551 + }
  3552 + }
  3553 + }
  3554 + }
  3555 +
  3556 + //其他
  3557 + if ("true".equals(map.get("qt")) && map.get("qtText") != null)
  3558 + {
  3559 + String qtText = String.valueOf(map.get("qtText"));
  3560 + if (StringUtils.isNotEmpty(qtText))
  3561 + {
  3562 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
  3563 + if (CollectionUtils.isNotEmpty(items)) {
  3564 + for (DiagnoseItemModel item : items) {
  3565 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FKSSSQT.getId()).equals(item.getValueOne())
  3566 + && contain(item.getValueTwo(),qtText) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3567 + list.addAll(item.getRiskIds());
  3568 + }
  3569 + }
  3570 + }
  3571 + }
  3572 + }
  3573 + }
  3574 + }
  3575 +
  3576 +
  3577 +
  3578 +
  3579 + if (antExcAddRequest.getInfectDiseases() != null && antExcAddRequest.getInfectDiseases().size() > 0)
  3580 + {
  3581 + //传染病史
  3582 + Map map = antExcAddRequest.getInfectDiseases();
  3583 + if ("yes".equals(map.get("yesOrNo")))
  3584 + {
  3585 +
  3586 + //乙肝
  3587 + if ("true".equals(map.get("yg")))
  3588 + {
  3589 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.crbs.getId());
  3590 + if (CollectionUtils.isNotEmpty(items)) {
  3591 + for (DiagnoseItemModel item : items) {
  3592 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.YG.getId()).equals(item.getValueOne())
  3593 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3594 + list.addAll(item.getRiskIds());
  3595 + }
  3596 + }
  3597 + }
  3598 + }
  3599 +
  3600 + //丙肝
  3601 + if ("true".equals(map.get("bg")))
  3602 + {
  3603 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.crbs.getId());
  3604 + if (CollectionUtils.isNotEmpty(items)) {
  3605 + for (DiagnoseItemModel item : items) {
  3606 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.BG.getId()).equals(item.getValueOne())
  3607 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3608 + list.addAll(item.getRiskIds());
  3609 + }
  3610 + }
  3611 + }
  3612 + }
  3613 +
  3614 + //艾滋
  3615 + if ("true".equals(map.get("azb")))
  3616 + {
  3617 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
  3618 + if (CollectionUtils.isNotEmpty(items)) {
  3619 + for (DiagnoseItemModel item : items) {
  3620 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.AZ.getId()).equals(item.getValueOne())
  3621 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3622 + list.addAll(item.getRiskIds());
  3623 + }
  3624 + }
  3625 + }
  3626 + }
  3627 +
  3628 + //梅毒
  3629 + if ("true".equals(map.get("md")))
  3630 + {
  3631 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
  3632 + if (CollectionUtils.isNotEmpty(items)) {
  3633 + for (DiagnoseItemModel item : items) {
  3634 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.MD.getId()).equals(item.getValueOne())
  3635 + && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3636 + list.addAll(item.getRiskIds());
  3637 + }
  3638 + }
  3639 + }
  3640 + }
  3641 +
  3642 + //其他
  3643 + if ("true".equals(map.get("qt")) && map.get("qtText") != null)
  3644 + {
  3645 + String qtText = String.valueOf(map.get("qtText"));
  3646 + if (StringUtils.isNotEmpty(qtText))
  3647 + {
  3648 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.pqsss.getId());
  3649 + if (CollectionUtils.isNotEmpty(items)) {
  3650 + for (DiagnoseItemModel item : items) {
  3651 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.CRBSQT.getId()).equals(item.getValueOne())
  3652 + && contain(item.getValueTwo(),qtText) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3653 + list.addAll(item.getRiskIds());
  3654 + }
  3655 + }
  3656 + }
  3657 + }
  3658 + }
  3659 + }
  3660 + }
  3661 +
  3662 +
  3663 + if (StringUtils.isNotEmpty(antExcAddRequest.getGonggao()))
  3664 + {
  3665 + // 产科检查
  3666 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ckjc.getId());
  3667 + if (CollectionUtils.isNotEmpty(items)) {
  3668 + //宫高
  3669 + for (DiagnoseItemModel item : items) {
  3670 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.GG.getId()).equals(item.getValueOne())
  3671 + && compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getGonggao()) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3672 + list.addAll(item.getRiskIds());
  3673 + }
  3674 + }
  3675 + }
  3676 + }
  3677 +
  3678 +
  3679 + if (StringUtils.isNotEmpty(antExcAddRequest.getFuwei()))
  3680 + {
  3681 + // 产科检查
  3682 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ckjc.getId());
  3683 + if (CollectionUtils.isNotEmpty(items)) {
  3684 + //腹围
  3685 + for (DiagnoseItemModel item : items) {
  3686 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FW.getId()).equals(item.getValueOne())
  3687 + && compare(item.getValueTwo(),item.getValueThree(),antExcAddRequest.getFuwei()) && CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3688 + list.addAll(item.getRiskIds());
  3689 + }
  3690 + }
  3691 + }
  3692 + }
  3693 +
  3694 +
  3695 + if (StringUtils.isNotEmpty(antExcAddRequest.getEdema()))
  3696 + {
  3697 + // 产科检查
  3698 + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ckjc.getId());
  3699 + if (CollectionUtils.isNotEmpty(items)) {
  3700 + //浮肿
  3701 + for (DiagnoseItemModel item : items) {
  3702 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.FZ.getId()).equals(item.getValueOne())
  3703 + && String.valueOf(DiagnoseEnums.JwsChildEnums.A.getId()).equals(item.getValueTwo()) &&
  3704 + CollectionUtils.isNotEmpty(item.getRiskIds())) {
  3705 + list.addAll(item.getRiskIds());
  3706 + }
  3707 + }
  3708 + }
  3709 + }
  3710 +
  3711 +
  3712 +
  3713 + }
  3714 +
  3715 + List<Map<String,String>> riskList = diagnoseConfigFacde.getRiskName(list);
3442 3716  
3443 3717 return new BaseObjectResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
3444 3718 }