jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8f6bc9ecd968a5b580ea93dacbd97f6220b1f42f

Authored by liquanyu
1 parent 8e0f6ce04b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 68 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 8f6bc9e
... ... @@ -2347,7 +2347,6 @@
2347 2347 antExRecordQuery.setModifiedStart(startDate);
2348 2348 antExRecordQuery.setModifiedEnd(endDate);
2349 2349 antExRecordQuery.setHospitalId("2100001377");
2350   - //antExRecordQuery.setPid("5fcdd9d09932ef5d79279581");
2351 2350 List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created");
2352 2351 if (CollectionUtils.isNotEmpty(antExRecordModelList))
2353 2352 {
... ... @@ -2389,8 +2388,8 @@
2389 2388 Map risk = new HashMap();
2390 2389 risk.put("riskName", map.get("name"));
2391 2390 risk.put("riskLevel", RISK_LEVEL.get(map.get("color")));
2392   - risk.put("createdTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
2393   - risk.put("updatedTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
  2391 +// risk.put("createdTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
  2392 +// risk.put("updatedTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
2394 2393 risks.add(risk);
2395 2394 }
2396 2395 }
... ... @@ -2417,8 +2416,8 @@
2417 2416 Map risk = new HashMap();
2418 2417 risk.put("riskName", map.get("name"));
2419 2418 risk.put("riskLevel", RISK_LEVEL.get(map.get("color")));
2420   - risk.put("createdTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
2421   - risk.put("updatedTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
  2419 +// risk.put("createdTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
  2420 +// risk.put("updatedTime", DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
2422 2421 risks.add(risk);
2423 2422 }
2424 2423 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 8f6bc9e
... ... @@ -3931,12 +3931,61 @@
3931 3931 public void syncBabyRiskInfo(Date startDate,Date endDate)
3932 3932 {
3933 3933  
  3934 + BabyModelQuery babyModelQuery = new BabyModelQuery();
  3935 + babyModelQuery.setCreatedTimeStart(startDate);
  3936 + babyModelQuery.setCreatedTimeEnd(endDate);
  3937 + babyModelQuery.setHospitalId("2100001377");
  3938 + babyModelQuery.setHighRisk(1);
  3939 + List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
  3940 + if (CollectionUtils.isNotEmpty(babyModels))
  3941 + {
  3942 + for (BabyModel babyModel : babyModels)
  3943 + {
  3944 + if (babyModel != null)
  3945 + {
  3946 + Map data = new HashMap();
  3947 + data.put("id",babyModel.getId());
  3948 + data.put("mommyCardNo",babyModel.getMcertNo());
  3949 + data.put("mommyName",babyModel.getMname());
  3950 + data.put("mommyPhone",babyModel.getMphone());
  3951 + data.put("babyName",babyModel.getName());
  3952 + data.put("babySex",SexEnum.getTextById(babyModel.getSex()));
  3953 + data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
  3954 + data.put("checkTime", DateUtil.getyyyy_MM_dd(babyModel.getBuildDate())+" 00:00:00");
  3955 + data.put("vcCardNo", babyModel.getVcCardNo());
  3956 + List<String> risks = new ArrayList<>();
  3957 + List<String> hightRisks = babyModel.getHighRiskInfo();
  3958 + if (CollectionUtils.isNotEmpty(hightRisks))
  3959 + {
  3960 + List <Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(babyModel.getHighRiskInfo());
  3961 + if (CollectionUtils.isNotEmpty(highRiskInfos))
  3962 + {
  3963 + for (Map map : highRiskInfos)
  3964 + {
  3965 + risks.add(String.valueOf(map.get("name")));
  3966 + }
  3967 + }
  3968 + }
  3969 +
  3970 + if (CollectionUtils.isEmpty(risks))
  3971 + {
  3972 + continue;
  3973 + }
  3974 + data.put("risks",risks);
  3975 + String json = JsonUtil.obj2Str(data);
  3976 + ExceptionUtils.catchException("baby build params = " + json);
  3977 + String result = HttpClientUtil.doPostSSL(LP_RISK_URL + "/api/ms/baby", json);
  3978 + ExceptionUtils.catchException("baby build result = " + result);
  3979 + }
  3980 + }
  3981 + }
  3982 +
  3983 +
3934 3984 BabyCheckModelQuery query = new BabyCheckModelQuery();
3935   - query.setCreatedTimeStart(startDate);
  3985 + query.setCheckDateStart(startDate);
3936 3986 query.setCheckDateEnd(endDate);
3937 3987 query.setHospitalId("2100001377");
3938 3988 query.setHighRisk(1);
3939   - //query.setBuildId("600a48f637f89befbe012774");
3940 3989 List<BabyCheckModel> models = babyCheckService.queryBabyCheckRecord(query);
3941 3990 {
3942 3991 if (CollectionUtils.isNotEmpty(models))
... ... @@ -3954,7 +4003,7 @@
3954 4003 data.put("babyName",babyModel.getName());
3955 4004 data.put("babySex",SexEnum.getTextById(babyModel.getSex()));
3956 4005 data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
3957   - data.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())+"00:00:00");
  4006 + data.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())+" 00:00:00");
3958 4007 data.put("vcCardNo", babyModel.getVcCardNo());
3959 4008 List<String> risks = new ArrayList<>();
3960 4009 List<String> hightRisks = babyCheckModel.getHighRiskInfo();
3961 4010  
... ... @@ -3976,9 +4025,9 @@
3976 4025 }
3977 4026 data.put("risks",risks);
3978 4027 String json = JsonUtil.obj2Str(data);
3979   - ExceptionUtils.catchException("baby params = " + json);
  4028 + ExceptionUtils.catchException("baby check params = " + json);
3980 4029 String result = HttpClientUtil.doPostSSL(LP_RISK_URL + "/api/ms/baby", json);
3981   - ExceptionUtils.catchException("baby result = " + result);
  4030 + ExceptionUtils.catchException("baby check result = " + result);
3982 4031 }
3983 4032 }
3984 4033 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ 8f6bc9e
... ... @@ -545,8 +545,13 @@
545 545  
546 546  
547 547 //总推送数
548   - int allSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3,
549   - 1, null, null, null);
  548 + int allSends = 0;
  549 +// int allSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3,
  550 +// 1, null, null, null);
  551 +// 1, null, null, null);
  552 +//
  553 +
  554 +
550 555  
551 556 PatientCourseQuery patientCourseQuery = new PatientCourseQuery();
552 557 patientCourseQuery.setYn(YnEnums.YES.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java View file @ 8f6bc9e
... ... @@ -72,8 +72,9 @@
72 72 int courseSigns = courseModel.getSignNum() == null ? 0 : courseModel.getSignNum();
73 73 topmap.put("courseSigns", String.valueOf(courseSigns));
74 74  
75   - int courseSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3,
76   - 1, courseModel.getId(), null, null);
  75 + int courseSends = 0;
  76 +// int courseSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3,
  77 +// 1, courseModel.getId(), null, null);
77 78 topmap.put("courseSends", String.valueOf(courseSends));
78 79  
79 80 courseTypeQuery.setId(courseModel.getCourseTypeId());