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 | 107 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 95 insertions(+), 12 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..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,9 +1,16 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment;
+import cn.hutool.core.bean.BeanUtil;
+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.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 org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -11,19 +18,27 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
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;
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;
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 +58,16 @@
private AppointmentService appointmentService;
@Resource
+ private QueueService queueService;
+
+ @Resource
+ private RoomService roomService;
+
+ @Resource
private RemoteDataService remoteDataService;
+
+ @Resource
+ private DeptApi deptApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰勭害")
@@ -99,23 +123,82 @@
BeanUtils.toBean(list, AppointmentRespVO.class));
}
+ // TODO 瀵规帴鏁版嵁骞冲彴
+ private void getRemoteAppointment(AppointmentConfirmReqVO confirmReqVO) {
+ 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.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(id);
- //return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
+ //TODO 鍏堜粠棰勭害琛ㄥ彇鏁版嵁锛屽悗缁鎺ユ暟鎹钩鍙版煡棰勭害鏁版嵁
+ AppointmentDO appointment = appointmentService.getAppointment(confirmReqVO.getId());
- RestApiReqParamVo reqParamVo = new RestApiReqParamVo();
- reqParamVo.setService("queryEcgRequest"); // queryEcgRequest QueryRisReportList
- reqParamVo.setUrid("ECG");
- reqParamVo.setPwd("ECG");
- RestApiReqBodyVo reqBodyVo = new RestApiReqBodyVo();
- reqBodyVo.setSfzh("121");
- reqBodyVo.setMzzyh("A34343");
+/* TODO for Testing
+ if ( !DateUtils.isToday(appointment.getBookDate()) )
+ return error( new ErrorCode(101, "涓嶆槸浠婂ぉ鐨勯绾︾敤鎴�"));
+*/
- RestApiResult<Object> result = remoteDataService.httpApi("queryEcgRequest", "ECG", "ECG", reqBodyVo);
+ 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);
return success("hello");
}
--
Gitblit v1.9.3