jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9d38ecd3eb504d6eee3c3f38a54dd976eaff12f7

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

产筛

Showing 4 changed files with 158 additions and 90 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ 9d38ecd
... ... @@ -89,11 +89,10 @@
89 89 return sieveFacade.querySievePatientInfo(cardNo, vcCardNo, loginState.getId());
90 90 }
91 91  
92   -
93 92 /**
94 93 * 查看申请单
95 94 *
96   - * type 1 查看 2 修改 3 结果看
  95 + * type 1 查看 2 产筛申请修改 3 结果看 4，产筛结果修改查询
97 96 * @param parentId
98 97 * @param request
99 98 * @return
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 9d38ecd
... ... @@ -651,107 +651,176 @@
651 651  
652 652  
653 653  
654   - List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
655   - if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
  654 + if (type == 4)
656 655 {
657   - Map<String,Object> result = new HashMap<>();
658 656  
659   - Map<String,Object> viewInfo = new HashMap<>();
660   - SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
  657 + Map<String,Object> sieveResultEditInfo = new HashMap<>();
  658 + SieveResultQuery sieveResultQuery = new SieveResultQuery();
  659 + sieveResultQuery.setParentId(parentId);
  660 + sieveResultQuery.setYn(YnEnums.YES.getId());
  661 + List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
  662 + if (CollectionUtils.isNotEmpty(list))
  663 + {
  664 + SieveResultModel model = list.get(0);
  665 + sieveResultEditInfo.put("hcg",model.gethCg() != null ? model.gethCg() : "");
  666 + sieveResultEditInfo.put("hcgMom",model.gethCgMom() != null ? model.gethCgMom() : "");
  667 + sieveResultEditInfo.put("hafp",model.getHafp() != null ? model.getHafp() : "");
  668 + sieveResultEditInfo.put("hafpMom",model.getHafpMom() != null ? model.getHafpMom() : "");
  669 + sieveResultEditInfo.put("examineId", model.getExamineId());
  670 + sieveResultEditInfo.put("checkerId",model.getCheckerId());
  671 + sieveResultEditInfo.put("reportTime",DateUtil.getyyyy_MM_dd(model.getResultTime()));
661 672  
662   - result.put("id",sieveApply.getId());
663   - result.put("parentId",sieveApply.getParentId());
  673 + sieveResultEditInfo.put("tszh",model.getTszhz());
  674 + sieveResultEditInfo.put("sbst",model.getSbst());
  675 + sieveResultEditInfo.put("stzhz13",model.getStzhz13());
  676 + sieveResultEditInfo.put("sjgjx",model.getSjgjx());
  677 + }
  678 + map.put("sieveResultEditInfo",sieveResultEditInfo);
  679 + }
  680 + else
  681 + {
  682 + List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
  683 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
  684 + {
  685 + Map<String,Object> result = new HashMap<>();
664 686  
665   - result.put("check",sieveApply.getCheckItem());
666   - result.put("guide",sieveApply.getGuide());
667   - result.put("checkDate",sieveApply.getCheckDate());
668   - result.put("applyDoctor",sieveApply.getApplyDoctor());
669   - result.put("hospitalId",sieveApply.getHospitalId());
670   - result.put("applyTime",DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime()));
671   - result.put("birth",DateUtil.getyyyy_MM_dd(sieveApply.getBirth()));
672   - result.put("weight",sieveApply.getWeight());
673   - result.put("lastMenses",DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
674   - result.put("number",sieveApply.getNumber());
675   - result.put("collectionDoctorId",sieveApply.getCollectionDoctorId());
676   - result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
677   - result.put("crl",sieveApply.getCrl());
678   - result.put("bpd",sieveApply.getBpd());
679   - result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
680   - result.put("historyBirth",sieveApply.getHistoryBirth());
681   - result.put("pastHistory",sieveApply.getPastHistory());
682   - result.put("applyHospitalId",sieveApply.getApplyHospitalId());
683   - result.put("sendDoctor",sieveApply.getSendDoctor());
684   - result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
685   - result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
686   - result.put("mensesDay",sieveApply.getMensesDay());
687   - result.put("mensesWeek",sieveApply.getMensesWeek());
688   - result.put("experimentNum","");
  687 + Map<String,Object> viewInfo = new HashMap<>();
  688 + SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
689 689  
690   - map.put("sieveApplyInfo",result);
  690 + result.put("id",sieveApply.getId());
  691 + result.put("parentId",sieveApply.getParentId());
691 692  
692   - if (type == 1 || type == 3)
693   - {
694   - String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(),usersService);
695   - viewInfo.put("applyDoctorName",applyDoctorName);
  693 + result.put("check",sieveApply.getCheckItem());
  694 + result.put("guide",sieveApply.getGuide());
  695 + result.put("checkDate",sieveApply.getCheckDate());
  696 + result.put("applyDoctor",sieveApply.getApplyDoctor());
  697 + result.put("hospitalId",sieveApply.getHospitalId());
  698 + result.put("applyTime",DateUtil.getyyyy_MM_dd(sieveApply.getApplyTime()));
  699 + result.put("birth",DateUtil.getyyyy_MM_dd(sieveApply.getBirth()));
  700 + result.put("weight",sieveApply.getWeight());
  701 + result.put("lastMenses",DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses()));
  702 + result.put("number",sieveApply.getNumber());
  703 + result.put("collectionDoctorId",sieveApply.getCollectionDoctorId());
  704 + result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate()));
  705 + result.put("crl",sieveApply.getCrl());
  706 + result.put("bpd",sieveApply.getBpd());
  707 + result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate()));
  708 + result.put("historyBirth",sieveApply.getHistoryBirth());
  709 + result.put("pastHistory",sieveApply.getPastHistory());
  710 + result.put("applyHospitalId",sieveApply.getApplyHospitalId());
  711 + result.put("sendDoctor",sieveApply.getSendDoctor());
  712 + result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
  713 + result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
  714 + result.put("mensesDay",sieveApply.getMensesDay());
  715 + result.put("mensesWeek",sieveApply.getMensesWeek());
  716 + result.put("experimentNum","");
696 717  
697   - String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(),usersService);
698   - viewInfo.put("collectionDoctorName",collectionDoctorName);
  718 + map.put("sieveApplyInfo",result);
699 719  
700   - String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService);
701   - viewInfo.put("sendDoctorName",sendDoctorName);
  720 + if (type == 1 || type == 3)
  721 + {
  722 + String applyDoctorName = CommonsHelper.getUserName(sieveApply.getApplyDoctor(),usersService);
  723 + viewInfo.put("applyDoctorName",applyDoctorName);
702 724  
703   - String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getApplyHospitalId(),organizationService);
704   - viewInfo.put("applyHospitalName", applyHospitalName);
  725 + String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(),usersService);
  726 + viewInfo.put("collectionDoctorName",collectionDoctorName);
705 727  
706   - String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService);
707   - viewInfo.put("currentHospitalName", currentHospitalName);
  728 + String sendDoctorName = CommonsHelper.getUserName(sieveApply.getSendDoctor(),usersService);
  729 + viewInfo.put("sendDoctorName",sendDoctorName);
708 730  
709   - String isTire = "";
710   - String tireNumber = "";
711   - AntExChuQuery antExChuQuery1 = new AntExChuQuery();
712   - antExChuQuery1.setParentId(parentId);
713   - antExChuQuery1.setYn(YnEnums.YES.getId());
714   - List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
715   - if (CollectionUtils.isNotEmpty(data1))
716   - {
717   - AntExChuModel chuModel = data1.get(0);
718   - if (StringUtils.isNotEmpty(chuModel.getTireNumber()))
  731 + String applyHospitalName = CommonsHelper.getHospitalName(sieveApply.getApplyHospitalId(),organizationService);
  732 + viewInfo.put("applyHospitalName", applyHospitalName);
  733 +
  734 + String currentHospitalName = CommonsHelper.getHospitalName(sieveApply.getHospitalId(),organizationService);
  735 + viewInfo.put("currentHospitalName", currentHospitalName);
  736 +
  737 + String isTire = "";
  738 + String tireNumber = "";
  739 + AntExChuQuery antExChuQuery1 = new AntExChuQuery();
  740 + antExChuQuery1.setParentId(parentId);
  741 + antExChuQuery1.setYn(YnEnums.YES.getId());
  742 + List<AntExChuModel> data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1);
  743 + if (CollectionUtils.isNotEmpty(data1))
719 744 {
720   - isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否";
721   - tireNumber = chuModel.getTireNumber();
  745 + AntExChuModel chuModel = data1.get(0);
  746 + if (StringUtils.isNotEmpty(chuModel.getTireNumber()))
  747 + {
  748 + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否";
  749 + tireNumber = chuModel.getTireNumber();
  750 + }
722 751 }
723   - }
724   - map.put("isTire", isTire);
725   - map.put("tireNumber",tireNumber);
726   - map.put("viewInfo",viewInfo);
  752 + map.put("isTire", isTire);
  753 + map.put("tireNumber",tireNumber);
  754 + map.put("viewInfo",viewInfo);
727 755  
728   - if (type == 3)
729   - {
730   - Map<String,Object> sieveResultInfo = new HashMap<>();
731   -
732   - SieveResultQuery sieveResultQuery = new SieveResultQuery();
733   - sieveResultQuery.setParentId(parentId);
734   - sieveResultQuery.setYn(YnEnums.YES.getId());
735   - List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
736   - if (CollectionUtils.isNotEmpty(list))
  756 + if (type == 3)
737 757 {
738   - SieveResultModel sieveResultModel = list.get(0);
739   - sieveResultInfo.put("hcg",sieveResultModel.gethCg() != null ? sieveResultModel.gethCg()+"ng/ml" : "");
740   - sieveResultInfo.put("hcgMom",sieveResultModel.gethCgMom() != null ? sieveResultModel.gethCgMom() : "");
741   - sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : "");
742   - sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
743   - sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(),usersService));
744   - sieveResultInfo.put("checkerName",CommonsHelper.getUserName(sieveResultModel.getCheckerId(),usersService));
745   - sieveResultInfo.put("reportTime",DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
  758 + Map<String,Object> sieveResultInfo = new HashMap<>();
746 759  
747   - }
  760 + SieveResultQuery sieveResultQuery = new SieveResultQuery();
  761 + sieveResultQuery.setParentId(parentId);
  762 + sieveResultQuery.setYn(YnEnums.YES.getId());
  763 + List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
  764 + if (CollectionUtils.isNotEmpty(list))
  765 + {
  766 + SieveResultModel sieveResultModel = list.get(0);
  767 + sieveResultInfo.put("hcg",sieveResultModel.gethCg() != null ? sieveResultModel.gethCg()+"ng/ml" : "");
  768 + sieveResultInfo.put("hcgMom",sieveResultModel.gethCgMom() != null ? sieveResultModel.gethCgMom() : "");
  769 + sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : "");
  770 + sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
  771 + sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService));
  772 + sieveResultInfo.put("checkerName",CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService));
  773 + sieveResultInfo.put("reportTime",DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
748 774  
749   - map.put("sieveResultInfo",sieveResultInfo);
750   - }
751   - }
  775 + String tszhzValue = "";
  776 + if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0)
  777 + {
752 778  
  779 + String valueOne = sieveResultModel.getTszhzValue().get("valueOne");
  780 + String valueTwo = sieveResultModel.getTszhzValue().get("valueTwo");
  781 + tszhzValue = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getTszhz()) ? "低风险" : "1".equals(sieveResultModel.getTszhz()) ? "临界值" : "高风险");
  782 + }
  783 + sieveResultInfo.put("tszhz",tszhzValue);
753 784  
  785 +
  786 + String sbst = "";
  787 + if (StringUtils.isNotEmpty(sieveResultModel.getSbst()) && sieveResultModel.getSbstValue() != null && sieveResultModel.getSbstValue().size() > 0)
  788 + {
  789 +
  790 + String valueOne = sieveResultModel.getSbstValue().get("valueOne");
  791 + String valueTwo = sieveResultModel.getSbstValue().get("valueTwo");
  792 + sbst = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSbst()) ? "低风险" : "1".equals(sieveResultModel.getSbst()) ? "临界值" : "高风险");
  793 + }
  794 + sieveResultInfo.put("sbst",sbst);
  795 +
  796 +
  797 + String sjgjx = "";
  798 + if (StringUtils.isNotEmpty(sieveResultModel.getSjgjx()) && sieveResultModel.getSjgjxValue() != null && sieveResultModel.getSjgjxValue().size() > 0)
  799 + {
  800 +
  801 + String valueOne = sieveResultModel.getSjgjxValue().get("valueOne");
  802 + String valueTwo = sieveResultModel.getSjgjxValue().get("valueTwo");
  803 + sjgjx = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getSjgjx()) ? "低风险" : "1".equals(sieveResultModel.getSjgjx()) ? "临界值" : "高风险");
  804 + }
  805 + sieveResultInfo.put("sjgjx",sjgjx);
  806 +
  807 + String stzhz13 = "";
  808 + if (StringUtils.isNotEmpty(sieveResultModel.getStzhz13()) && sieveResultModel.getStzhz13Value() != null && sieveResultModel.getStzhz13Value().size() > 0)
  809 + {
  810 + String valueOne = sieveResultModel.getStzhz13Value().get("valueOne");
  811 + String valueTwo = sieveResultModel.getStzhz13Value().get("valueTwo");
  812 + stzhz13 = valueOne + "/"+valueTwo+("0".equals(sieveResultModel.getStzhz13()) ? "低风险" : "1".equals(sieveResultModel.getStzhz13()) ? "临界值" : "高风险");
  813 + }
  814 + sieveResultInfo.put("stzhz13",stzhz13);
  815 +
  816 +
  817 + }
  818 + map.put("sieveResultInfo",sieveResultInfo);
  819 + }
  820 + }
  821 + }
754 822 }
  823 +
755 824 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
756 825 }
757 826  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java View file @ 9d38ecd
... ... @@ -244,7 +244,7 @@
244 244 sieveModel.sethCg(hCg);
245 245 sieveModel.sethCgMom(hCgMom);
246 246 sieveModel.setHafp(hafp);
247   - sieveModel.sethCgMom(hafpMom);
  247 + sieveModel.setHafpMom(hafpMom);
248 248 sieveModel.setExamineId(examineId);
249 249 sieveModel.setCheckerId(checkerId);
250 250  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 9d38ecd
... ... @@ -1497,8 +1497,8 @@
1497 1497  
1498 1498 public static void main(String[] args) {
1499 1499 PatientWeightServiceImpl patientWeightService = new PatientWeightServiceImpl();
1500   - String bmi = patientWeightService.getBmi("50", "170");
1501   - Map<String,String> map = patientWeightService.getComputeKul(50 , 59.05, 27, Double.parseDouble(bmi),"2");
  1500 + String bmi = patientWeightService.getBmi("68.07", "165");
  1501 + Map<String,String> map = patientWeightService.getComputeKul(50 , 70.43, 18, Double.parseDouble(bmi),"2");
1502 1502 System.out.println(map);
1503 1503 }
1504 1504 }