jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5f4511938223696f316b86a30a5888784220ff31

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

update

Showing 4 changed files with 15 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 5f45119
... ... @@ -2347,6 +2347,7 @@
2347 2347 antExRecordQuery.setModifiedStart(startDate);
2348 2348 antExRecordQuery.setModifiedEnd(endDate);
2349 2349 antExRecordQuery.setHospitalId("2100001377");
  2350 + //antExRecordQuery.setPid("5fcdd9d09932ef5d79279581");
2350 2351 List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created");
2351 2352 if (CollectionUtils.isNotEmpty(antExRecordModelList))
2352 2353 {
2353 2354  
... ... @@ -2357,11 +2358,12 @@
2357 2358 if (pat != null)
2358 2359 {
2359 2360 Map data = new HashMap();
  2361 + data.put("id",antExRecordModel.getId());
2360 2362 data.put("cardNo",pat.getCardNo());
2361 2363 data.put("userName",pat.getUsername());
2362 2364 data.put("phone",pat.getPhone());
2363 2365 data.put("vcCardNo",pat.getVcCardNo());
2364   - data.put("checkTime",DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime()));
  2366 + data.put("checkTime",DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime())+" 00:00:00");
2365 2367 data.put("riskScore",antExRecordModel.gethScore());
2366 2368 List<Map> risks = new ArrayList<>();
2367 2369  
... ... @@ -2387,6 +2389,8 @@
2387 2389 Map risk = new HashMap();
2388 2390 risk.put("riskName", map.get("name"));
2389 2391 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");
2390 2394 risks.add(risk);
2391 2395 }
2392 2396 }
... ... @@ -2413,6 +2417,8 @@
2413 2417 Map risk = new HashMap();
2414 2418 risk.put("riskName", map.get("name"));
2415 2419 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");
2416 2422 risks.add(risk);
2417 2423 }
2418 2424 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 5f45119
... ... @@ -3932,10 +3932,11 @@
3932 3932 {
3933 3933  
3934 3934 BabyCheckModelQuery query = new BabyCheckModelQuery();
3935   - query.setModifiedStart(startDate);
3936   - query.setModifiedEnd(endDate);
  3935 + query.setCreatedTimeStart(startDate);
  3936 + query.setCheckDateEnd(endDate);
3937 3937 query.setHospitalId("2100001377");
3938 3938 query.setHighRisk(1);
  3939 + //query.setBuildId("600a48f637f89befbe012774");
3939 3940 List<BabyCheckModel> models = babyCheckService.queryBabyCheckRecord(query);
3940 3941 {
3941 3942 if (CollectionUtils.isNotEmpty(models))
3942 3943  
... ... @@ -3946,13 +3947,14 @@
3946 3947 if (babyModel != null)
3947 3948 {
3948 3949 Map data = new HashMap();
  3950 + data.put("id",babyCheckModel.getId());
3949 3951 data.put("mommyCardNo",babyModel.getMcertNo());
3950 3952 data.put("mommyName",babyModel.getMname());
3951 3953 data.put("mommyPhone",babyModel.getMphone());
3952 3954 data.put("babyName",babyModel.getName());
3953 3955 data.put("babySex",SexEnum.getTextById(babyModel.getSex()));
3954 3956 data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
3955   - data.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate()));
  3957 + data.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())+"00:00:00");
3956 3958 data.put("vcCardNo", babyModel.getVcCardNo());
3957 3959 List<String> risks = new ArrayList<>();
3958 3960 List<String> hightRisks = babyCheckModel.getHighRiskInfo();
platform-operate-api/src/main/resources/config.properties View file @ 5f45119
... ... @@ -46,5 +46,5 @@
46 46  
47 47 cert_url=https://try-cert-api.healthbaby.com.cn
48 48  
49   -lp_risk_url=http://192.168.1.141:8082
  49 +lp_risk_url=http://lp-chengde-api.healthbaby.com.cn:8082
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml View file @ 5f45119
... ... @@ -664,8 +664,8 @@
664 664 <ref bean="genWeightTrigger" />
665 665 <!-- <ref bean="handleTrackDownTrigger" />-->
666 666  
667   - <ref bean="patientRiskTrigger"/>
668   - <ref bean="babyRiskTrigger"/>
  667 + <!--<ref bean="patientRiskTrigger"/>-->
  668 + <!--<ref bean="babyRiskTrigger"/>-->
669 669  
670 670  
671 671 <!--陵城孕前优生临床检查自动保存到表