From 3e696d457f13338a7eb5ad0935a7d2c7affcf605 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 23 八月 2024 11:02:36 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 89 ++++++++++++++------------------------------
1 files changed, 29 insertions(+), 60 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 d357c01..ead467e 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,11 +1,9 @@
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.framework.common.exception.ErrorCode;
+import cn.lihu.jh.framework.common.util.date.DateUtils;
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.RestApiResult;
@@ -13,8 +11,6 @@
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;
@@ -23,19 +19,18 @@
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;
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+
+import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
import cn.lihu.jh.framework.excel.core.util.ExcelUtils;
@@ -128,14 +123,8 @@
BeanUtils.toBean(list, AppointmentRespVO.class));
}
- @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));
-
+ // TODO 瀵规帴鏁版嵁骞冲彴
+ private void getRemoteAppointment(AppointmentConfirmReqVO confirmReqVO) {
RestApiReqBodyVo reqBodyVo = new RestApiReqBodyVo();
reqBodyVo.setSfzh(confirmReqVO.getPatId());
reqBodyVo.setMzzyh("A34343");
@@ -172,7 +161,7 @@
LocalDateTime bookEndTime = bookStartTime.plusMinutes(30);
queueSaveReqVO.setBookTimeslot(
(bookStartTime.getHour()*100 + bookStartTime.getMinute())*10000
- + bookEndTime.getHour()*100 + bookEndTime.getMinute() );
+ + bookEndTime.getHour()*100 + bookEndTime.getMinute() );
//queueSaveReqVO.setBookCheckType( Byte.valueOf(appointmentExternal.getPlanDefItemList().getPlanDefItem().getPlanDefItemcode()) );
queueSaveReqVO.setBookCheckType( (byte)10 );
@@ -182,55 +171,35 @@
queueSaveReqVO.setPassed((byte)0);
queueSaveReqVO.setExpired((byte)0);
- queueSaveReqVO.setRoomNum("-");
- queueSaveReqVO.setBedNum("-");
+ queueSaveReqVO.setRoomName("-");
+ queueSaveReqVO.setBedNo("-");
queueService.createqueue(queueSaveReqVO);
+ }
+ @PostMapping("/confirm")
+ @Operation(summary = "棰勭害纭")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
+ public CommonResult<String> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
+ //TODO 鍏堜粠棰勭害琛ㄥ彇鏁版嵁锛屽悗缁鎺ユ暟鎹钩鍙版煡棰勭害鏁版嵁
+ AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());
- // 鑾峰彇鍊欒瘖鍑嗗鐨勯厤缃汉鏁� 锛� 钀ヤ笟鐨勮瘖瀹�
-
-/*
- List<DeptDO> list = deptService.getDeptList(
- new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
- return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
+/* TODO for Testing
+ if ( !DateUtils.isToday(appointment.getBookDate()) )
+ return error( new ErrorCode(101, "涓嶆槸浠婂ぉ鐨勯绾︾敤鎴�"));
*/
- List<DeptRespDTO> deptRespDTOList = deptApi.getSimpleDeptList();
- Optional<DeptRespDTO> ecgDept = deptRespDTOList.stream()
- .filter(a -> a.getName().equals("ECG"))
- .findAny();
+ QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
+ queueSaveReqVO.setPatId( appointment.getPatId());
+ queueSaveReqVO.setPatName( appointment.getPatName() );
+ queueSaveReqVO.setPatGender( appointment.getPatGender());
+ queueSaveReqVO.setBookDate( appointment.getBookDate() );
+ queueSaveReqVO.setBookTimeslot( appointment.getBookTimeslot() );
+ queueSaveReqVO.setBookCheckType( appointment.getBookCheckType() );
+ queueSaveReqVO.setPassed((byte)0);
+ queueSaveReqVO.setExpired((byte)0);
+ queueService.queue(queueSaveReqVO);
- 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();
- }
-
- // 鑾峰彇闂ㄨ瘖瀹� 璇婄枟搴婄殑缁熻
- List<RoomStatisticsDO> roomStatisticsList = roomService.roomStatistics();
- roomStatisticsList.size();
-
-<<<<<<< HEAD
-=======
- // 鑾峰彇 姣忎釜钀ヤ笟鐨勮瘖瀹� 鍊欒瘖鍑嗗鐨勫綋鍓嶄汉鏁� 灏辫瘖涓殑褰撳墠浜烘暟
- // queueService.get
->>>>>>> c7362f7 (update)
- List statusList = new ArrayList<Byte>();
- statusList.add((byte)20);
- statusList.add((byte)30);
- List<QueueStatisticDO> queueStatisticDOList = queueService.queueStatistics(statusList);
- queueStatisticDOList.size();
-
-<<<<<<< HEAD
-=======
-
-
->>>>>>> c7362f7 (update)
return success("hello");
}
}
--
Gitblit v1.9.3