jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c9e911bd7bb98c79046d866412a5d3664b36e213

Authored by [wangbo]
1 parent bc2b53c39a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

修改产筛的预约查询问题

Showing 3 changed files with 125 additions and 114 deletions

platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java View file @ c9e911b
... ... @@ -383,15 +383,19 @@
383 383 if (null != pids) {
384 384 condition = condition.and("pid", pids, MongoOper.IN);
385 385 }
386   - if (null != followupStatus) {
387   - if (followupStatus == 0) {
388   - Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
389   - condition = condition.and("appointmentDate", newDate, MongoOper.GTE);
390   - } else if (followupStatus == 1) {
391   - Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
392   - condition = condition.and("appointmentDate", newDate, MongoOper.LT);
393   - } else if (followupStatus == 2) {
394   - condition = condition.and("stop", "1", MongoOper.IS);
  386 +
  387 + //排除 产筛跟分娩住院
  388 + if (queryTrackType != null && queryTrackType != 4 && queryTrackType != 5) {
  389 + if (null != followupStatus) {
  390 + if (followupStatus == 0) {
  391 + Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
  392 + condition = condition.and("appointmentDate", newDate, MongoOper.GTE);
  393 + } else if (followupStatus == 1) {
  394 + Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
  395 + condition = condition.and("appointmentDate", newDate, MongoOper.LT);
  396 + } else if (followupStatus == 2) {
  397 + condition = condition.and("stop", "1", MongoOper.IS);
  398 + }
395 399 }
396 400 }
397 401  
398 402  
399 403  
400 404  
401 405  
402 406  
403 407  
404 408  
... ... @@ -456,49 +460,52 @@
456 460 }
457 461 }
458 462  
459   - if (null != appointmentDateStart) {
460   - if (null != c1) {
461   - c1 = c1.and("appointmentDate").gte(appointmentDateStart);
462   - } else {
463   - c1 = Criteria.where("appointmentDate").gte(appointmentDateStart);
  463 + //排除 产筛 跟分娩住院
  464 + if (queryTrackType != null && queryTrackType != 4 && queryTrackType != 5) {
  465 + if (null != appointmentDateStart) {
  466 + if (null != c1) {
  467 + c1 = c1.and("appointmentDate").gte(appointmentDateStart);
  468 + } else {
  469 + c1 = Criteria.where("appointmentDate").gte(appointmentDateStart);
  470 + }
464 471 }
465   - }
466   - if (null != appointmentDateEnd) {
467   - if (c1 != null) {
468   - c1 = c1.lte(appointmentDateEnd);
469   - } else {
470   - c1 = Criteria.where("appointmentDate").lte(appointmentDateEnd);
  472 + if (null != appointmentDateEnd) {
  473 + if (c1 != null) {
  474 + c1 = c1.lte(appointmentDateEnd);
  475 + } else {
  476 + c1 = Criteria.where("appointmentDate").lte(appointmentDateEnd);
  477 + }
471 478 }
472   - }
473 479  
474   - if (null != trackDownDateStart) {
475   - if (null != c1) {
476   - c1 = c1.and("trackDownDate").gte(trackDownDateStart);
477   - } else {
478   - c1 = Criteria.where("trackDownDate").gte(trackDownDateStart);
  480 + if (null != trackDownDateStart) {
  481 + if (null != c1) {
  482 + c1 = c1.and("trackDownDate").gte(trackDownDateStart);
  483 + } else {
  484 + c1 = Criteria.where("trackDownDate").gte(trackDownDateStart);
  485 + }
479 486 }
480   - }
481   - if (null != trackDownDateEnd) {
482   - if (c1 != null) {
483   - c1 = c1.lte(trackDownDateEnd);
484   - } else {
485   - c1 = Criteria.where("trackDownDate").lte(trackDownDateEnd);
  487 + if (null != trackDownDateEnd) {
  488 + if (c1 != null) {
  489 + c1 = c1.lte(trackDownDateEnd);
  490 + } else {
  491 + c1 = Criteria.where("trackDownDate").lte(trackDownDateEnd);
  492 + }
486 493 }
487   - }
488 494  
489 495  
490   - if (null != startBeOverdueDays) {
491   - if (null != c1) {
492   - c1 = c1.and("appointmentDate").gte(startBeOverdueDays);
493   - } else {
494   - c1 = Criteria.where("appointmentDate").gte(startBeOverdueDays);
  496 + if (null != startBeOverdueDays) {
  497 + if (null != c1) {
  498 + c1 = c1.and("appointmentDate").gte(startBeOverdueDays);
  499 + } else {
  500 + c1 = Criteria.where("appointmentDate").gte(startBeOverdueDays);
  501 + }
495 502 }
496   - }
497   - if (null != endBeOverdueDays) {
498   - if (c1 != null) {
499   - c1 = c1.lte(endBeOverdueDays);
500   - } else {
501   - c1 = Criteria.where("appointmentDate").lte(endBeOverdueDays);
  503 + if (null != endBeOverdueDays) {
  504 + if (c1 != null) {
  505 + c1 = c1.lte(endBeOverdueDays);
  506 + } else {
  507 + c1 = Criteria.where("appointmentDate").lte(endBeOverdueDays);
  508 + }
502 509 }
503 510 }
504 511 /******产筛特殊处理*******/
505 512  
... ... @@ -546,10 +553,7 @@
546 553 c1 = Criteria.where("sieveAppointmentDate").lte(appointmentDateEnd);
547 554 }
548 555 }
549   -
550   -
551 556 }
552   -
553 557  
554 558 if (null != c1) {
555 559 condition = condition.andCondition(new MongoCondition(c1));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ c9e911b
... ... @@ -330,6 +330,8 @@
330 330 patientsQuery.setFmMode(downQueryRequest.getFmType());
331 331 isPatient = true;
332 332 }
  333 +
  334 +
333 335 if (null != downQueryRequest.getPostpartumDays()) {//产后天数
334 336 Calendar instance = Calendar.getInstance();
335 337 instance.setTime(new Date());
336 338  
... ... @@ -434,7 +436,10 @@
434 436 downRecordQuery.setParentIds(pids);
435 437 }
436 438 }
  439 + //设置查询queryTrackType 如果是4 执行产筛的查询条件
  440 + downRecordQuery.setQueryTrackType(downQueryRequest.getTrackType());
437 441  
  442 +
438 443 downRecordQuery.setAreaId(downQueryRequest.getAreaId());
439 444 downRecordQuery.setProvinceId(downQueryRequest.getProvinceId());
440 445 downRecordQuery.setCityId(downQueryRequest.getCityId());
441 446  
... ... @@ -455,10 +460,7 @@
455 460 downRecordQuery.setTrackDownDateStart(DateUtil.parseYMD(downQueryRequest.getTrackDownDateStart()));
456 461 downRecordQuery.setTrackDownDateEnd(DateUtil.parseYMD(downQueryRequest.getTrackDownDateEnd()));
457 462  
458   - //设置查询queryTrackType 如果是4 执行产筛的查询条件
459   - downRecordQuery.setQueryTrackType(downQueryRequest.getTrackType());
460 463  
461   -
462 464 //逾期天数
463 465 if (null != downQueryRequest.getBeOverdueDays()) {
464 466 Calendar instance = Calendar.getInstance();
... ... @@ -504,6 +506,8 @@
504 506 // downRecordQuery.setSort("modified desc");
505 507 downRecordQuery.setHospitalId(hospitalId);
506 508  
  509 + System.out.println("====>" + downRecordQuery.convertToQuery().convertToMongoQuery());
  510 +
507 511 return downRecordQuery;
508 512 }
509 513  
... ... @@ -933,7 +937,6 @@
933 937  
934 938 }
935 939 }
936   -
937 940 //产检次数
938 941 temp.put("checkCount", getChuzhenCount(parentId));
939 942 Criteria criteria = Criteria.where("yn").is(1).and("parentId").is(downRecord.getParentId());
... ... @@ -948,7 +951,6 @@
948 951 if (trackDown != null) {
949 952 temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 追访结果
950 953  
951   -
952 954 //获取产筛的预约时间 跟追访时间
953 955 if (downRecord.getTrackType() != null && downRecord.getTrackType() == 4) {
954 956 temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveAppointmentDate())); // 产筛预约时间
... ... @@ -961,7 +963,12 @@
961 963 } else {
962 964 temp.put("result", "--"); // 婚检追访结果
963 965 temp.put("trackDownTime", "--"); // 追访时间
964   - temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约预约时间
  966 + if (downRecord.getTrackType() != null && downRecord.getTrackType() == 4) {
  967 + temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveAppointmentDate())); // 产筛预约时间
  968 + } else {
  969 + temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约预约时间
  970 + }
  971 +
