From 5f7a61e50bcf82f368272e29518b2bd3a85e4782 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 14 八月 2024 10:59:18 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 111 insertions(+), 6 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 9303784..8a370d8 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,9 +1,20 @@ 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.dal.dataobject.queue.QueueStatisticDO; +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO; import cn.lihu.jh.module.ecg.feign.RemoteDataService; import cn.lihu.jh.module.ecg.feign.RestApiReqBodyVo; -import cn.lihu.jh.module.ecg.feign.RestApiReqParamVo; 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.ecg.service.room.RoomService; +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 org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -11,8 +22,15 @@ 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.function.Supplier; +import java.util.stream.Collectors; import cn.lihu.jh.framework.common.pojo.PageParam; import cn.lihu.jh.framework.common.pojo.PageResult; @@ -24,6 +42,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; @@ -43,7 +63,16 @@ private AppointmentService appointmentService; @Resource + private QueueService queueService; + + @Resource + private RoomService roomService; + + @Resource private RemoteDataService remoteDataService; + + @Resource + private DeptApi deptApi; @PostMapping("/create") @Operation(summary = "鍒涘缓棰勭害") @@ -107,16 +136,92 @@ //AppointmentDO appointment = appointmentService.getAppointment(id); //return success(BeanUtils.toBean(appointment, AppointmentRespVO.class)); - RestApiReqParamVo reqParamVo = new RestApiReqParamVo(); - reqParamVo.setService("queryEcgRequest"); // queryEcgRequest QueryRisReportList - reqParamVo.setUrid("ECG"); - reqParamVo.setPwd("ECG"); 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); + 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 + List<RoomStatisticsDO> roomStatisticsList = roomService.roomStatistics(); + roomStatisticsList.size(); + + List statusList = new ArrayList<Byte>(); + statusList.add((byte)20); + statusList.add((byte)30); + List<QueueStatisticDO> queueStatisticDOList = queueService.queueStatistics(statusList); + queueStatisticDOList.size(); + return success("hello"); } } -- Gitblit v1.9.3