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 4b8a1fc..4419086 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,6 +2347,7 @@ 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)) { @@ -2357,11 +2358,12 @@ public class AntExRecordFacade { if (pat != null) { Map data = new HashMap(); + data.put("id",antExRecordModel.getId()); data.put("cardNo",pat.getCardNo()); data.put("userName",pat.getUsername()); data.put("phone",pat.getPhone()); data.put("vcCardNo",pat.getVcCardNo()); - data.put("checkTime",DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())); + data.put("checkTime",DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00"); data.put("riskScore",antExRecordModel.gethScore()); List risks = new ArrayList<>(); @@ -2387,6 +2389,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"); risks.add(risk); } } @@ -2413,6 +2417,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"); 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 50c31ff..d98c3ee 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 @@ -3932,10 +3932,11 @@ public class BabyCheckFacade extends BaseServiceImpl { { BabyCheckModelQuery query = new BabyCheckModelQuery(); - query.setModifiedStart(startDate); - query.setModifiedEnd(endDate); + query.setCreatedTimeStart(startDate); + query.setCheckDateEnd(endDate); query.setHospitalId("2100001377"); query.setHighRisk(1); + //query.setBuildId("600a48f637f89befbe012774"); List models = babyCheckService.queryBabyCheckRecord(query); { if (CollectionUtils.isNotEmpty(models)) @@ -3946,13 +3947,14 @@ public class BabyCheckFacade extends BaseServiceImpl { if (babyModel != null) { Map data = new HashMap(); + data.put("id",babyCheckModel.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(babyCheckModel.getCheckDate())); + 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(); diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 97286b0..bb153f1 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -46,4 +46,4 @@ hospitalId=2100002042 cert_url=https://try-cert-api.healthbaby.com.cn -lp_risk_url=http://192.168.1.141:8082 \ No newline at end of file +lp_risk_url=http://lp-chengde-api.healthbaby.com.cn:8082 \ No newline at end of file diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index 1b5685c..699ac49 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -664,8 +664,8 @@ - - + +