965 972 }
966 973  
967 974 //如果是产前检查取预约结果
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ c9e911b
... ... @@ -833,80 +833,80 @@
833 833 */
834 834 public BaseResponse add(Integer userId, TrackDown trackDown) {
835 835 String hospitalId = autoMatchFacade.getHospitalId(userId);
836   - if (trackDown.getTrackDownDateType() != TrackDownDateEnums.D.getId()) {//&& trackDown.getTrackDownDateType() != TrackDownDateEnums.G.getId()) {//不等于产检追访和产后访视时进行数据验证状态
837   - //追访列表ID
838   - if (trackDown.getTrackDownRecId() != null) {
839   - TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId());
840   - if (trackDownRecord != null) {
841   - //当传入的状态和数据库一致时才能进行有效操作
  836 + // if (trackDown.getTrackDownDateType() != TrackDownDateEnums.D.getId()) {//&& trackDown.getTrackDownDateType() != TrackDownDateEnums.G.getId()) {//不等于产检追访和产后访视时进行数据验证状态
  837 + //追访列表ID
  838 + if (trackDown.getTrackDownRecId() != null) {
  839 + TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId());
  840 + if (trackDownRecord != null) {
  841 + //当传入的状态和数据库一致时才能进行有效操作
842 842 /*if (trackDownRecord.getTrackType().intValue() != trackDown.getTrackDownDateType()) {
843 843 return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "数据已经被修改请回到列表刷新后再操作！");
844 844 }*/
845   - if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType()
846   - && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex())
847   - && TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) {//性别男：特殊处理，流转到下一流程时结束流程
848   - trackDown.setTrackDownTransfer(TrackDownTransferEnums.C.getId());
  845 + if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType()
  846 + && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex())
  847 + && TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) {//性别男：特殊处理，流转到下一流程时结束流程
  848 + trackDown.setTrackDownTransfer(TrackDownTransferEnums.C.getId());
  849 + }
  850 + /** 孕妇追访功能冗余字段**/
  851 + //获取孕妇建档id
  852 + if (StringUtils.isNotEmpty(trackDownRecord.getParentId())) {
  853 + Patients patients = new Patients();
  854 + if (null != trackDown.getReservatDate()) {
  855 + patients.setFollowupTime(trackDown.getReservatDate());
  856 + } else {
  857 + patients.setFollowupTime(new Date());
849 858 }
850   - /** 孕妇追访功能冗余字段**/
851   - //获取孕妇建档id
852   - if (StringUtils.isNotEmpty(trackDownRecord.getParentId())) {
853   - Patients patients = new Patients();
854   - if (null != trackDown.getReservatDate()) {
855   - patients.setFollowupTime(trackDown.getReservatDate());
856   - } else {
857   - patients.setFollowupTime(new Date());
858   - }
859   - if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) {
860   - patients.setStop("0");
861   - } else if (3 == trackDown.getTrackDownTransfer()) {
862   - patients.setStop("1");
863   - }
864   - patientsService.updatePatientOne(patients, trackDownRecord.getParentId());
  859 + if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) {
  860 + patients.setStop("0");
  861 + } else if (3 == trackDown.getTrackDownTransfer()) {
  862 + patients.setStop("1");
865 863 }
866   - //获取妇女建党id
867   - ResidentsArchiveModel residentsArchiveModel1 = new ResidentsArchiveModel();
868   - if (StringUtils.isNotEmpty(trackDownRecord.getResidentsArchiveId())) {
869   - if (trackDown.getReservatDate() != null) {
870   - residentsArchiveModel1.setFollowupTime(trackDown.getReservatDate());
871   - } else {
872   - residentsArchiveModel1.setFollowupTime(new Date());
873   - }
874   - /**冗余 现在处于哪一个流程*/
875   - if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) {
876   - residentsArchiveModel1.setStop("0");
877   - } else if (3 == trackDown.getTrackDownTransfer()) {
878   - residentsArchiveModel1.setStop("1");
879   - }
880   - residentsArchiveService.updateResident(residentsArchiveModel1, trackDown.getParentId());
  864 + patientsService.updatePatientOne(patients, trackDownRecord.getParentId());
  865 + }
  866 + //获取妇女建党id
  867 + ResidentsArchiveModel residentsArchiveModel1 = new ResidentsArchiveModel();
  868 + if (StringUtils.isNotEmpty(trackDownRecord.getResidentsArchiveId())) {
  869 + if (trackDown.getReservatDate() != null) {
  870 + residentsArchiveModel1.setFollowupTime(trackDown.getReservatDate());
  871 + } else {
  872 + residentsArchiveModel1.setFollowupTime(new Date());
881 873 }
882   - /**冗余到追访记录表*/
883   - TrackDownRecord trackDownRecord1 = new TrackDownRecord();
884   - if (trackDown.getReservatDate() != null || trackDown.getTrackDownDateType() != 4 || trackDown.getTrackDownDateType() != 5) {
885   - trackDownRecord1.setAppointmentDate(trackDown.getReservatDate());
  874 + /**冗余 现在处于哪一个流程*/
  875 + if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) {
  876 + residentsArchiveModel1.setStop("0");
  877 + } else if (3 == trackDown.getTrackDownTransfer()) {
  878 + residentsArchiveModel1.setStop("1");
886 879 }
887   - if (null != trackDown.getTrackDownDate() || trackDown.getTrackDownDateType() != 4 || trackDown.getTrackDownDateType() != 5) {
888   - trackDownRecord1.setTrackDownDate(trackDown.getTrackDownDate());
  880 + residentsArchiveService.updateResident(residentsArchiveModel1, trackDown.getParentId());
  881 + }
  882 + /**冗余到追访记录表*/
  883 + TrackDownRecord trackDownRecord1 = new TrackDownRecord();
  884 + if (trackDown.getTrackDownDateType() != 4 && trackDown.getTrackDownDateType() != 5) {
  885 + trackDownRecord1.setAppointmentDate(trackDown.getReservatDate());
  886 + }
  887 + if (trackDown.getTrackDownDateType() != 4 && trackDown.getTrackDownDateType() != 5) {
  888 + trackDownRecord1.setTrackDownDate(trackDown.getTrackDownDate());
  889 + }
  890 + if (null != trackDown.getTrackDownTransfer()) {
  891 + if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) {
  892 + trackDownRecord1.setStop("0");
  893 + } else if (3 == trackDown.getTrackDownTransfer()) {
  894 + trackDownRecord1.setStop("1");
889 895 }
890   - if (null != trackDown.getTrackDownTransfer()) {
891   - if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) {
892   - trackDownRecord1.setStop("0");
893   - } else if (3 == trackDown.getTrackDownTransfer()) {
894   - trackDownRecord1.setStop("1");
895   - }
  896 + }
  897 + //冗余产筛 预约追访时间
  898 + if (trackDown.getTrackDownDateType() == 4) {
  899 + if (trackDown.getReservatDate() != null) {
  900 + trackDownRecord1.setSieveAppointmentDate(trackDown.getReservatDate());
896 901 }
897   - //冗余产筛 预约追访时间
898   - if (trackDown.getTrackDownDateType() == 4) {
899   - if (trackDown.getReservatDate() != null) {
900   - trackDownRecord1.setSieveAppointmentDate(trackDown.getReservatDate());
901   - }
902   - if (null != trackDown.getTrackDownDate()) {
903   - trackDownRecord1.setSieveTrackDownDate(trackDown.getTrackDownDate());
904   - }
  902 + if (null != trackDown.getTrackDownDate()) {
  903 + trackDownRecord1.setSieveTrackDownDate(trackDown.getTrackDownDate());
905 904 }
906   - trackDownRecordService.updateTrackDown(trackDownRecord1, trackDownRecord.getId());
907 905 }
  906 + trackDownRecordService.updateTrackDown(trackDownRecord1, trackDownRecord.getId());
908 907 }
909 908 }
  909 +
910 910 trackDown.setId(null);
911 911 trackDown.setYn(YnEnums.YES.getId());
912 912 trackDown.setCreated(new Date());