From 61ac35020ce60854f08038c201c075853fe1e4a3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 24 Mar 2023 11:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96=E5=A6=87=E5=B9=BC=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/LhBabyEyeCheckController.java | 4 +- .../operate/web/facade/BabyCheckFacade.java | 2 - .../operate/web/facade/BasicConfigFacade.java | 4 +- .../operate/web/facade/LhBabyEyeCheckFacade.java | 60 +++++++++++++++++++--- .../operate/web/facade/MatDeliverFacade.java | 2 + .../web/request/ChildbirthManagerRequest.java | 23 +++++++++ 6 files changed, 82 insertions(+), 13 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java index 09cfdd9..efcc5de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java @@ -31,7 +31,7 @@ public class LhBabyEyeCheckController extends BaseController { /** - * 添加/修改检查 + * 添加/修改检查queryAllBabyListPage * @param babyCheck * @param request * @return @@ -47,7 +47,7 @@ public class LhBabyEyeCheckController extends BaseController { /** * 删除检查 * @param id - * @return + * @return */ @ResponseBody @TokenRequired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 9ab5d52..ce04d71 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -389,8 +389,6 @@ public class BabyCheckFacade extends BaseServiceImpl { } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - - /** * 儿童检查 上传 患者签名 * @Author: 武涛涛 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 7dec4a3..8c02a6c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -128,7 +128,9 @@ public class BasicConfigFacade { Map> slaveBasicConfigMap = new HashMap<>(); for (BasicConfig bc : basicConfigList) { bc.setColor(HosptialHighRiskFacade.colorMap.get(bc.getParentId())); - + if (bc.getParentId().equals("fb43fd5a-b153-4cb9-9180-c46f5612ba43")) { + bc.setColor("risk_" + RiskDefaultTypeEnum.getColor(bc.getName())); + } if (bc.getpId() != null) { if (slaveBasicConfigMap.containsKey(bc.getpId())) { slaveBasicConfigMap.get(bc.getpId()).add(bc); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java index 7aff4f0..bd30648 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java @@ -75,7 +75,7 @@ public class LhBabyEyeCheckFacade { (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8>babyCheck.getLhsljcstRight()) || ("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6>babyCheck.getLhsljcstLeft()) || (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8>babyCheck.getLhsljcstLeft()) || - "2".equals(babyCheck.getLhsldcRight()) || "2".equals(babyCheck.getLhsldcLeft()) || (Boolean) dioptricAnomaly(babyCheck).get("state") + "2".equals(babyCheck.getLhsldcRight()) || "2".equals(babyCheck.getLhsldcLeft()) || (Boolean) dioptricAnomalyState(babyCheck).get("state") ){ babyCheck.setPositiveType("2"); @@ -412,7 +412,7 @@ public class LhBabyEyeCheckFacade { if("2".equals(babyCheck.getLhsldcLeft())){ abnormal+="视力低常（左）;"; } - if((Boolean) dioptricAnomaly(babyCheck).get("state")){ + if((Boolean) dioptricAnomalyState(babyCheck).get("state")){ abnormal+="屈光筛查"; } @@ -434,14 +434,58 @@ public class LhBabyEyeCheckFacade { (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8 > babyCheck.getLhsljcstLeft())){ abnormalInfo+="视力检查（左）:"+babyCheck.getLhsljcstLeft()+";"; } - Map map=dioptricAnomaly(babyCheck); + Map map=dioptricAnomalyState(babyCheck); if((Boolean) map.get("state")){ abnormalInfo+="屈光异常值:"+map.get("value"); + }else{ + abnormalInfo+="无"; } return abnormalInfo; } + + /** + * 是否屈光异常 + * @param babyCheck + * @return + */ + public Map dioptricAnomalyState(LhBabyEyeCheck babyCheck){ + Map map=new HashMap<>(); + map.put("state",false); + map.put("value",""); + //6月-1岁 + if(babyCheck.getLhdsr()!="" && babyCheck.getLhdsl()!="" &&babyCheck.getLhdcr()!="" && babyCheck.getLhdcl()!="" && + babyCheck.getLhdsr()!=null && babyCheck.getLhdsl()!=null &&babyCheck.getLhdcr()!=null && babyCheck.getLhdcl()!=null) { + if (NumberUtils.isNumber(babyCheck.getLhdsr())) { + if (1.5d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || -1.5d >= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || + 1.5d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || + -1.5d >= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))) { + map.put("state", true); + map.put("value", "散光异常"); + } + } + if (NumberUtils.isNumber(babyCheck.getLhdsl())) { + if (3.0d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) || 3.0d <= Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))) { +// if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) ){ + map.put("state", true); +// map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";"); + map.put("value", map.get("value") + "远视异常"); + } + } + if (NumberUtils.isNumber(babyCheck.getLhdcl())) { + if (Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) < -0.5d || Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) < -0.5d) { + map.put("state", true); + map.put("value", map.get("value") + "近视异常"); + } + } + return map; + }else{ + map.put("state", false); + map.put("value", null); + return map; + } + } /** * 是否屈光异常 * @param babyCheck @@ -453,8 +497,8 @@ public class LhBabyEyeCheckFacade { map.put("value",""); //6月-1岁 if(Arrays.asList("6","8","12").contains(babyCheck.getCheckMonthId())){ - if(NumberUtils.isNumber(babyCheck.getLhdsr())){ - if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr())) ){ + + if(2.5d>=Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr())) ){ map.put("state",true); map.put("value","DS-R:"+babyCheck.getLhdsr()+";"); } @@ -473,15 +517,15 @@ public class LhBabyEyeCheckFacade { } } if(NumberUtils.isNumber(babyCheck.getLhdcl())){ - if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) || + if(-0.5d Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 841a2c7..ea278b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2686,6 +2686,8 @@ public class MatDeliverFacade { patientsQuery.setFmAgeEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndAge()) ? null : Integer.valueOf(childbirthManagerRequest.getEndAge())); patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7); patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()) * 7); + patientsQuery.setBuildDaysStart(StringUtils.isEmpty(childbirthManagerRequest.getStartBuildWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartBuildWeek()) * 7); + patientsQuery.setBuildDaysEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndBuildWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndBuildWeek()) * 7); // 分娩方式去另外一张表查 patientsQuery.setDesc("fmDate"); patientsQuery.setSort("fmDate"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 09b1a7b..dc56ea4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -160,6 +160,13 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { */ private String endDueWeek; + /*建档孕周start + * */ + private String startBuildWeek; + + /*建档孕周end*/ + private String endBuildWeek; + /** * 出血量： * 顺产：1-产后2小时出血≥300ml、2-产后24小时出血＜500ml、3-产后24小时出血≥500ml @@ -197,6 +204,22 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { //建档医院id private String firstHospitalId; + public String getStartBuildWeek() { + return startBuildWeek; + } + + public void setStartBuildWeek(String startBuildWeek) { + this.startBuildWeek = startBuildWeek; + } + + public String getEndBuildWeek() { + return endBuildWeek; + } + + public void setEndBuildWeek(String endBuildWeek) { + this.endBuildWeek = endBuildWeek; + } + public String getYyzyfmHospitalId() { return yyzyfmHospitalId; } -- 1.8.3.1