From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 164 ++++++++++++++++++------------------------------------
1 files changed, 54 insertions(+), 110 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 55fd0ab..4b8f4a7 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,19 +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.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.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;
-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 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;
@@ -21,28 +11,23 @@
import io.swagger.v3.oas.annotations.Parameter;
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.time.LocalDate;
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;
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 static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*;
import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO;
@@ -68,7 +53,7 @@
private RoomService roomService;
@Resource
- private RemoteDataService remoteDataService;
+ private DevRentService devRentService;
@Resource
private DeptApi deptApi;
@@ -76,7 +61,7 @@
@PostMapping("/create")
@Operation(summary = "鍒涘缓棰勭害")
@PreAuthorize("@ss.hasPermission('ecg:appointment:create')")
- public CommonResult<Integer> createAppointment(@Valid @RequestBody AppointmentSaveReqVO createReqVO) {
+ public CommonResult<Long> createAppointment(@Valid @RequestBody AppointmentSaveReqVO createReqVO) {
return success(appointmentService.createAppointment(createReqVO));
}
@@ -92,7 +77,7 @@
@Operation(summary = "鍒犻櫎棰勭害")
@Parameter(name = "id", description = "缂栧彿", required = true)
@PreAuthorize("@ss.hasPermission('ecg:appointment:delete')")
- public CommonResult<Boolean> deleteAppointment(@RequestParam("id") Integer id) {
+ public CommonResult<Boolean> deleteAppointment(@RequestParam("id") Long id) {
appointmentService.deleteAppointment(id);
return success(true);
}
@@ -101,9 +86,39 @@
@Operation(summary = "鑾峰緱棰勭害")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
- public CommonResult<AppointmentRespVO> getAppointment(@RequestParam("id") Integer id) {
+ public CommonResult<AppointmentRespVO> getAppointment(@RequestParam("id") Long id) {
AppointmentDO appointment = appointmentService.getAppointment(id);
return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
+ }
+
+ @GetMapping("/get-current-by-patient")
+ @Operation(summary = "鏍规嵁鎮ｈ�呯紪鍙�.鏌ヨ褰撳ぉ棰勭害")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+ public CommonResult<AppointmentRespVO> getCurAppointmentByPatId(@RequestParam("patId") String patId,
+ @RequestParam("checkType") Integer checkType) {
+ AppointmentDO appointment = appointmentService.getCurAppointmentByPatIdAndCheckType( patId, checkType );
+ return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
+ }
+
+ @GetMapping("/query-and-create-by-patient")
+ @Operation(summary = "鏍规嵁鎮ｈ�呯紪鍙�.鑾峰緱棰勭害.骞跺唴閮ㄥ垱寤洪绾�")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+ public CommonResult<List<AppointmentRespVO>> queryAndCreateAppointmentByPatId(@RequestParam("patId") String patId) {
+ List<AppointmentDO> appointmentDOList = appointmentService.queryAndCreateAppointmentByPatId( patId );
+ return success(BeanUtils.toBean(appointmentDOList, AppointmentRespVO.class));
+ }
+
+ @GetMapping("/query-his-by-patient")
+ @Operation(summary = "浠嶩IS.鏌ヨ鎮ｈ�呴绾�/寮�鍗曚俊鎭�")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:query')")
+ public CommonResult<AppointmentRespVO> queryHisByPatient(@RequestParam("patId") String patId) {
+ List<AppointmentDO> appointmentList = appointmentService.getAppointmentExtermal( patId );
+ if ( 0 == appointmentList.size() )
+ return error(APPOINTMENT_NOT_BILLING);
+ return success(BeanUtils.toBean(appointmentList.get(0), AppointmentRespVO.class));
}
@GetMapping("/page")
@@ -130,91 +145,20 @@
@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));
-
- 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);
-
-
- // 鑾峰彇鍊欒瘖鍑嗗鐨勯厤缃汉鏁� 锛� 钀ヤ笟鐨勮瘖瀹�
-
-/*
- List<DeptDO> list = deptService.getDeptList(
- new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
- return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
-*/
-
- List<DeptRespDTO> deptRespDTOList = deptApi.getSimpleDeptList();
- Optional<DeptRespDTO> ecgDept = deptRespDTOList.stream()
- .filter(a -> a.getName().equals("ECG"))
- .findAny();
-
- 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();
- }
-
- // 鑾峰彇 姣忎釜钀ヤ笟鐨勮瘖瀹� 鍊欒瘖鍑嗗鐨勫綋鍓嶄汉鏁� 灏辫瘖涓殑褰撳墠浜烘暟
- // queueService.get
- List<RoomStatisticsDO> roomStatisticsList = roomService.roomStatistics();
- roomStatisticsList.size();
-
- return success("hello");
+ public CommonResult<Integer> appointmentConfirm(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
+ confirmReqVO.setIsVip(0);
+ Integer newSeqNo = appointmentService.appoitmentConfirm( confirmReqVO );
+ return success(newSeqNo);
}
+
+ @PostMapping("/confirm-vip")
+ @Operation(summary = "VIP棰勭害纭")
+ @PreAuthorize("@ss.hasPermission('ecg:appointment:confirm')")
+ public CommonResult<Integer> appointmentConfirmVip(@RequestBody AppointmentConfirmReqVO confirmReqVO) {
+ confirmReqVO.setIsVip(1);
+ confirmReqVO.setBookDate( LocalDate.now() );
+ Integer newSeqNo = appointmentService.appoitmentConfirm( confirmReqVO );
+ return success(newSeqNo);
+ }
+
}
--
Gitblit v1.9.3