From 4b7237b9cd3d47fe5011faa553958245ac747547 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Fri, 11 Oct 2024 08:51:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88admissid=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E4=BD=8F=E9=99=A2=E5=8F=B7=E5=92=8C=E5=87=BA=E9=99=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/SyncBasicDataController.java | 14 ++++++++++++++ .../com/docus/demo/service/SyncBasicFileImpl.java | 10 +++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/docus/demo/controller/SyncBasicDataController.java b/src/main/java/com/docus/demo/controller/SyncBasicDataController.java index 405e9bd..8c72189 100644 --- a/src/main/java/com/docus/demo/controller/SyncBasicDataController.java +++ b/src/main/java/com/docus/demo/controller/SyncBasicDataController.java @@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile; import java.time.LocalDate; import java.time.temporal.TemporalAdjusters; +import java.util.Collections; @Api(value = "数据同步接口", tags = "数据同步接口") @RestController("/sync") @@ -43,6 +44,19 @@ public class SyncBasicDataController { public CommonResult syncBasicData(@RequestBody SyncBasicDataDto syncBasicDataDto){ return syncBasicDataService.syncBasicData(syncBasicDataDto); } + @ApiOperation("省厅-同步单个患者基础数据") + @GetMapping("/syncSingleBasicData") + public CommonResult syncSingleBasicData(@RequestParam(name = "disDate") String disDate,@RequestParam(name = "inpatientNo") String inpatientNo){ + LocalDate localDate = LocalDate.parse(disDate); + SyncBasicDataDto dto = new SyncBasicDataDto(); + dto.setStartDate(localDate.toString()); + dto.setEndDate(localDate.toString()); + dto.setInpatientNoList(Collections.singletonList(inpatientNo)); + dto.setLimit(100); + return syncBasicDataService.syncBasicData(dto); + } + + @ApiOperation("省厅-同步上个月基础数据") @GetMapping("/syncLastMonthBasicData") public CommonResult syncLastMonthBasicData(){ diff --git a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java index 1fdf273..b2088fa 100644 --- a/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java +++ b/src/main/java/com/docus/demo/service/SyncBasicFileImpl.java @@ -291,11 +291,11 @@ public class SyncBasicFileImpl implements ISyncBasicFileService { private Tbasic getOldTbasic(FileUploadJpgDto fileUploadJpgDto) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String admissId = fileUploadJpgDto.getAdmissId(); - Tbasic getByAdmissId = basicMapper.getTbasicByAdmissId(admissId); - if (getByAdmissId != null) { - return getByAdmissId; - } +// String admissId = fileUploadJpgDto.getAdmissId(); +// Tbasic getByAdmissId = basicMapper.getTbasicByAdmissId(admissId); +// if (getByAdmissId != null) { +// return getByAdmissId; +// } String jpgDtoInpatientNo = fileUploadJpgDto.getInpatientNo(); Integer jpgDtoAdmissTimes = fileUploadJpgDto.getAdmissTimes(); Date jpgDtoDisDate = fileUploadJpgDto.getDisDate();