jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5e17eb30c851df3a8282dff6cd19d9feb3546843

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

高危诊断项修改

Showing 2 changed files with 69 additions and 5 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java View file @ 5e17eb3
... ... @@ -208,7 +208,7 @@
208 208 FB(2, "肺部", 4, TypeEnums.WZ.getId(), 0, ""),
209 209  
210 210 //血压
211   - XZY(64, "舒张压", 19, TypeEnums.SZ.getId(), 0, ""),
  211 + SZY(64, "舒张压", 19, TypeEnums.SZ.getId(), 0, ""),
212 212 SSY(65, "收缩压", 19, TypeEnums.SZ.getId(), 0, ""),
213 213  
214 214  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 5e17eb3
... ... @@ -3927,13 +3927,77 @@
3927 3927 //血压
3928 3928 if (!antExcAddRequest.getBp().isEmpty() && antExcAddRequest.getBp().size() > 0) {
3929 3929 Map map = antExcAddRequest.getBp();
  3930 + String ssy = null;
  3931 + String szy = null;
  3932 + try {
  3933 + ssy = map.get("ssy") + "";
  3934 + szy = map.get("szy") + "";
  3935 + } catch (Exception e) {
  3936 +
  3937 + }
3930 3938 List<DiagnoseItemModel> ybjcItems = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xy.getId());
3931 3939 if (CollectionUtils.isNotEmpty(ybjcItems)) {
3932 3940 for (DiagnoseItemModel item : ybjcItems) {
3933   - if ((double) map.get("ssy") > Double.valueOf(item.getValueOne()) && (double) map.get("ssy") < Double.valueOf(item.getValueTwo())) {
3934   - list.addAll(item.getRiskIds());
3935   - } else if ((double) map.get("szy") > Double.valueOf(item.getValueThree()) && (double) map.get("szy") < Double.valueOf(item.getValueFour())) {
3936   - list.addAll(item.getRiskIds());
  3941 + //1.判断是否为三个值还是七个值
  3942 + if (StringUtils.isEmpty(item.getValueFour())) {
  3943 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
  3944 + && compare(item.getValueTwo(), item.getValueThree(), szy)) {
  3945 + list.addAll(item.getRiskIds());
  3946 + }
  3947 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
  3948 + && compare(item.getValueTwo(), item.getValueThree(), ssy)) {
  3949 + list.addAll(item.getRiskIds());
  3950 + }
  3951 + //七个值
  3952 + } else {
  3953 + if ("1".equals(item.getValueFour())) {
  3954 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
  3955 + && compare(item.getValueTwo(), item.getValueThree(), ssy) &&
  3956 + String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
  3957 + && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
  3958 + list.addAll(item.getRiskIds());
  3959 + } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
  3960 + && compare(item.getValueTwo(), item.getValueThree(), ssy) &&
  3961 + String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
  3962 + && compare(item.getValueSix(), item.getValueSeven(), szy)) {
  3963 + list.addAll(item.getRiskIds());
  3964 +
  3965 + } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
  3966 + && compare(item.getValueTwo(), item.getValueThree(), szy) &&
  3967 + String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
  3968 + && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
  3969 + list.addAll(item.getRiskIds());
  3970 + } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
  3971 + && compare(item.getValueTwo(), item.getValueThree(), szy) &&
  3972 + String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
  3973 + && compare(item.getValueSix(), item.getValueSeven(), szy)) {
  3974 + list.addAll(item.getRiskIds());
  3975 + }
  3976 +
  3977 + } else if ("2".equals(item.getValueFour())) {
  3978 + if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
  3979 + && compare(item.getValueTwo(), item.getValueThree(), ssy) ||
  3980 + String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
  3981 + && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
  3982 + list.addAll(item.getRiskIds());
  3983 + } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne())
  3984 + && compare(item.getValueTwo(), item.getValueThree(), ssy) ||
  3985 + String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
  3986 + && compare(item.getValueSix(), item.getValueSeven(), szy)) {
  3987 + list.addAll(item.getRiskIds());
  3988 +
  3989 + } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
  3990 + && compare(item.getValueTwo(), item.getValueThree(), szy) ||
  3991 + String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive())
  3992 + && compare(item.getValueSix(), item.getValueSeven(), ssy)) {
  3993 + list.addAll(item.getRiskIds());
  3994 + } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne())
  3995 + && compare(item.getValueTwo(), item.getValueThree(), szy) ||
  3996 + String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive())
  3997 + && compare(item.getValueSix(), item.getValueSeven(), szy)) {
  3998 + list.addAll(item.getRiskIds());
  3999 + }
  4000 + }
3937 4001 }
3938 4002 }
3939 4003 }