From dc90adfdd8b5efe8368d831e8fd5c89002c92b68 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 29 十月 2024 16:03:12 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 91 +++++++++++++++------------------------------
1 files changed, 30 insertions(+), 61 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 f43661c..017e0c1 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,14 +1,20 @@
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.devrent.vo.DevRentSaveReqVO;
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.enums.QueueStatusEnum;
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.devrent.DevRentService;
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.dao.DuplicateKeyException;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,10 +23,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;
@@ -29,12 +33,15 @@
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 cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;
@@ -59,7 +66,13 @@
private QueueService queueService;
@Resource
- private RemoteDataService remoteDataService;
+ private RoomService roomService;
+
+ @Resource
+ private DevRentService devRentService;
+
+ @Resource
+ private DeptApi deptApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰勭害")
@@ -94,6 +107,15 @@
return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
}
+ @GetMapping("/get-by-patient")
+ @Operation(summary = "鏍规嵁鎮ｈ�呯紪鍙�.鑾峰緱棰勭害")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+ public CommonResult<AppointmentRespVO> getAppointmentByPatient(@RequestParam("patId") String patId) {
+ AppointmentDO appointment = appointmentService.getAppointmentByPatId( patId );
+ return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
+ }
+
@GetMapping("/page")
@Operation(summary = "鑾峰緱棰勭害鍒嗛〉")
@PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
@@ -119,61 +141,8 @@
@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);
-
- return success("hello");
+ appointmentService.appoitmentConfirm( confirmReqVO );
+ return success("纭鎴愬姛");
}
+
}
--
Gitblit v1.9.3