From 932a99f21b84bd3e64e397a68a18900a8412d200 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期一, 12 八月 2024 18:21:58 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 61 ++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 1 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java index b479795..ecb22ee 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java @@ -1,8 +1,13 @@ package cn.lihu.jh.module.ecg.controller.admin.appointment; +import cn.lihu.jh.module.ecg.controller.admin.queue.vo.QueueSaveReqVO; +import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO; import cn.lihu.jh.module.ecg.feign.RemoteDataService; import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo; import cn.lihu.jh.module.ecg.feign.RestApiResult; +import cn.lihu.jh.module.ecg.feign.dto.AppointmentExternal; +import cn.lihu.jh.module.ecg.service.queue.QueueService; +import com.alibaba.fastjson.JSONObject; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -10,8 +15,14 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import java.time.LocalDateTime; +import java.time.chrono.IsoChronology; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.format.ResolverStyle; import java.util.*; import java.io.IOException; +import java.util.stream.Collectors; import cn.lihu.jh.framework.common.pojo.PageParam; import cn.lihu.jh.framework.common.pojo.PageResult; @@ -23,6 +34,8 @@ import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog; import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*; +import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE; +import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME; import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*; import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO; @@ -40,6 +53,9 @@ @Resource private AppointmentService appointmentService; + + @Resource + private QueueService queueService; @Resource private RemoteDataService remoteDataService; @@ -107,11 +123,54 @@ //return success(BeanUtils.toBean(appointment, AppointmentRespVO.class)); RestApiReqBodyVo reqBodyVo = new RestApiReqBodyVo(); - reqBodyVo.setSfzh("121"); + reqBodyVo.setSfzh(confirmReqVO.getPatId()); reqBodyVo.setMzzyh("A34343"); + // QueryRisReportList queryEcgRequest RestApiResult<Object> result = remoteDataService.httpApi("queryEcgRequest", "ECG", "ECG", reqBodyVo); + List<AppointmentExternal> list = + result.getRow().stream().map( + rawItem -> { + AppointmentExternal appointmentExternal = JSONObject.parseObject(JSONObject.toJSONString(rawItem), AppointmentExternal.class); + return appointmentExternal; + } + ).collect(Collectors.toList()); + + AppointmentExternal appointmentExternal = list.get(0); + + QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO(); + + queueSaveReqVO.setPatId( appointmentExternal.getPatientID() ); + queueSaveReqVO.setPatName( appointmentExternal.getPatName() ); + queueSaveReqVO.setPatGender( Byte.valueOf(appointmentExternal.getPatgender()) ); + + + DateTimeFormatter ISO_LOCAL_DATE_TIME2 = new DateTimeFormatterBuilder() + .parseCaseInsensitive() + .append(ISO_LOCAL_DATE) + .appendLiteral(' ') + .append(ISO_LOCAL_TIME) + .toFormatter(); + LocalDateTime bookStartTime = LocalDateTime.parse(appointmentExternal.getReqExtBooktime(), ISO_LOCAL_DATE_TIME2); + LocalDateTime bookEndTime = bookStartTime.plusMinutes(30); + queueSaveReqVO.setBookTimeslot( + (bookStartTime.getHour()*100 + bookStartTime.getMinute())*10000 + + bookEndTime.getHour()*100 + bookEndTime.getMinute() ); + + //queueSaveReqVO.setBookCheckType( Byte.valueOf(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()) ); + queueSaveReqVO.setBookCheckType( (byte)10 ); + + queueSaveReqVO.setSeqNum(1); + queueSaveReqVO.setStatus((byte)10); + queueSaveReqVO.setPassed((byte)0); + queueSaveReqVO.setExpired((byte)0); + + queueSaveReqVO.setRoomNum("-"); + queueSaveReqVO.setBedNum("-"); + + queueService.createqueue(queueSaveReqVO); + return success("hello"); } } -- Gitblit v1.9.3