diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 4419086..f6d7dd3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -2347,7 +2347,6 @@ public class AntExRecordFacade { antExRecordQuery.setModifiedStart(startDate); antExRecordQuery.setModifiedEnd(endDate); antExRecordQuery.setHospitalId("2100001377"); - //antExRecordQuery.setPid("5fcdd9d09932ef5d79279581"); List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); if (CollectionUtils.isNotEmpty(antExRecordModelList)) { @@ -2389,8 +2388,8 @@ public class AntExRecordFacade { Map risk = new HashMap(); risk.put("riskName", map.get("name")); risk.put("riskLevel", RISK_LEVEL.get(map.get("color"))); - risk.put("createdTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); - risk.put("updatedTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); +// risk.put("createdTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); +// risk.put("updatedTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); risks.add(risk); } } @@ -2417,8 +2416,8 @@ public class AntExRecordFacade { Map risk = new HashMap(); risk.put("riskName", map.get("name")); risk.put("riskLevel", RISK_LEVEL.get(map.get("color"))); - risk.put("createdTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); - risk.put("updatedTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); +// risk.put("createdTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); +// risk.put("updatedTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); risks.add(risk); } } 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 d98c3ee..ce1d796 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 @@ -3931,12 +3931,61 @@ public class BabyCheckFacade extends BaseServiceImpl { public void syncBabyRiskInfo(Date startDate,Date endDate) { + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setCreatedTimeStart(startDate); + babyModelQuery.setCreatedTimeEnd(endDate); + babyModelQuery.setHospitalId("2100001377"); + babyModelQuery.setHighRisk(1); + List babyModels = babyService.queryBabyWithQuery(babyModelQuery); + if (CollectionUtils.isNotEmpty(babyModels)) + { + for (BabyModel babyModel : babyModels) + { + if (babyModel != null) + { + Map data = new HashMap(); + data.put("id",babyModel.getId()); + data.put("mommyCardNo",babyModel.getMcertNo()); + data.put("mommyName",babyModel.getMname()); + data.put("mommyPhone",babyModel.getMphone()); + data.put("babyName",babyModel.getName()); + data.put("babySex",SexEnum.getTextById(babyModel.getSex())); + data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); + data.put("checkTime", DateUtil.getyyyy_MM_dd(babyModel.getBuildDate())+" 00:00:00"); + data.put("vcCardNo", babyModel.getVcCardNo()); + List risks = new ArrayList<>(); + List hightRisks = babyModel.getHighRiskInfo(); + if (CollectionUtils.isNotEmpty(hightRisks)) + { + List highRiskInfos = basicConfigFacade.queryBaseInfoByMap(babyModel.getHighRiskInfo()); + if (CollectionUtils.isNotEmpty(highRiskInfos)) + { + for (Map map : highRiskInfos) + { + risks.add(String.valueOf(map.get("name"))); + } + } + } + + if (CollectionUtils.isEmpty(risks)) + { + continue; + } + data.put("risks",risks); + String json = JsonUtil.obj2Str(data); + ExceptionUtils.catchException("baby build params = " + json); + String result = HttpClientUtil.doPostSSL(LP_RISK_URL + "/api/ms/baby", json); + ExceptionUtils.catchException("baby build result = " + result); + } + } + } + + BabyCheckModelQuery query = new BabyCheckModelQuery(); - query.setCreatedTimeStart(startDate); + query.setCheckDateStart(startDate); query.setCheckDateEnd(endDate); query.setHospitalId("2100001377"); query.setHighRisk(1); - //query.setBuildId("600a48f637f89befbe012774"); List models = babyCheckService.queryBabyCheckRecord(query); { if (CollectionUtils.isNotEmpty(models)) @@ -3954,7 +4003,7 @@ public class BabyCheckFacade extends BaseServiceImpl { data.put("babyName",babyModel.getName()); data.put("babySex",SexEnum.getTextById(babyModel.getSex())); data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); - data.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())+"00:00:00"); + data.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())+" 00:00:00"); data.put("vcCardNo", babyModel.getVcCardNo()); List risks = new ArrayList<>(); List hightRisks = babyCheckModel.getHighRiskInfo(); @@ -3976,9 +4025,9 @@ public class BabyCheckFacade extends BaseServiceImpl { } data.put("risks",risks); String json = JsonUtil.obj2Str(data); - ExceptionUtils.catchException("baby params = " + json); + ExceptionUtils.catchException("baby check params = " + json); String result = HttpClientUtil.doPostSSL(LP_RISK_URL + "/api/ms/baby", json); - ExceptionUtils.catchException("baby result = " + result); + ExceptionUtils.catchException("baby check result = " + result); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index f3916c7..327c520 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -545,8 +545,13 @@ public class CourseFacade { //总推送数 - int allSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3, - 1, null, null, null); + int allSends = 0; +// int allSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3, +// 1, null, null, null); +// 1, null, null, null); +// + + PatientCourseQuery patientCourseQuery = new PatientCourseQuery(); patientCourseQuery.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java index 1e3fa14..53ede51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java @@ -72,8 +72,9 @@ public class CourseCountWorker implements Callable { int courseSigns = courseModel.getSignNum() == null ? 0 : courseModel.getSignNum(); topmap.put("courseSigns", String.valueOf(courseSigns)); - int courseSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3, - 1, courseModel.getId(), null, null); + int courseSends = 0; +// int courseSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3, +// 1, courseModel.getId(), null, null); topmap.put("courseSends", String.valueOf(courseSends)); courseTypeQuery.setId(courseModel.getCourseTypeId());