From 7660fe12273a6b132256a2fa83ca1b11d6b2381f Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 13 八月 2024 17:48:44 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 129 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 5 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 3f92d62..518f1a4 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,18 +1,33 @@ package cn.lihu.jh.module.ecg.controller.admin.appointment; +import cn.hutool.core.bean.BeanUtil; +import cn.lihu.jh.framework.common.enums.CommonStatusEnum; +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 cn.lihu.jh.module.system.api.dept.DeptApi; +import cn.lihu.jh.module.system.api.dept.dto.DeptRespDTO; +import com.alibaba.fastjson.JSONObject; import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import jakarta.validation.constraints.*; -import jakarta.validation.*; -import jakarta.servlet.http.*; +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.function.Supplier; +import java.util.stream.Collectors; import cn.lihu.jh.framework.common.pojo.PageParam; import cn.lihu.jh.framework.common.pojo.PageResult; @@ -24,10 +39,16 @@ 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; import cn.lihu.jh.module.ecg.service.appointment.AppointmentService; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; @Tag(name = "绠$悊鍚庡彴 - 棰勭害") @RestController @@ -37,6 +58,15 @@ @Resource private AppointmentService appointmentService; + + @Resource + private QueueService queueService; + + @Resource + private RemoteDataService remoteDataService; + + @Resource + private DeptApi deptApi; @PostMapping("/create") @Operation(summary = "鍒涘缓棰勭害") @@ -92,4 +122,93 @@ BeanUtils.toBean(list, AppointmentRespVO.class)); } -} \ No newline at end of file + @PostMapping("/confirm") + @Operation(summary = "棰勭害纭") + @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')") + public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) { + //TODO 澶勭悊鎺掗槦閫昏緫 + //AppointmentDO appointment = appointmentService.getAppointment(id); + //return success(BeanUtils.toBean(appointment, AppointmentRespVO.class)); + + RestApiReqBodyVo reqBodyVo = new RestApiReqBodyVo(); + 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); + AppointmentExternal appointmentExternal = BeanUtil.toBeanIgnoreCase( rawItem, AppointmentExternal.class, true); + + 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); + + + // 鑾峰彇鍊欒瘖鍑嗗鐨勯厤缃汉鏁� 锛� 钀ヤ笟鐨勮瘖瀹� + +/* + List<DeptDO> list = deptService.getDeptList( + new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); + return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); +*/ + + List<DeptRespDTO> deptRespDTOList = deptApi.getSimpleDeptList(); + Optional<DeptRespDTO> ecgDept = deptRespDTOList.stream() + .filter(a -> a.getName().equals("ECG")) + .findAny(); + + if (ecgDept.isPresent()){ + System.out.println(ecgDept.get().getName()); + + List<DeptRespDTO> list2 = deptRespDTOList.stream() + .filter(a -> Objects.equals(a.getParentId(), ecgDept.get().getId())) + .toList(); + list2.forEach(System.out::println); + list2.size(); + } + + // 鑾峰彇 姣忎釜钀ヤ笟鐨勮瘖瀹� 鍊欒瘖鍑嗗鐨勫綋鍓嶄汉鏁� 灏辫瘖涓殑褰撳墠浜烘暟 + // queueService.get + + + return success("hello"); + } +} -- Gitblit v1.9.3