fix: 取消admissid匹配,增加同步基础数据接口按照住院号和出院时间

jp2demo1.0
wyb 10 months ago
parent d7a9a0597c
commit 4b7237b9cd

@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters; import java.time.temporal.TemporalAdjusters;
import java.util.Collections;
@Api(value = "数据同步接口", tags = "数据同步接口") @Api(value = "数据同步接口", tags = "数据同步接口")
@RestController("/sync") @RestController("/sync")
@ -43,6 +44,19 @@ public class SyncBasicDataController {
public CommonResult<?> syncBasicData(@RequestBody SyncBasicDataDto syncBasicDataDto){ public CommonResult<?> syncBasicData(@RequestBody SyncBasicDataDto syncBasicDataDto){
return syncBasicDataService.syncBasicData(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("省厅-同步上个月基础数据") @ApiOperation("省厅-同步上个月基础数据")
@GetMapping("/syncLastMonthBasicData") @GetMapping("/syncLastMonthBasicData")
public CommonResult<?> syncLastMonthBasicData(){ public CommonResult<?> syncLastMonthBasicData(){

@ -291,11 +291,11 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
private Tbasic getOldTbasic(FileUploadJpgDto fileUploadJpgDto) { private Tbasic getOldTbasic(FileUploadJpgDto fileUploadJpgDto) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String admissId = fileUploadJpgDto.getAdmissId(); // String admissId = fileUploadJpgDto.getAdmissId();
Tbasic getByAdmissId = basicMapper.getTbasicByAdmissId(admissId); // Tbasic getByAdmissId = basicMapper.getTbasicByAdmissId(admissId);
if (getByAdmissId != null) { // if (getByAdmissId != null) {
return getByAdmissId; // return getByAdmissId;
} // }
String jpgDtoInpatientNo = fileUploadJpgDto.getInpatientNo(); String jpgDtoInpatientNo = fileUploadJpgDto.getInpatientNo();
Integer jpgDtoAdmissTimes = fileUploadJpgDto.getAdmissTimes(); Integer jpgDtoAdmissTimes = fileUploadJpgDto.getAdmissTimes();
Date jpgDtoDisDate = fileUploadJpgDto.getDisDate(); Date jpgDtoDisDate = fileUploadJpgDto.getDisDate();

Loading…
Cancel
Save