diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index a68b4fd..fb97c3a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -111,7 +111,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //下次产检时间 private Date nextDateEnd; - //服务状态 private Integer serviceStatus; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 26329b8..f023edb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -280,6 +280,7 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge, @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge, @RequestParam(value = "birth", required = false) String birth, + @RequestParam(value = "buildTime", required = false) String buildTime, @RequestParam(value = "nextDate", required = false) String nextDate, @RequestParam(value = "expVip", required = false) Integer expVip, @RequestParam(value = "serviceType", required = false) Integer serviceType, @@ -319,7 +320,7 @@ public class BabyBuildController extends BaseController { request.setPage(page); request.setServiceStatus(serviceStatus); request.setDateRange(dateRange); - + request.setBuildDate(buildTime); // 省 request.setProvinceId(provinceId); // 市 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 2ddfc53..0b97f26 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2197,6 +2197,11 @@ public class BabyBookbuildingFacade { } } + if (org.apache.commons.lang.StringUtils.isNotEmpty(request.getBuildDate())) { + babyQuery.setBuildDateStart(DateUtil.getSNDate(request.getBuildDate())[0]); + babyQuery.setBuildDateEnd(DateUtil.getSNDate(request.getBuildDate())[1]); + } + if(StringUtils.isNotEmpty(request.getBirth()) && request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 6f2d767..7aeb23d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -107,6 +107,23 @@ public class RiskReportFacade { } } + if (StringUtils.isNotEmpty(riskBabysQueryRequest.getBirth())) + { + String birthStr = riskBabysQueryRequest.getBirth(); + String[] dates = birthStr.split(" - "); + babyModelQuery.setBirthStart(DateUtil.parseYMD(dates[0])); + babyModelQuery.setBirthEnd(new Date(DateUtil.parseYMD(dates[1]).getTime()+24*60*60*1000 -1 )); + } + + Date currentDate = DateUtil.formatDate(new Date());if (riskBabysQueryRequest.getMonthAgeStart() != null && riskBabysQueryRequest.getMonthAgeEnd() != null) + { + Date start = DateUtil.addMonth(currentDate, -riskBabysQueryRequest.getMonthAgeStart()); + babyModelQuery.setBirthEnd(start); + + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -riskBabysQueryRequest.getMonthAgeEnd() - 1), 1); + babyModelQuery.setBirthStart(end); + } + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); BabyModelQuery query = new BabyModelQuery(); query.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 82dca6b..5d338b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2996,22 +2996,59 @@ public class ViewFacade { } antExChu.add(DateUtil.getyyyy_MM_dd(an.getCheckDate())); antExChu.add(ResolveUtils.getPregnancyWeek(patients.getLastMenses(), an.getCheckDate())); - String hightRiskStr = basicConfigService.getScreenResult(JsonUtil.jkstr2Obj(an.getRiskFactor(), List.class)); - antExChu.add(hightRiskStr); + // String hightRiskStr = basicConfigService.getScreenResult(JsonUtil.jkstr2Obj(an.getRiskFactor(), List.class)); + // antExChu.add(hightRiskStr); + + // List list2 = JsonUtil.toList(an.getRiskFactor(), List.class); + // HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list2, true); + // List> checkList = ResolveUtils.queryHighRisk(highScoreResult); + // Set sbLev = new HashSet(); + // for (int i = 0;i mp = (Map) highScoreResult.getLevel().get(i); + // sbLev.add(mp.get("name")); + // } + // if(CollectionUtils.isNotEmpty(sbLev)){ + // antExChu.add(sbLev.toString()); + // }else{ + // antExChu.add("健康"); + // } - List list2 = JsonUtil.toList(an.getRiskFactor(), List.class); - HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list2, true); - List> checkList = ResolveUtils.queryHighRisk(highScoreResult); Set sbLev = new HashSet(); - for (int i = 0;i mp = (Map) highScoreResult.getLevel().get(i); - sbLev.add(mp.get("name")); + Set riskName = new HashSet(); + + Map riskMap = new HashMap<>(); + //处理高危因素 + getRisk(an.getRiskFactor(), an.getOtherRisk(), riskMap); + + if(riskMap.get("highRisk")!=null){ + List> riksList = (List>) riskMap.get("highRisk"); + for(Map risk:riksList){ + if(String.valueOf(risk.get("color")).contains("yellow")){ + sbLev.add("黄色"); + }else if(String.valueOf(risk.get("color")).contains("orange")){ + sbLev.add("橙色"); + }else if(String.valueOf(risk.get("color")).contains("red")){ + sbLev.add("红色"); + }else if(String.valueOf(risk.get("color")).contains("purple")){ + sbLev.add("紫色"); + } + riskName.add(risk.get("name")); + } } + + if(CollectionUtils.isNotEmpty(sbLev)){ + antExChu.add(riskName.toString()); + }else{ + antExChu.add("-"); + } + if(CollectionUtils.isNotEmpty(sbLev)){ antExChu.add(sbLev.toString()); }else{ antExChu.add("健康"); } + + antExChu.add(an.getTreatmentOpinion()==null?" ":an.getTreatmentOpinion()); antExChu.add(organization.getName()); String checkDoctor = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 56cea20..2f9ebfb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -52,9 +52,14 @@ public class BabyManageRequest extends BaseQuery { private String provinceId; private String cityId; private String areaId; - + //建档时间 + private String bTime; private String streetId; + //建档时间 + private String buildDate; + + private String hospitalProvinceId; private String hospitalCityId; @@ -76,6 +81,23 @@ public class BabyManageRequest extends BaseQuery { //1-需要隐藏姓名、电话、地址 private int showDetail; + + public String getbTime() { + return bTime; + } + + public void setbTime(String bTime) { + this.bTime = bTime; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + public List getHighRiskInfos() { return highRiskInfos; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskBabysQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskBabysQueryRequest.java index 39f62a2..5fca2c6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskBabysQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskBabysQueryRequest.java @@ -65,14 +65,18 @@ public class RiskBabysQueryRequest extends BasePageQueryRequest { private String cprovinceId; private String ccityId; private String careaId; - + //生日 + private String birth; + //月龄 + private Integer monthAgeStart; + //月龄 + private Integer monthAgeEnd; // 医院id private String hId; //建档时间 private String buildTime; - //下次预约时间 private String nextCheckTime; @@ -193,6 +197,30 @@ public class RiskBabysQueryRequest extends BasePageQueryRequest { return OrderEnum.valueOfOrder(order); } + public String getBirth() { + return birth; + } + + public void setBirth(String birth) { + this.birth = birth; + } + + public Integer getMonthAgeStart() { + return monthAgeStart; + } + + public void setMonthAgeStart(Integer monthAgeStart) { + this.monthAgeStart = monthAgeStart; + } + + public Integer getMonthAgeEnd() { + return monthAgeEnd; + } + + public void setMonthAgeEnd(Integer monthAgeEnd) { + this.monthAgeEnd = monthAgeEnd; + } + public int getShowDetail() { return showDetail; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java index cdde142..152f81e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java @@ -72,18 +72,13 @@ public class BabyHiskCountTask implements Callable { List datas = new ArrayList<>(); for (BasicConfig config : configs) { - BabyModelQuery query = new BabyModelQuery(); - query.setYn(YnEnums.YES.getId()); - query.setBuildTypeList(babyModelQuery.getBuildTypeList()); - query.setHospitalId(babyModelQuery.getHospitalId()); - //建档医生 - query.setBuildDoctor(babyModelQuery.getBuildDoctor()); + babyModelQuery.setYn(YnEnums.YES.getId()); if(type == 1){ - query.setHighRiskInfo(config.getId()); + babyModelQuery.setHighRiskInfo(config.getId()); }else if(type == 2){ - query.setWeakSonInfo(config.getId()); + babyModelQuery.setWeakSonInfo(config.getId()); } - int riskPatientCount = babyService.queryBabyCount(query); + int riskPatientCount = babyService.queryBabyCount(babyModelQuery); // System.out.println("name:"+config.getName()+",riskPatientCount:"+riskPatientCount); RiskReportResult risk = new RiskReportResult(); risk.setHighRiskId(config.getId());