From 932a99f21b84bd3e64e397a68a18900a8412d200 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 12 八月 2024 18:21:58 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java | 15 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/PlanDefItem.java | 14 ++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java | 13 +-
sql/mysql/jh.sql | 2
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java | 36 ++---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 30 ++--
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/PlanDefItemList.java | 10 +
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/AppointmentExternal.java | 55 +++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 61 ++++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java | 5
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 19 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/ReportExternal.java | 26 ++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java | 3
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java | 14 +-
14 files changed, 227 insertions(+), 76 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 b479795..ecb22ee 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,8 +1,13 @@
package cn.lihu.jh.module.ecg.controller.admin.appointment;
+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 org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -10,8 +15,14 @@
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.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;
@@ -23,6 +34,8 @@
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;
@@ -40,6 +53,9 @@
@Resource
private AppointmentService appointmentService;
+
+ @Resource
+ private QueueService queueService;
@Resource
private RemoteDataService remoteDataService;
@@ -107,11 +123,54 @@
//return success(BeanUtils.toBean(appointment, AppointmentRespVO.class));
RestApiReqBodyVo reqBodyVo = new RestApiReqBodyVo();
- reqBodyVo.setSfzh("121");
+ 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);
+ 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");
}
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
index 70dede7..f10ec87 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
@@ -22,8 +22,8 @@
import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.queueDO;
-import cn.lihu.jh.module.ecg.service.queue.queueService;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
+import cn.lihu.jh.module.ecg.service.queue.QueueService;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
@@ -36,19 +36,19 @@
public class queueController {
@Resource
- private queueService queueService;
+ private QueueService queueService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鎺掗槦")
@PreAuthorize("@ss.hasPermission('ecg:queue:create')")
- public CommonResult<Integer> createqueue(@Valid @RequestBody queueSaveReqVO createReqVO) {
+ public CommonResult<Integer> createqueue(@Valid @RequestBody QueueSaveReqVO createReqVO) {
return success(queueService.createqueue(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊鎺掗槦")
@PreAuthorize("@ss.hasPermission('ecg:queue:update')")
- public CommonResult<Boolean> updatequeue(@Valid @RequestBody queueSaveReqVO updateReqVO) {
+ public CommonResult<Boolean> updatequeue(@Valid @RequestBody QueueSaveReqVO updateReqVO) {
queueService.updatequeue(updateReqVO);
return success(true);
}
@@ -66,30 +66,30 @@
@Operation(summary = "鑾峰緱鎺掗槦")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('ecg:queue:query')")
- public CommonResult<queueRespVO> getqueue(@RequestParam("id") Integer id) {
- queueDO queue = queueService.getqueue(id);
- return success(BeanUtils.toBean(queue, queueRespVO.class));
+ public CommonResult<QueueRespVO> getqueue(@RequestParam("id") Integer id) {
+ QueueDO queue = queueService.getqueue(id);
+ return success(BeanUtils.toBean(queue, QueueRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱鎺掗槦鍒嗛〉")
@PreAuthorize("@ss.hasPermission('ecg:queue:query')")
- public CommonResult<PageResult<queueRespVO>> getqueuePage(@Valid queuePageReqVO pageReqVO) {
- PageResult<queueDO> pageResult = queueService.getqueuePage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, queueRespVO.class));
+ public CommonResult<PageResult<QueueRespVO>> getqueuePage(@Valid QueuePageReqVO pageReqVO) {
+ PageResult<QueueDO> pageResult = queueService.getqueuePage(pageReqVO);
+ return success(BeanUtils.toBean(pageResult, QueueRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "瀵煎嚭鎺掗槦 Excel")
@PreAuthorize("@ss.hasPermission('ecg:queue:export')")
@ApiAccessLog(operateType = EXPORT)
- public void exportqueueExcel(@Valid queuePageReqVO pageReqVO,
+ public void exportqueueExcel(@Valid QueuePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<queueDO> list = queueService.getqueuePage(pageReqVO).getList();
+ List<QueueDO> list = queueService.getqueuePage(pageReqVO).getList();
// 瀵煎嚭 Excel
- ExcelUtils.write(response, "鎺掗槦.xls", "鏁版嵁", queueRespVO.class,
- BeanUtils.toBean(list, queueRespVO.class));
+ ExcelUtils.write(response, "鎺掗槦.xls", "鏁版嵁", QueueRespVO.class,
+ BeanUtils.toBean(list, QueueRespVO.class));
}
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java
index 1a2c529..f9d1fa8 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queuePageReqVO.java
@@ -1,7 +1,6 @@
package cn.lihu.jh.module.ecg.controller.admin.queue.vo;
import lombok.*;
-import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.lihu.jh.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
@@ -13,7 +12,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
-public class queuePageReqVO extends PageParam {
+public class QueuePageReqVO extends PageParam {
@Schema(description = "鎮ｈ�呯紪鍙�", example = "30473")
private String patId;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java
index a6c75da..340b946 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueRespVO.java
@@ -2,15 +2,14 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "绠＄悊鍚庡彴 - 鎺掗槦 Response VO")
@Data
@ExcelIgnoreUnannotated
-public class queueRespVO {
+public class QueueRespVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21320")
@ExcelProperty("id")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java
index 91eedcc..d58a983 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/vo/queueSaveReqVO.java
@@ -5,12 +5,11 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
-import java.util.*;
@Schema(description = "绠＄悊鍚庡彴 - 鎺掗槦鏂板/淇敼 Request VO")
@Data
-public class queueSaveReqVO {
+public class QueueSaveReqVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21320")
private Integer id;
@@ -24,14 +23,14 @@
private String patName;
@Schema(description = "鎮ｈ�呮�у埆")
- private Boolean patGender;
+ private Byte patGender;
@Schema(description = "棰勭害鏃堕棿娈�", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "棰勭害鏃堕棿娈典笉鑳戒负绌�")
private Integer bookTimeslot;
@Schema(description = "棰勭害妫�鏌ョ被鍨�", example = "1")
- private Boolean bookCheckType;
+ private Byte bookCheckType;
@Schema(description = "鎺掗槦搴忓彿", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "鎺掗槦搴忓彿涓嶈兘涓虹┖")
@@ -39,15 +38,15 @@
@Schema(description = "10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡涓嶈兘涓虹┖")
- private Boolean status;
+ private Byte status;
@Schema(description = "杩囧彿鏍囪", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "杩囧彿鏍囪涓嶈兘涓虹┖")
- private Boolean passed;
+ private Byte passed;
@Schema(description = "棰勭害杩囨湡鏍囪", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "棰勭害杩囨湡鏍囪涓嶈兘涓虹┖")
- private Boolean expired;
+ private Byte expired;
@Schema(description = "璇婂缂栧彿")
private String roomNum;
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java
index 183d4ac..2a64685 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/queue/queueDO.java
@@ -1,9 +1,6 @@
package cn.lihu.jh.module.ecg.dal.dataobject.queue;
import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.lihu.jh.framework.mybatis.core.dataobject.BaseDO;
@@ -20,7 +17,7 @@
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class queueDO extends BaseDO {
+public class QueueDO extends BaseDO {
/**
* id
@@ -38,7 +35,7 @@
/**
* 鎮ｈ�呮�у埆
*/
- private Boolean patGender;
+ private Byte patGender;
/**
* 棰勭害鏃堕棿娈�
*/
@@ -46,7 +43,7 @@
/**
* 棰勭害妫�鏌ョ被鍨�
*/
- private Boolean bookCheckType;
+ private Byte bookCheckType;
/**
* 鎺掗槦搴忓彿
*/
@@ -54,15 +51,15 @@
/**
* 10:鎺掗槦涓� 20:鍊欒瘖鍑嗗 30:灏辫瘖涓� 40:灏辫瘖瀹屾垚 50:杩囧彿 60:杩囨湡
*/
- private Boolean status;
+ private Byte status;
/**
* 杩囧彿鏍囪
*/
- private Boolean passed;
+ private Byte passed;
/**
* 棰勭害杩囨湡鏍囪
*/
- private Boolean expired;
+ private Byte expired;
/**
* 璇婂缂栧彿
*/
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java
index 19a33bc..30a3e14 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java
@@ -1,11 +1,9 @@
package cn.lihu.jh.module.ecg.dal.mysql.queue;
-import java.util.*;
-
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.queueDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import org.apache.ibatis.annotations.Mapper;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
@@ -15,23 +13,23 @@
* @author 鑺嬮亾婧愮爜
*/
@Mapper
-public interface queueMapper extends BaseMapperX<queueDO> {
+public interface queueMapper extends BaseMapperX<QueueDO> {
- default PageResult<queueDO> selectPage(queuePageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<queueDO>()
- .eqIfPresent(queueDO::getPatId, reqVO.getPatId())
- .likeIfPresent(queueDO::getPatName, reqVO.getPatName())
- .eqIfPresent(queueDO::getPatGender, reqVO.getPatGender())
- .eqIfPresent(queueDO::getBookTimeslot, reqVO.getBookTimeslot())
- .eqIfPresent(queueDO::getBookCheckType, reqVO.getBookCheckType())
- .eqIfPresent(queueDO::getSeqNum, reqVO.getSeqNum())
- .eqIfPresent(queueDO::getStatus, reqVO.getStatus())
- .eqIfPresent(queueDO::getPassed, reqVO.getPassed())
- .eqIfPresent(queueDO::getExpired, reqVO.getExpired())
- .eqIfPresent(queueDO::getRoomNum, reqVO.getRoomNum())
- .eqIfPresent(queueDO::getBedNum, reqVO.getBedNum())
- .betweenIfPresent(queueDO::getCreateTime, reqVO.getCreateTime())
- .orderByDesc(queueDO::getId));
+ default PageResult<QueueDO> selectPage(QueuePageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX<QueueDO>()
+ .eqIfPresent(QueueDO::getPatId, reqVO.getPatId())
+ .likeIfPresent(QueueDO::getPatName, reqVO.getPatName())
+ .eqIfPresent(QueueDO::getPatGender, reqVO.getPatGender())
+ .eqIfPresent(QueueDO::getBookTimeslot, reqVO.getBookTimeslot())
+ .eqIfPresent(QueueDO::getBookCheckType, reqVO.getBookCheckType())
+ .eqIfPresent(QueueDO::getSeqNum, reqVO.getSeqNum())
+ .eqIfPresent(QueueDO::getStatus, reqVO.getStatus())
+ .eqIfPresent(QueueDO::getPassed, reqVO.getPassed())
+ .eqIfPresent(QueueDO::getExpired, reqVO.getExpired())
+ .eqIfPresent(QueueDO::getRoomNum, reqVO.getRoomNum())
+ .eqIfPresent(QueueDO::getBedNum, reqVO.getBedNum())
+ .betweenIfPresent(QueueDO::getCreateTime, reqVO.getCreateTime())
+ .orderByDesc(QueueDO::getId));
}
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/AppointmentExternal.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/AppointmentExternal.java
new file mode 100644
index 0000000..01b8fef
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/AppointmentExternal.java
@@ -0,0 +1,55 @@
+package cn.lihu.jh.module.ecg.feign.dto;
+
+import lombok.Data;
+
+@Data
+public class AppointmentExternal {
+ private String ReqIdeApplyno;
+ private String ReqStatus;
+ private String ReqCodeItemclass;
+ private String ReqCodeItemclassdetaill;
+ private String PatientID;
+ private String EpisodeID;
+ private String OutMedNO;
+ private String InMedNO;
+ private String VisitNum;
+ private String AdmTypeCode;
+ private String AdmTypeDesc;
+ private String AdmStatus;
+ private String AdmDate;
+ private String PatName;
+ private String Patgender;
+ private String EncPatBirthDate;
+ private String Age;
+ private String Phone;
+ private String Address;
+ private String IdentityID;
+ private String PatLocDeptCode;
+ private String PatLocDeptDesc;
+ private String PatLocWardCode;
+ private String PatLocWardDesc;
+ private String EnBedno;
+ private String clinSymp;
+ private String clinDiag;
+ private String relevantDiag;
+ private String ReqAuthoredOn;
+ private String ReqExtApplydeptCode;
+ private String ReqExtApplydeptName;
+ private String ReqExtExecdeptCode;
+ private String ReqExtExecdeptName;
+ private String ReqExtApplydocCode;
+ private String ReqExtApplydocName;
+ private String ReqExtMedhistory;
+ private String ReqExtBooktime;
+ private String ReqExtBookplace;
+ private String ReqExtUrgent;
+ private String ReqExtExamgoal;
+ private String ReqExtBookcheckno;
+ private String ReqExtBookcheckpertime;
+ private String ReqExtCheckremark;
+ private String PlanDefBarcode;
+ private PlanDefItemList PlanDefItemList;
+
+ // 鐪佺暐 getter 鍜� setter 鏂规硶
+}
+
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/PlanDefItem.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/PlanDefItem.java
new file mode 100644
index 0000000..0f50e90
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/PlanDefItem.java
@@ -0,0 +1,14 @@
+package cn.lihu.jh.module.ecg.feign.dto;
+
+import lombok.Data;
+
+@Data
+public class PlanDefItem {
+ private String PlanDefvalue;
+ private String PlanDefItemcode;
+ private String PlanDefItemDesc;
+ private String PlanDefRpCode;
+ private String PlanDefDetRpCode;
+
+ // 鐪佺暐 getter 鍜� setter 鏂规硶
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/PlanDefItemList.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/PlanDefItemList.java
new file mode 100644
index 0000000..57d5a9c
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/PlanDefItemList.java
@@ -0,0 +1,10 @@
+package cn.lihu.jh.module.ecg.feign.dto;
+
+import lombok.Data;
+
+@Data
+public class PlanDefItemList {
+ private PlanDefItem PlanDefItem;
+
+ // 鐪佺暐 getter 鍜� setter 鏂规硶
+}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/ReportExternal.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/ReportExternal.java
new file mode 100644
index 0000000..aa8fcd8
--- /dev/null
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/feign/dto/ReportExternal.java
@@ -0,0 +1,26 @@
+package cn.lihu.jh.module.ecg.feign.dto;
+
+import lombok.Data;
+
+@Data
+public class ReportExternal {
+ private String JZKNO;
+ private String JCZD;
+ private String BGSJ;
+ private String SFZH;
+ private String JCLX;
+ private String MRN;
+ private String JCSJ;
+ private String REPORTURL;
+ private String JCSJDATE;
+ private String KDSJ;
+ private String HISID;
+ private String SQDID;
+ private String BRXM;
+ private String MZZYH;
+ private String YSID;
+ private String JZLX;
+ private String YZMC;
+
+ // 鐪佺暐 getter 鍜� setter 鏂规硶
+}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java
index 92afb62..c51ebad 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueService.java
@@ -1,10 +1,8 @@
package cn.lihu.jh.module.ecg.service.queue;
-import java.util.*;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.queueDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
import javax.validation.Valid;
@@ -13,7 +11,7 @@
*
* @author 鑺嬮亾婧愮爜
*/
-public interface queueService {
+public interface QueueService {
/**
* 鍒涘缓鎺掗槦
@@ -21,14 +19,14 @@
* @param createReqVO 鍒涘缓淇℃伅
* @return 缂栧彿
*/
- Integer createqueue(@Valid queueSaveReqVO createReqVO);
+ Integer createqueue(@Valid QueueSaveReqVO createReqVO);
/**
* 鏇存柊鎺掗槦
*
* @param updateReqVO 鏇存柊淇℃伅
*/
- void updatequeue(@Valid queueSaveReqVO updateReqVO);
+ void updatequeue(@Valid QueueSaveReqVO updateReqVO);
/**
* 鍒犻櫎鎺掗槦
@@ -43,7 +41,7 @@
* @param id 缂栧彿
* @return 鎺掗槦
*/
- queueDO getqueue(Integer id);
+ QueueDO getqueue(Integer id);
/**
* 鑾峰緱鎺掗槦鍒嗛〉
@@ -51,6 +49,6 @@
* @param pageReqVO 鍒嗛〉鏌ヨ
* @return 鎺掗槦鍒嗛〉
*/
- PageResult<queueDO> getqueuePage(queuePageReqVO pageReqVO);
+ PageResult<QueueDO> getqueuePage(QueuePageReqVO pageReqVO);
}
\ No newline at end of file
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
index defd969..98a3b40 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
@@ -2,13 +2,10 @@
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.queueDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
@@ -25,26 +22,26 @@
*/
@Service
@Validated
-public class queueServiceImpl implements queueService {
+public class QueueServiceImpl implements QueueService {
@Resource
private queueMapper queueMapper;
@Override
- public Integer createqueue(queueSaveReqVO createReqVO) {
+ public Integer createqueue(QueueSaveReqVO createReqVO) {
// 鎻掑叆
- queueDO queue = BeanUtils.toBean(createReqVO, queueDO.class);
+ QueueDO queue = BeanUtils.toBean(createReqVO, QueueDO.class);
queueMapper.insert(queue);
// 杩斿洖
return queue.getId();
}
@Override
- public void updatequeue(queueSaveReqVO updateReqVO) {
+ public void updatequeue(QueueSaveReqVO updateReqVO) {
// 鏍￠獙瀛樺湪
validatequeueExists(updateReqVO.getId());
// 鏇存柊
- queueDO updateObj = BeanUtils.toBean(updateReqVO, queueDO.class);
+ QueueDO updateObj = BeanUtils.toBean(updateReqVO, QueueDO.class);
queueMapper.updateById(updateObj);
}
@@ -63,12 +60,12 @@
}
@Override
- public queueDO getqueue(Integer id) {
+ public QueueDO getqueue(Integer id) {
return queueMapper.selectById(id);
}
@Override
- public PageResult<queueDO> getqueuePage(queuePageReqVO pageReqVO) {
+ public PageResult<QueueDO> getqueuePage(QueuePageReqVO pageReqVO) {
return queueMapper.selectPage(pageReqVO);
}
diff --git a/sql/mysql/jh.sql b/sql/mysql/jh.sql
index eb88b04..792a45d 100644
--- a/sql/mysql/jh.sql
+++ b/sql/mysql/jh.sql
@@ -46,7 +46,7 @@
`id` int NOT NULL AUTO_INCREMENT COMMENT 'id',
`pat_id` varchar(30) NOT NULL COMMENT '鎮ｈ�呯紪鍙�',
`pat_name` varchar(10) NOT NULL COMMENT '鎮ｈ�呭鍚�',
- `pat_gender` bit(1) DEFAULT NULL COMMENT '鎮ｈ�呮�у埆',
+ `pat_gender` tinyint(1) DEFAULT NULL COMMENT '鎮ｈ�呮�у埆',
`book_timeslot` int NOT NULL COMMENT '棰勭害鏃堕棿娈�',
`book_check_type` tinyint(1) DEFAULT NULL COMMENT '棰勭害妫�鏌ョ被鍨�',
`seq_num` int NOT NULL COMMENT '鎺掗槦搴忓彿',
--
Gitblit v1.9.3