Commit 50c539674753462785b37bbc4912c937c6c99e82
1 parent
65cf4fba1e
Exists in
master
and in
6 other branches
承德公卫接口修改
Showing 2 changed files with 33 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java
View file @
50c5396
| ... | ... | @@ -613,8 +613,8 @@ |
| 613 | 613 | }else{ |
| 614 | 614 | ps.setNull(17,Types.DATE); |
| 615 | 615 | } |
| 616 | - if(antExChuModel.getCreated() != null){ | |
| 617 | - ps.setDate(18,new Date(antExChuModel.getCreated().getTime())); | |
| 616 | + if(patients.getBookbuildingDate() != null){ | |
| 617 | + ps.setDate(18,new Date(patients.getBookbuildingDate().getTime())); | |
| 618 | 618 | }else{ |
| 619 | 619 | ps.setNull(18,Types.DATE); |
| 620 | 620 | } |
| ... | ... | @@ -4609,6 +4609,23 @@ |
| 4609 | 4609 | |
| 4610 | 4610 | /*String startDate = DateUtil.getyyyy_MM_dd_hms(start); |
| 4611 | 4611 | String endDate = DateUtil.getyyyy_MM_dd_hms(end);*/ |
| 4612 | + | |
| 4613 | + String startDate = start; | |
| 4614 | + String endDate = end; | |
| 4615 | + System.out.println("start=" + startDate + "end=" + endDate); | |
| 4616 | + saveYf(startDate, endDate); | |
| 4617 | + saveChuZhen(startDate, endDate); | |
| 4618 | + saveFuZhen(startDate, endDate); | |
| 4619 | + saveFm(startDate, endDate); | |
| 4620 | + saveChFs(startDate, endDate); | |
| 4621 | + saveChFc(startDate, endDate); | |
| 4622 | + saveEtDa(startDate, endDate); | |
| 4623 | + saveXsrFs(startDate, endDate); | |
| 4624 | + saveEb(startDate, endDate); | |
| 4625 | + } | |
| 4626 | + | |
| 4627 | + | |
| 4628 | + public void test(String start,String end) { | |
| 4612 | 4629 | |
| 4613 | 4630 | String startDate = start; |
| 4614 | 4631 | String endDate = end; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
50c5396
| ... | ... | @@ -2608,7 +2608,7 @@ |
| 2608 | 2608 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 2609 | 2609 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| 2610 | 2610 | antExChuQuery.setHospitalList(rcGlxtService.getHids()); |
| 2611 | - antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(),-2)); | |
| 2611 | + antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(), -2)); | |
| 2612 | 2612 | antExChuQuery.setCreatedTimeEnd(new Date()); |
| 2613 | 2613 | List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); |
| 2614 | 2614 | if (CollectionUtils.isNotEmpty(antExChuModels)) |
| 2615 | 2615 | |
| ... | ... | @@ -2620,7 +2620,20 @@ |
| 2620 | 2620 | } |
| 2621 | 2621 | } |
| 2622 | 2622 | |
| 2623 | + /** | |
| 2624 | + * 自定义查询 | |
| 2625 | + * | |
| 2626 | + * @param start | |
| 2627 | + * @param end | |
| 2628 | + * @return | |
| 2629 | + */ | |
| 2630 | + @RequestMapping(value = "/cd/zdy") | |
| 2631 | + @ResponseBody | |
| 2632 | + public String getZdy(@RequestParam("start") String start, @RequestParam("end") String end) { | |
| 2623 | 2633 | |
| 2634 | + cdGwInterface.test(start,end); | |
| 2635 | + return "1"; | |
| 2636 | + } | |
| 2624 | 2637 | |
| 2625 | 2638 | |
| 2626 | 2639 |