jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 70a9432ce4d588f455da959cbc90915f9e921200

Authored by yangfei
1 parent 524fff7af0
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

冗余下次预约时间到patient表

Showing 1 changed file with 14 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 70a9432
... ... @@ -342,7 +342,7 @@
342 342 e.printStackTrace();
343 343 }
344 344 try {
345   - //修改孕妇高危等级
  345 + //修改的时候设置最新的高危/冗余筛查结果和下次产检预约时间
346 346 updateLastRisk(antExamModel.getParentId());
347 347 } catch (Exception e) {
348 348 e.printStackTrace();
... ... @@ -482,7 +482,6 @@
482 482 antExChuModel.setHospitalId(hospitalId);
483 483 if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) {
484 484 antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId());
485   -
486 485 antenatalExaminationService.updatePatientAbortion(antExChuModel.getId(), antExChuModel.getAbortionZR(), antExChuModel.getAbortionRG());
487 486 commonThreadPool.execute(new Runnable() {
488 487 @Override
489 488  
... ... @@ -495,12 +494,10 @@
495 494 }
496 495 patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId());
497 496 patientsService.updatePatient(patients);
498   -
499   - //修改本系统最后的高危
  497 + //修改的时候设置最新的高危/冗余筛查结果和下次产检预约时间
500 498 updateLastRisk(patients.getId());
501 499 //修改本院最后一次定义高危
502 500 updateLastRhTime(patients.getId(), hospitalId);
503   -
504 501 setLashCTimes(excAddRequest.getParentId());
505 502 //冗余到产检表
506 503 antenatalExaminationService.updateAntExRecord(excAddRequest.getId(), 1);
... ... @@ -524,7 +521,6 @@
524 521 PatientsQuery patientsQuery = new PatientsQuery();
525 522 patientsQuery.setPid(patients.getPid());
526 523 patientsQuery.setYn(YnEnums.YES.getId());
527   -
528 524 antExChuModel.setHospitalId(hospitalId);
529 525 AntExChuQuery antExChuQuery = new AntExChuQuery();
530 526 antExChuQuery.setYn(YnEnums.YES.getId());
531 527  
532 528  
... ... @@ -553,19 +549,12 @@
553 549 commonThreadPool.execute(new Runnable() {
554 550 @Override
555 551 public void run() {
556   - //查询最后一次产检筛查结果冗余到patient表
557   - Map<String, Object> map = getPatLastScreenResult(patients.getId());
558   - if (map != null && map.containsKey("screenResult")) {
559   - patients.setScreenResult((List<String>) map.get("screenResult"));
560   - }
561 552 patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor());
562 553 patientsService.updatePatient(patients);
563   -
564 554 /** 把优惠券设置为已使用状态 */
565 555 couponService.use(hospitalId, excAddRequest.getCouponCode(), userId, chuId);
566 556 //修改患者风险等级
567 557 patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId());
568   -
569 558 updateLastRisk(patients.getId());
570 559 //修改本院最后一次定义高危
571 560 updateLastRhTime(patients.getId(), hospitalId);
... ... @@ -932,6 +921,10 @@
932 921 break;
933 922 }
934 923 highScoreResult.put("screenResult", model.getScreenResult());
  924 + if(model.getNextCheckTime()!=null){
  925 + //最后一次预约下次产检时间
  926 + highScoreResult.put("nextCheckTime", model.getNextCheckTime());
  927 + }
935 928 next = false;
936 929 }
937 930 }
... ... @@ -951,6 +944,10 @@
951 944 break;
952 945 }
953 946 highScoreResult.put("screenResult", antExChuModel.getScreenResult());
  947 + //最后一次预约下次产检时间
  948 + if(antExChuModel.getNextCheckTime()!=null) {
  949 + highScoreResult.put("nextCheckTime", antExChuModel.getNextCheckTime());
  950 + }
954 951 next = false;
955 952 }
956 953 }
... ... @@ -2025,7 +2022,7 @@
2025 2022 }
2026 2023  
2027 2024 /**
2028   - * 修改的时候设置最新的高危
  2025 + * 修改的时候设置最新的高危/冗余筛查结果和下次产检预约时间
2029 2026 *
2030 2027 * @param parentId
2031 2028 */
... ... @@ -2052,6 +2049,9 @@
2052 2049 Map<String, Object> map = getPatLastScreenResult(patients.getId());
2053 2050 if (map != null && map.containsKey("screenResult")) {
2054 2051 patients1.setScreenResult((List<String>) map.get("screenResult"));
  2052 + }
  2053 + if (map != null && map.containsKey("nextCheckTime")) {
  2054 + patients1.setNextCheckTime((Date) map.get("nextCheckTime"));
2055 2055 }
2056 2056 patientsService.findAndModify(patientsQuery1, patients1);
2057 2057 }