73 门诊医生排班管理

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/DoctorSchedule.java

@@ -2,11 +2,13 @@ package com.openhis.appointmentmanage.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 /**
  * 医生排班Entity
@@ -16,10 +18,11 @@ import java.time.LocalTime;
 @Data
 @TableName(value = "adm_doctor_schedule")
 @Accessors(chain = true)
-public class DoctorSchedule {
+@EqualsAndHashCode(callSuper = false)
+public class DoctorSchedule extends HisBaseEntity {
     /** id - 数据库GENERATED ALWAYS，由数据库自动生成，插入时不应包含此字段 */
     @TableId(type = IdType.NONE)
-    private Integer id;
+    private Long id;
 
     /** 星期 */
     private String weekday;
@@ -67,11 +70,8 @@ public class DoctorSchedule {
     private String stopReason;
 
     /** 关联科室id */
-    private Integer deptId;
+    private Long deptId;
 
-    /** 创建时间 */
-    private LocalDateTime createTime;
-
-    /** 更新时间 */
-    private LocalDateTime updateTime;
+    /** 医生ID - 不映射到数据库表字段，仅作传输使用 */
+    private Long doctorId;
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/SchedulePool.java

@@ -1,11 +1,15 @@
 package com.openhis.appointmentmanage.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 /**
  * 号源池Entity
@@ -15,21 +19,23 @@ import java.time.LocalTime;
 @Data
 @TableName(value = "adm_schedule_pool")
 @Accessors(chain = true)
-public class SchedulePool {
+@EqualsAndHashCode(callSuper = false)
+public class SchedulePool extends HisBaseEntity {
     /** id */
-    private Integer id;
+    @TableId(type = IdType.AUTO)
+    private Long id;
 
     /** 业务编号 */
     private String poolCode;
 
     /** 医院ID */
-    private Integer hospitalId;
+    private Long hospitalId;
 
     /** 科室ID */
-    private Integer deptId;
+    private Long deptId;
 
     /** 医生ID */
-    private Integer doctorId;
+    private Long doctorId;
 
     /** 医生姓名 */
     private String doctorName;
@@ -80,26 +86,20 @@ public class SchedulePool {
     private String stopReason;
 
     /** 放号时间 */
-    private LocalDateTime releaseTime;
+    private Date releaseTime;
 
     /** 截止预约时间 */
-    private LocalDateTime deadlineTime;
+    private Date deadlineTime;
 
     /** 乐观锁版本 */
     private Integer version;
 
     /** 操作人ID */
-    private Integer opUserId;
+    private Long opUserId;
 
     /** 备注 */
     private String remark;
 
     /** 排班ID */
-    private Integer scheduleId;
-
-    /** 创建时间 */
-    private LocalDateTime createTime;
-
-    /** 更新时间 */
-    private LocalDateTime updateTime;
+    private Long scheduleId;
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java

@@ -1,10 +1,13 @@
 package com.openhis.appointmentmanage.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 /**
  * 号源池明细Entity
@@ -14,8 +17,10 @@ import java.time.LocalTime;
 @Data
 @TableName(value = "adm_schedule_slot")
 @Accessors(chain = true)
-public class ScheduleSlot {
+@EqualsAndHashCode(callSuper = false)
+public class ScheduleSlot extends HisBaseEntity {
     /** 明细主键 */
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     /** 号源池ID */
@@ -32,10 +37,4 @@ public class ScheduleSlot {
 
     /** 预计叫号时间 */
     private LocalTime expectTime;
-
-    /** 创建时间 */
-    private LocalDateTime createTime;
-
-    /** 更新时间 */
-    private LocalDateTime updateTime;
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/ISchedulePoolService.java

@@ -2,6 +2,13 @@ package com.openhis.appointmentmanage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.appointmentmanage.domain.SchedulePool;
+import io.swagger.models.auth.In;
 
 public interface ISchedulePoolService extends IService<SchedulePool> {
+    /**
+     * 根据排班ID创建号源池
+     * @param scheduledId
+     * @return
+     */
+    SchedulePool creatSchedulePoolByScheduledId(Integer scheduledId);
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/service/impl/SchedulePoolServiceImpl.java

@@ -8,4 +8,8 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class SchedulePoolServiceImpl extends ServiceImpl<SchedulePoolMapper, SchedulePool> implements ISchedulePoolService {
+    @Override
+    public SchedulePool creatSchedulePoolByScheduledId(Integer scheduledId) {
+        return null;
+    }
 }