From a7b5ec90a38f93bc1da2f48676c16bb757cb05f7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 22 八月 2024 10:14:17 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 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 ecb22ee..8db650a 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,13 +1,14 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment;
+import cn.hutool.core.bean.BeanUtil;
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 cn.lihu.jh.module.ecg.service.room.RoomService;
+import cn.lihu.jh.module.system.api.dept.DeptApi;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -16,10 +17,8 @@
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;
@@ -58,7 +57,13 @@
private QueueService queueService;
@Resource
+ private RoomService roomService;
+
+ @Resource
private RemoteDataService remoteDataService;
+
+ @Resource
+ private DeptApi deptApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰勭害")
@@ -114,14 +119,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");
@@ -132,7 +131,9 @@
List<AppointmentExternal> list =
result.getRow().stream().map(
rawItem -> {
- AppointmentExternal appointmentExternal = JSONObject.parseObject(JSONObject.toJSONString(rawItem), AppointmentExternal.class);
+ //AppointmentExternal appointmentExternal = JSONObject.parseObject(JSONObject.toJSONString(rawItem), AppointmentExternal.class);
+ AppointmentExternal appointmentExternal = BeanUtil.toBeanIgnoreCase( rawItem, AppointmentExternal.class, true);
+
return appointmentExternal;
}
).collect(Collectors.toList());
@@ -156,7 +157,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 );
@@ -166,10 +167,28 @@
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());
+
+ QueueSaveReqVO queueSaveReqVO = new QueueSaveReqVO();
+ queueSaveReqVO.setPatId( appointment.getPatId());
+ queueSaveReqVO.setPatName( appointment.getPatName() );
+ queueSaveReqVO.setPatGender( appointment.getPatGender());
+ queueSaveReqVO.setBookTimeslot( appointment.getBookTimeslot() );
+ queueSaveReqVO.setBookCheckType( appointment.getBookCheckType() );
+ queueSaveReqVO.setPassed((byte)0);
+ queueSaveReqVO.setExpired((byte)0);
+ queueService.queue(queueSaveReqVO);
return success("hello");
}
--
Gitblit v1.9.3