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 | 87 ++-----------------------------------------
1 files changed, 5 insertions(+), 82 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 0347684..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
@@ -5,6 +5,7 @@
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.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;
@@ -68,9 +69,6 @@
private RoomService roomService;
@Resource
- private RemoteDataService remoteDataService;
-
- @Resource
private DevRentService devRentService;
@Resource
@@ -110,7 +108,7 @@
}
@GetMapping("/get-by-patient")
- @Operation(summary = "鑾峰緱棰勭害")
+ @Operation(summary = "鏍规嵁鎮ｈ�呯紪鍙�.鑾峰緱棰勭害")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
public CommonResult<AppointmentRespVO> getAppointmentByPatient(@RequestParam("patId") String patId) {
@@ -139,87 +137,12 @@
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( 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(confirmReqVO.getId());
- if (null == appointment)
- return error(PATIENT_NOT_EXISTS);
-
- if ( !DateUtils.isToday(appointment.getBookDate()) )
- return error( APPOINTMENT_NOT_TODAY);
-
- try {
- 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);
- } catch (DuplicateKeyException duplicateKeyException) {
- return success("鎮ㄥ凡缁忓湪鎺掗槦涓簡");
- }
-
- return success("鎿嶄綔鎴愬姛");
+ appointmentService.appoitmentConfirm( confirmReqVO );
+ return success("纭鎴愬姛");
}
+
}
--
Gitblit v1.9.3