jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c7c216dab480f1cac3234c4b1c6c4371b7453116

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

追访

Showing 1 changed file with 185 additions and 240 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ c7c216d
... ... @@ -107,8 +107,7 @@
107 107  
108 108 sieveService.addSieve(sieveResultModel);
109 109  
110   - if (StringUtils.isNotEmpty(sieveResultModel.getExamineId()) && StringUtils.isNotEmpty(sieveResultModel.getCheckerId()) )
111   - {
  110 + if (StringUtils.isNotEmpty(sieveResultModel.getExamineId()) && StringUtils.isNotEmpty(sieveResultModel.getCheckerId())) {
112 111 createSieveSms(sieveResultModel.getParentId());
113 112 }
114 113  
... ... @@ -139,9 +138,7 @@
139 138 }
140 139  
141 140  
142   -
143   - public void createSieveSms(String patientId)
144   - {
  141 + public void createSieveSms(String patientId) {
145 142 Patients patient = patientsService.findOnePatientById(patientId);
146 143 //判断医院是否启动和对应的服务项是否启用
147 144 SmsConfigModel configModel = new SmsConfigModel();
148 145  
... ... @@ -160,10 +157,9 @@
160 157 sieveApplyOrderQuery.setParentId(patientId);
161 158 sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
162 159 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
163   - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
164   - {
  160 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
165 161 SieveApplyOrderModel model = sieveApplyOrderModels.get(0);
166   - mr.setKeyword1(CommonsHelper.getHospitalName(model.getHospitalId(),organizationService));
  162 + mr.setKeyword1(CommonsHelper.getHospitalName(model.getHospitalId(), organizationService));
167 163 mr.setKeyword2(CommonsHelper.getHospitalName(model.getSieveHospitalId(), organizationService));
168 164 mr.setRemark(DateUtil.getyyyy_MM_dd1(model.getSendTime() == null ? new Date() : model.getSendTime()));
169 165 }
170 166  
... ... @@ -206,9 +202,9 @@
206 202 if (CollectionUtils.isNotEmpty(records)) {
207 203 TrackDownRecord track = records.get(0);
208 204 trackDownRecord.setId(track.getId());
209   - if (track.getTrackType()== TrackDownDateEnums.C.getId()) {
  205 + if (track.getTrackType() == TrackDownDateEnums.C.getId()) {
210 206 trackDownRecord.setTrackType(TrackDownDateEnums.I.getId());
211   - }else if(track.getTrackType()== TrackDownDateEnums.H.getId()){
  207 + } else if (track.getTrackType() == TrackDownDateEnums.H.getId()) {
212 208 trackDownRecord.setTrackType(TrackDownDateEnums.E.getId());
213 209 }
214 210 }
... ... @@ -307,8 +303,7 @@
307 303 }
308 304  
309 305  
310   - public String getSieveStatus(String patientId,String hospitalId)
311   - {
  306 + public String getSieveStatus(String patientId, String hospitalId) {
312 307  
313 308 String siveStatus = "";
314 309 SieveQuery sieveQuery = new SieveQuery();
315 310  
316 311  
317 312  
318 313  
319 314  
320 315  
321 316  
322 317  
323 318  
324 319  
325 320  
326 321  
327 322  
328 323  
329 324  
... ... @@ -317,73 +312,58 @@
317 312 sieveQuery.setParentId(patientId);
318 313 //查询产筛list
319 314 List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
320   - if (CollectionUtils.isNotEmpty(list))
321   - {
  315 + if (CollectionUtils.isNotEmpty(list)) {
322 316 SieveModel model = list.get(0);
323   - if (model.getZtfx() == null)
324   - {
  317 + if (model.getZtfx() == null) {
325 318 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
326 319 sieveApplyOrderQuery1.setParentId(patientId);
327 320 sieveApplyOrderQuery1.setHospitalId(hospitalId);
328 321 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
329 322 List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
330   - if (CollectionUtils.isEmpty(list1))
331   - {
  323 + if (CollectionUtils.isEmpty(list1)) {
332 324 siveStatus = "未产筛";
333   - }
334   - else
335   - {
  325 + } else {
336 326 siveStatus = "已申请";
337 327 }
338   - }
339   - else
340   - {
  328 + } else {
341 329 siveStatus = SieveEnums.getTitle(model.getZtfx());
342 330 }
343   - }
344   - else
345   - {
  331 + } else {
346 332 SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
347 333 sieveApplyOrderQuery1.setParentId(patientId);
348 334 sieveApplyOrderQuery1.setHospitalId(hospitalId);
349 335 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
350 336 List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
351   - if (CollectionUtils.isEmpty(list1))
352   - {
  337 + if (CollectionUtils.isEmpty(list1)) {
353 338 siveStatus = "未产筛";
354   - }
355   - else
356   - {
  339 + } else {
357 340 SieveResultQuery sieveResultQuery = new SieveResultQuery();
358 341 sieveResultQuery.setParentId(patientId);
359 342 sieveResultQuery.setYn(YnEnums.YES.getId());
360 343 List<SieveResultModel> resultModels = sieveService.queryListSieveResult(sieveResultQuery);
361   - if (CollectionUtils.isNotEmpty(resultModels))
362   - {
  344 + if (CollectionUtils.isNotEmpty(resultModels)) {
363 345  
364 346 SieveResultModel resultModel = resultModels.get(0);
365 347  
366   - List<Integer> slist =new ArrayList<>();
  348 + List<Integer> slist = new ArrayList<>();
367 349  
368   - if(StringUtils.isNotEmpty(resultModel.getTszhz())){
  350 + if (StringUtils.isNotEmpty(resultModel.getTszhz())) {
369 351 slist.add(Integer.valueOf(resultModel.getTszhz()));
370 352 }
371   - if(StringUtils.isNotEmpty(resultModel.getSjgjx())){
  353 + if (StringUtils.isNotEmpty(resultModel.getSjgjx())) {
372 354 slist.add(Integer.valueOf(resultModel.getSjgjx()));
373 355 }
374   - if(StringUtils.isNotEmpty(resultModel.getSbst())){
  356 + if (StringUtils.isNotEmpty(resultModel.getSbst())) {
375 357 slist.add(Integer.valueOf(resultModel.getSbst()));
376 358 }
377   - if(StringUtils.isNotEmpty(resultModel.getDzhpx())){
  359 + if (StringUtils.isNotEmpty(resultModel.getDzhpx())) {
378 360 slist.add(Integer.valueOf(resultModel.getDzhpx()));
379 361 }
380   - if(StringUtils.isNotEmpty(resultModel.getStzhz13())){
  362 + if (StringUtils.isNotEmpty(resultModel.getStzhz13())) {
381 363 slist.add(Integer.valueOf(resultModel.getStzhz13()));
382 364 }
383 365 siveStatus = SieveEnums.getTitle(Collections.max(slist));
384   - }
385   - else
386   - {
  366 + } else {
387 367 siveStatus = "已申请";
388 368 }
389 369 }
... ... @@ -399,7 +379,7 @@
399 379 * @param cqSieveQueryRequest
400 380 * @return
401 381 */
402   - public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage,boolean isSieveLagManage) {
  382 + public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage, boolean isSieveLagManage) {
403 383 List<SieveListResult> data = new ArrayList<>();
404 384 SieveQuery sieveQuery = new SieveQuery();
405 385 sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo());
406 386  
407 387  
408 388  
409 389  
410 390  
... ... @@ -458,40 +438,30 @@
458 438 sieveQuery.setNeed(needPage);
459 439 String hospitalId = autoMatchFacade.getHospitalId(userId);
460 440  
461   - if(isSieveLagManage)
462   - {
463   - if (StringUtils.isNotEmpty(cqSieveQueryRequest.getApplyHospitalId()))
464   - {
  441 + if (isSieveLagManage) {
  442 + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getApplyHospitalId())) {
465 443 sieveQuery.setApplyHospitalId(cqSieveQueryRequest.getApplyHospitalId());
466 444 }
467 445 sieveQuery.setSieveHospitalId(hospitalId);
468   - }
469   - else
470   - {
  446 + } else {
471 447 sieveQuery.setHospitalId(hospitalId);
472 448 }
473 449  
474   - if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber()))
475   - {
  450 + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber())) {
476 451 List<String> parentIds = new ArrayList<>();
477 452 SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
478 453 sieveApplyOrderQuery.setSieveHospitalId(hospitalId);
479 454 sieveApplyOrderQuery.setNumber(cqSieveQueryRequest.getNumber());
480 455 sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
481 456 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
482   - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
483   - {
484   - for(SieveApplyOrderModel model : sieveApplyOrderModels)
485   - {
  457 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
  458 + for (SieveApplyOrderModel model : sieveApplyOrderModels) {
486 459 parentIds.add(model.getParentId());
487 460 }
488 461 }
489   - if (CollectionUtils.isNotEmpty(parentIds))
490   - {
  462 + if (CollectionUtils.isNotEmpty(parentIds)) {
491 463 sieveQuery.setParentIds(parentIds);
492   - }
493   - else
494   - {
  464 + } else {
495 465 return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo());
496 466 }
497 467 }
... ... @@ -507,7 +477,7 @@
507 477 if (end > list.size()) {
508 478 end = list.size();
509 479 }
510   - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService,organizationService)));
  480 + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService)));
511 481 }
512 482 for (Future f : listFuture) {
513 483 try {
... ... @@ -522,7 +492,7 @@
522 492 public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
523 493 try {
524 494  
525   - BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null,false);
  495 + BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null, false);
526 496  
527 497 List<SieveListResult> list = listResponse.getData();
528 498 List<Map<String, Object>> datas = new ArrayList<>();
529 499  
530 500  
531 501  
532 502  
533 503  
534 504  
... ... @@ -628,38 +598,32 @@
628 598 }
629 599  
630 600 /**
631   - * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案
  601 + * 添加查询前 查询孕妇基本信息 如果孕妇没有在本院建档就添加隐藏档案
  602 + *
632 603 * @param cardNo
633 604 * @param userId
634 605 * @return
635 606 */
636   - public BaseResponse querySievePatientInfo(String cardNo,String vcCardNo, Integer userId) {
  607 + public BaseResponse querySievePatientInfo(String cardNo, String vcCardNo, Integer userId) {
637 608  
638 609 String hospitalId = autoMatchFacade.getHospitalId(userId);
639 610  
640 611  
641   -
642 612 PatientsQuery patientsQuery = new PatientsQuery();
643 613 patientsQuery.setHospitalId(hospitalId);
644 614 patientsQuery.setYn(YnEnums.YES.getId());
645   - if (StringUtils.isNotEmpty(cardNo))
646   - {
  615 + if (StringUtils.isNotEmpty(cardNo)) {
647 616 patientsQuery.setPhoneOrCert(cardNo);
648   - }
649   - else if (StringUtils.isNotEmpty(vcCardNo))
650   - {
  617 + } else if (StringUtils.isNotEmpty(vcCardNo)) {
651 618 patientsQuery.setVcCardNo(vcCardNo);
652 619 }
653 620  
654 621  
655 622 List<Patients> localPatients = patientsService.queryPatient(patientsQuery);
656 623 Patients pat = null;
657   - if (CollectionUtils.isNotEmpty(localPatients))
658   - {
  624 + if (CollectionUtils.isNotEmpty(localPatients)) {
659 625 pat = localPatients.get(0);
660   - }
661   - else
662   - {
  626 + } else {
663 627 patientsQuery.setHospitalId(null);
664 628 List<Patients> areaPatients = patientsService.queryPatient(patientsQuery);
665 629 if (CollectionUtils.isNotEmpty(areaPatients)) {
... ... @@ -669,9 +633,7 @@
669 633 String id = antenatalExaminationFacade.handHideBuild(pat.getPid(), pat.getId(), userId, 1);
670 634  
671 635 pat = patientsService.findOnePatientById(id);
672   - }
673   - else
674   - {
  636 + } else {
675 637 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有档案，请建档后申请产筛");
676 638 }
677 639 }
... ... @@ -687,8 +649,7 @@
687 649 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
688 650  
689 651 List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
690   - if (CollectionUtils.isNotEmpty(list))
691   - {
  652 + if (CollectionUtils.isNotEmpty(list)) {
692 653 return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛！");
693 654 }
694 655  
... ... @@ -702,8 +663,7 @@
702 663 antExChuQuery.setYn(YnEnums.YES.getId());
703 664  
704 665 List<AntExChuModel> list = antenatalExaminationService.queryAntExChu(antExChuQuery);
705   - if (CollectionUtils.isNotEmpty(list))
706   - {
  666 + if (CollectionUtils.isNotEmpty(list)) {
707 667 AntExChuModel chuModel = list.get(0);
708 668 patientBaseResult.setWeight(chuModel.getYqWeight());
709 669 }
710 670  
... ... @@ -711,9 +671,9 @@
711 671 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
712 672 }
713 673  
714   - public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) {
  674 + public BaseResponse getSieveApplyInfo(String parentId, Integer userId, Integer type) {
715 675  
716   - Map<String,Object> map = new HashMap<>();
  676 + Map<String, Object> map = new HashMap<>();
717 677 //String hospitalId = autoMatchFacade.getHospitalId(userId);
718 678  
719 679 PatientsQuery patientsQuery = new PatientsQuery();
... ... @@ -727,9 +687,8 @@
727 687  
728 688 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
729 689  
730   - if (CollectionUtils.isNotEmpty(localPatients))
731   - {
732   - Patients pat = localPatients.get(0);
  690 + if (CollectionUtils.isNotEmpty(localPatients)) {
  691 + Patients pat = localPatients.get(0);
733 692 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false);
734 693 PatientBaseResult patientBaseResult = new PatientBaseResult();
735 694 patientBaseResult.convert(pat);
736 695  
737 696  
738 697  
739 698  
740 699  
741 700  
742 701  
743 702  
744 703  
745 704  
746 705  
747 706  
748 707  
749 708  
750 709  
751 710  
752 711  
... ... @@ -741,95 +700,89 @@
741 700 map.put("patientInfo", patientBaseResult);
742 701 }
743 702  
744   - if (type == 4)
745   - {
  703 + if (type == 4) {
746 704  
747   - Map<String,Object> sieveResultEditInfo = new HashMap<>();
  705 + Map<String, Object> sieveResultEditInfo = new HashMap<>();
748 706 SieveResultQuery sieveResultQuery = new SieveResultQuery();
749 707 sieveResultQuery.setParentId(parentId);
750 708 sieveResultQuery.setYn(YnEnums.YES.getId());
751 709 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
752   - if (CollectionUtils.isNotEmpty(list))
753   - {
  710 + if (CollectionUtils.isNotEmpty(list)) {
754 711 SieveResultModel model = list.get(0);
755   - sieveResultEditInfo.put("id",model.getId());
756   - sieveResultEditInfo.put("hcg",model.getHcg() != null ? model.getHcg() : "");
757   - sieveResultEditInfo.put("hcgMom",model.getHcgMom() != null ? model.getHcgMom() : "");
758   - sieveResultEditInfo.put("hafp",model.getHafp() != null ? model.getHafp() : "");
759   - sieveResultEditInfo.put("hafpMom",model.getHafpMom() != null ? model.getHafpMom() : "");
  712 + sieveResultEditInfo.put("id", model.getId());
  713 + sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() : "");
  714 + sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : "");
  715 + sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() : "");
  716 + sieveResultEditInfo.put("hafpMom", model.getHafpMom() != null ? model.getHafpMom() : "");
760 717 sieveResultEditInfo.put("examineId", model.getExamineId());
761   - sieveResultEditInfo.put("checkerId",model.getCheckerId());
762   - sieveResultEditInfo.put("resultTime",DateUtil.getyyyy_MM_dd(model.getResultTime()));
  718 + sieveResultEditInfo.put("checkerId", model.getCheckerId());
  719 + sieveResultEditInfo.put("resultTime", DateUtil.getyyyy_MM_dd(model.getResultTime()));
763 720  
764   - sieveResultEditInfo.put("tszhz",model.getTszhz());
765   - sieveResultEditInfo.put("sbst",model.getSbst());
766   - sieveResultEditInfo.put("stzhz13",model.getStzhz13());
767   - sieveResultEditInfo.put("sjgjx",model.getSjgjx());
  721 + sieveResultEditInfo.put("tszhz", model.getTszhz());
  722 + sieveResultEditInfo.put("sbst", model.getSbst());
  723 + sieveResultEditInfo.put("stzhz13", model.getStzhz13());
  724 + sieveResultEditInfo.put("sjgjx", model.getSjgjx());
768 725  
769 726  
770   - sieveResultEditInfo.put("tszhzValue",model.getTszhzValue());
771   - sieveResultEditInfo.put("sbstValue",model.getSbstValue());
772   - sieveResultEditInfo.put("stzhz13Value",model.getStzhz13Value());
773   - sieveResultEditInfo.put("sjgjxValue",model.getSjgjxValue());
774   - sieveResultEditInfo.put("publishName",model.getPublishName());
  727 + sieveResultEditInfo.put("tszhzValue", model.getTszhzValue());
  728 + sieveResultEditInfo.put("sbstValue", model.getSbstValue());
  729 + sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value());
  730 + sieveResultEditInfo.put("sjgjxValue", model.getSjgjxValue());
  731 + sieveResultEditInfo.put("publishName", model.getPublishName());
775 732 }
776   - map.put("sieveResultEditInfo",sieveResultEditInfo);
777   - }
778   - else
779   - {
  733 + map.put("sieveResultEditInfo", sieveResultEditInfo);
  734 + } else {
780 735 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
781   - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
782   - {
783   - Map<String,Object> result = new HashMap<>();
  736 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
  737 + Map<String, Object> result = new HashMap<>();
784 738  
785   - Map<String,Object> viewInfo = new HashMap<>();
  739 + Map<String, Object> viewInfo = new HashMap<>();
786 740 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
787 741  
788   - result.put("id",sieveApply.getId());
789   - result.put("parentId",sieveApply.getParentId());
  742 + result.put("id", sieveApply.getId());
  743 + result.put("parentId", sieveApply.getParentId());
790 744  
791   - result.put("check",sieveApply.getCheckItem());
792   - result.put("guide",sieveApply.getGuide());
793   - result.put("checkDate",sieveApply.getCheckDate());
794   - result.put("applyDoctor",sieveApply.getApplyDoctor());
795   - result.put("hospitalId",sieveApply.getHospitalId());
796   - result.put("applyTime",DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime()));
797   - result.put("birth",DateUtil.getyyyy_MM_dd(sieveApply.getBirth()));
798   - result.put("weight",sieveApply.getWeight());
799   - result.put("lastMenses",DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
800   - result.put("number",sieveApply.getNumber());
801   - result.put("collectionDoctorId",sieveApply.getCollectionDoctorId());
802   - result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
803   - result.put("crl",sieveApply.getCrl());
804   - result.put("bpd",sieveApply.getBpd());
805   - result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
806   - result.put("historyBirth",sieveApply.getHistoryBirth());
807   - result.put("pastHistory",sieveApply.getPastHistory());
808   - result.put("sieveHospitalId",sieveApply.getSieveHospitalId());
809   - result.put("sendDoctor",sieveApply.getSendDoctor());
810   - result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
811   - result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
812   - result.put("mensesDay",sieveApply.getMensesDay());
813   - result.put("mensesWeek",sieveApply.getMensesWeek());
814   - result.put("experimentNum","");
  745 + result.put("check", sieveApply.getCheckItem());
  746 + result.put("guide", sieveApply.getGuide());
  747 + result.put("checkDate", sieveApply.getCheckDate());
  748 + result.put("applyDoctor", sieveApply.getApplyDoctor());
  749 + result.put("hospitalId", sieveApply.getHospitalId());
  750 + result.put("applyTime", DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime()));
  751 + result.put("birth", DateUtil.getyyyy_MM_dd(sieveApply.getBirth()));
  752 + result.put("weight", sieveApply.getWeight());
  753 + result.put("lastMenses", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
  754 + result.put("number", sieveApply.getNumber());
  755 + result.put("collectionDoctorId", sieveApply.getCollectionDoctorId());
  756 + result.put("collectionDate", DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
  757 + result.put("crl", sieveApply.getCrl());
  758 + result.put("bpd", sieveApply.getBpd());
  759 + result.put("bcCheckDate", DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
  760 + result.put("historyBirth", sieveApply.getHistoryBirth());
  761 + result.put("pastHistory", sieveApply.getPastHistory());
  762 + result.put("sieveHospitalId", sieveApply.getSieveHospitalId());
  763 + result.put("sendDoctor", sieveApply.getSendDoctor());
  764 + result.put("sendTime", DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
  765 + result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
  766 + result.put("mensesDay", sieveApply.getMensesDay());
  767 + result.put("mensesWeek", sieveApply.getMensesWeek());
  768 + result.put("experimentNum", "");
815 769  
816   - map.put("sieveApplyInfo",result);
  770 + map.put("sieveApplyInfo", result);
817 771  
818   - if (type == 1 || type == 3)
819   - {
820   - String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(),usersService);
821   - viewInfo.put("applyDoctorName",applyDoctorName);
  772 + if (type == 1 || type == 3) {
  773 + String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(), usersService);
  774 + viewInfo.put("applyDoctorName", applyDoctorName);
822 775  
823   - String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(),usersService);
824   - viewInfo.put("collectionDoctorName",collectionDoctorName);
  776 + String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService);
  777 + viewInfo.put("collectionDoctorName", collectionDoctorName);
825 778  
826   - String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService);
827   - viewInfo.put("sendDoctorName",sendDoctorName);
  779 + String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService);
  780 + viewInfo.put("sendDoctorName", sendDoctorName);
828 781  
829   - String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(),organizationService);
  782 + String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService);
830 783 viewInfo.put("applyHospitalName", applyHospitalName);
831 784  
832   - String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService);
  785 + String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(), organizationService);
833 786 viewInfo.put("currentHospitalName", currentHospitalName);
834 787  
835 788 String isTire = "";
836 789  
837 790  
838 791  
839 792  
840 793  
841 794  
842 795  
843 796  
844 797  
845 798  
846 799  
847 800  
848 801  
849 802  
850 803  
851 804  
852 805  
853 806  
854 807  
... ... @@ -838,82 +791,74 @@
838 791 antExChuQuery1.setParentId(parentId);
839 792 antExChuQuery1.setYn(YnEnums.YES.getId());
840 793 List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
841   - if (CollectionUtils.isNotEmpty(data1))
842   - {
  794 + if (CollectionUtils.isNotEmpty(data1)) {
843 795 AntExChuModel chuModel = data1.get(0);
844   - if (StringUtils.isNotEmpty(chuModel.getTireNumber()))
845   - {
846   - isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否";
  796 + if (StringUtils.isNotEmpty(chuModel.getTireNumber())) {
  797 + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是" : "否";
847 798 tireNumber = chuModel.getTireNumber();
848 799 }
849 800 }
850 801 map.put("isTire", isTire);
851   - map.put("tireNumber",tireNumber);
852   - map.put("viewInfo",viewInfo);
  802 + map.put("tireNumber", tireNumber);
  803 + map.put("viewInfo", viewInfo);
853 804  
854   - if (type == 3)
855   - {
856   - Map<String,Object> sieveResultInfo = new HashMap<>();
  805 + if (type == 3) {
  806 + Map<String, Object> sieveResultInfo = new HashMap<>();
857 807  
858 808 SieveResultQuery sieveResultQuery = new SieveResultQuery();
859 809 sieveResultQuery.setParentId(parentId);
860 810 sieveResultQuery.setYn(YnEnums.YES.getId());
861 811 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
862   - if (CollectionUtils.isNotEmpty(list))
863   - {
  812 + if (CollectionUtils.isNotEmpty(list)) {
864 813 SieveResultModel sieveResultModel = list.get(0);
865   - sieveResultInfo.put("hcg",sieveResultModel.getHcg() != null ? sieveResultModel.getHcg()+"ng/ml" : "");
866   - sieveResultInfo.put("hcgMom",sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : "");
867   - sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : "");
868   - sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
  814 + sieveResultInfo.put("hcg", sieveResultModel.getHcg() != null ? sieveResultModel.getHcg() + "ng/ml" : "");
  815 + sieveResultInfo.put("hcgMom", sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : "");
  816 + sieveResultInfo.put("hafp", sieveResultModel.getHafp() != null ? sieveResultModel.getHafp() + "U/ml" : "");
  817 + sieveResultInfo.put("hafpMom", sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
869 818 sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService));
870   - sieveResultInfo.put("checkerName",CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
871   - sieveResultInfo.put("reportTime",DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
  819 + sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
  820 + sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
872 821  
873 822 String tszhzValue = "";
874   - if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0)
875   - {
  823 + if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) {
876 824  
877 825 String valueOne = sieveResultModel.getTszhzValue().get("valueOne");
878 826 String valueTwo = sieveResultModel.getTszhzValue().get("valueTwo");
879   - tszhzValue = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险");
  827 + tszhzValue = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险");
880 828 }
881   - sieveResultInfo.put("tszhz",tszhzValue);
  829 + sieveResultInfo.put("tszhz", tszhzValue);
882 830  
883 831  
884 832 String sbst = "";
885   - if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0)
886   - {
  833 + if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0) {
887 834  
888 835 String valueOne = sieveResultModel.getSbstValue().get("valueOne");
889 836 String valueTwo = sieveResultModel.getSbstValue().get("valueTwo");
890   - sbst = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险");
  837 + sbst = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险");
891 838 }
892   - sieveResultInfo.put("sbst",sbst);
  839 + sieveResultInfo.put("sbst", sbst);
893 840  
894 841  
895   - String sjgjx = "";
896   - if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0)
897   - {
  842 + String sjgjx = "";
  843 + if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0) {
898 844  
899 845 String valueOne = sieveResultModel.getSjgjxValue().get("valueOne");
900 846 String valueTwo = sieveResultModel.getSjgjxValue().get("valueTwo");
901   - sjgjx = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险");
  847 + sjgjx = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险");
902 848 }
903   - sieveResultInfo.put("sjgjx",sjgjx);
  849 + sieveResultInfo.put("sjgjx", sjgjx);
904 850  
905   - String stzhz13 = "";
906   - if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0)
907   - {
  851 + String stzhz13 = "";
  852 + if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0) {
908 853 String valueOne = sieveResultModel.getStzhz13Value().get("valueOne");
909 854 String valueTwo = sieveResultModel.getStzhz13Value().get("valueTwo");
910   - stzhz13 = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险");
  855 + stzhz13 = valueOne + "/" + valueTwo + ("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险");
911 856 }
912   - sieveResultInfo.put("stzhz13",stzhz13);
  857 + sieveResultInfo.put("stzhz13", stzhz13);
913 858  
914 859  
915 860 }
916   - map.put("sieveResultInfo",sieveResultInfo);
  861 + map.put("sieveResultInfo", sieveResultInfo);
917 862 }
918 863 }
919 864 }
920 865  
... ... @@ -950,12 +895,12 @@
950 895  
951 896 if (type == 2) {//查看报告
952 897  
953   - Map<String, Object> sieveResultEditInfo = new HashMap<>();
  898 + Map<String, Object> sieveResultEditInfo = new HashMap<>();
954 899 List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
955 900 if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
956 901 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
957 902 String hostName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService);
958   - sieveResultEditInfo.put("reportHostName",hostName);
  903 + sieveResultEditInfo.put("reportHostName", hostName);
959 904 }
960 905 SieveResultQuery sieveResultQuery = new SieveResultQuery();
961 906 sieveResultQuery.setParentId(parentId);
... ... @@ -1023,7 +968,7 @@
1023 968 Map<String, Object> result = new HashMap<>();
1024 969 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
1025 970 String hostName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(), organizationService);
1026   - result.put("reportHostName",hostName);
  971 + result.put("reportHostName", hostName);
1027 972 result.put("patientInfo", patientBaseResult);
1028 973 result.put("weight", sieveApply.getWeight());
1029 974 result.put("lastMenstr", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
1030 975  
1031 976  
1032 977  
1033 978  
1034 979  
... ... @@ -1037,49 +982,52 @@
1037 982 result.put("historyBirth", sieveApply.getHistoryBirth());//生育史
1038 983  
1039 984 Map<String, String> historMap = sieveApply.getHistoryBirth();
1040   - if(historMap.containsKey("tshr")){
1041   - if("true".equals(historMap.get("tshr"))){
1042   - historMap.put("tshr","是");
1043   - }else{
1044   - historMap.put("tshr","否");
  985 + if (historMap != null) {
  986 +
  987 +
  988 + if (historMap.containsKey("tshr")) {
  989 + if ("true".equals(historMap.get("tshr"))) {
  990 + historMap.put("tshr", "是");
  991 + } else {
  992 + historMap.put("tshr", "否");
  993 + }
1045 994 }
1046   - }
1047   - if(historMap.containsKey("rsthr")){
1048   - if("true".equals(historMap.get("rsthr"))){
1049   - historMap.put("rsthr","是");
1050   - }else{
1051   - historMap.put("rsthr","否");
  995 + if (historMap.containsKey("rsthr")) {
  996 + if ("true".equals(historMap.get("rsthr"))) {
  997 + historMap.put("rsthr", "是");
  998 + } else {
  999 + historMap.put("rsthr", "否");
  1000 + }
1052 1001 }
1053   - }
1054   - if(historMap.containsKey("sjhr")){
1055   - if("true".equals(historMap.get("sjhr"))){
1056   - historMap.put("sjhr","是");
1057   - }else{
1058   - historMap.put("sjhr","否");
  1002 + if (historMap.containsKey("sjhr")) {
  1003 + if ("true".equals(historMap.get("sjhr"))) {
  1004 + historMap.put("sjhr", "是");
  1005 + } else {
  1006 + historMap.put("sjhr", "否");
  1007 + }
1059 1008 }
1060   - }
1061   - if(historMap.containsKey("qt")){
1062   - if("true".equals(historMap.get("qt"))){
1063   - historMap.put("qt","是："+historMap.get("qtText"));
1064   - }else{
1065   - historMap.put("qt","否");
  1009 + if (historMap.containsKey("qt")) {
  1010 + if ("true".equals(historMap.get("qt"))) {
  1011 + historMap.put("qt", "是：" + historMap.get("qtText"));
  1012 + } else {
  1013 + historMap.put("qt", "否");
  1014 + }
1066 1015 }
1067 1016 }
1068 1017  
1069   -
1070   - result.put("pastHistory",sieveApply.getPastHistory());
1071   - if(result.containsKey("pastHistory")){
1072   - if("yes".equals(result.get("pastHistory"))){
1073   - result.put("pastHistory","是");
1074   - }else{
1075   - result.put("pastHistory","否");
  1018 + result.put("pastHistory", sieveApply.getPastHistory());
  1019 + if (result.containsKey("pastHistory")) {
  1020 + if ("yes".equals(result.get("pastHistory"))) {
  1021 + result.put("pastHistory", "是");
  1022 + } else {
  1023 + result.put("pastHistory", "否");
1076 1024 }
1077 1025 }
1078 1026  
1079 1027  
1080 1028 String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService);
1081 1029 result.put("cxys", collectionDoctorName);
1082   - result.put("experimentNum","");
  1030 + result.put("experimentNum", "");
1083 1031  
1084 1032 String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(), usersService);
1085 1033 result.put("sjys", sendDoctorName);
... ... @@ -1096,7 +1044,7 @@
1096 1044 if (StringUtils.isNotEmpty(chuModel.getTireNumber())) {
1097 1045 isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是" : "否";
1098 1046 }
1099   - result.put("embryoNum", chuModel.getTireNumber()==null?"0":chuModel.getTireNumber());
  1047 + result.put("embryoNum", chuModel.getTireNumber() == null ? "0" : chuModel.getTireNumber());
1100 1048 result.put("lastMenstr", chuModel.getLastMenses());
1101 1049 result.put("polyember", isTire);
1102 1050 }
1103 1051  
1104 1052  
... ... @@ -1104,20 +1052,17 @@
1104 1052 }
1105 1053 }
1106 1054 return baseResponse;
1107   -}
  1055 + }
1108 1056  
1109 1057 public BaseResponse reviceSieve(List<String> parentIds, Integer userId) {
1110   - if (CollectionUtils.isNotEmpty(parentIds))
1111   - {
  1058 + if (CollectionUtils.isNotEmpty(parentIds)) {
1112 1059 SieveQuery query = new SieveQuery();
1113 1060 query.setParentIds(parentIds);
1114 1061 query.setYn(YnEnums.YES.getId());
1115 1062 List<SieveModel> list = sieveService.queryList(query);
1116 1063  
1117   - if (CollectionUtils.isNotEmpty(list))
1118   - {
1119   - for (SieveModel sieve : list)
1120   - {
  1064 + if (CollectionUtils.isNotEmpty(list)) {
  1065 + for (SieveModel sieve : list) {
1121 1066 sieve.setReviceStatus(2);
1122 1067 sieveService.updateOneChanQianDiaSieve(sieve);
1123 1068 }