add 临床信息、病人信息

coffee-common/src/main/java/com/coffee/common/config/websocket/DefaultWebSocketMsgHandler.java

@@ -80,14 +80,14 @@ public class DefaultWebSocketMsgHandler implements IWsMsgHandler {
             channelContext.setClosed(true);
             return null;
         }
-        if(log.isDebugEnabled()){
-            log.debug("websocket 接收到消息,message:{},token:{},userId:{}",message,channelContext.getToken(),JSONUtil.toJsonStr(channelContext.get(Constants.LOGIN_USER_KEY)));
-        }
         //心跳请求 todo
         if("ping".equals(message.trim().toLowerCase())){
             return null;
         }
         try {
+            if(log.isDebugEnabled()){
+                log.debug("websocket 接收到消息,message:{},token:{},userId:{}",message,channelContext.getToken(),JSONUtil.toJsonStr(channelContext.get(Constants.LOGIN_USER_KEY)));
+            }
             MessagingRequest messagingRequest = JSONUtil.toBean(message, MessagingRequest.class);
             messagingRequest.validate();
             List<WsHandler> collect = messageHandlers

coffee-common/src/main/java/com/coffee/common/entity/TenantGenericEntity.java

@@ -24,9 +24,6 @@ public abstract class TenantGenericEntity<PK,TN> extends GenericEntity<PK> {
     @Getter
     @TableField("tenant_id")
     @Setter
-//    @JsonFormat
-//    @JSONField(serializeUsing = ToStringSerializer.class)
-//    @JsonSerialize(using = ToStringSerializer.class,contentAs=String.class)
     private TN tenantId;
 
     @Getter

coffee-common/src/main/java/com/coffee/common/enums/SexEnum.java

@@ -1,5 +1,6 @@
 package com.coffee.common.enums;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -11,6 +12,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum SexEnum {
 
     /**

coffee-framework/src/main/java/com/coffee/framework/web/service/impl/UserServiceImpl.java

@@ -173,6 +173,8 @@ public class UserServiceImpl implements IUserService {
         userInfoVO.setDesc(sysUser.getRemarks());
         userInfoVO.setRoles(roleInfoVOList);
         userInfoVO.setIsSys(sysUser.getIsSys());
+        userInfoVO.setTenantId(String.valueOf(sysUser.getTenantId()));
+        userInfoVO.setTenantName(sysUser.getTenantName());
         return userInfoVO;
     }
 

coffee-system/src/main/java/com/coffee/bus/controller/BusClinicController.java

@@ -0,0 +1,43 @@
+package com.coffee.bus.controller;
+
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.coffee.bus.entity.BusClinicEntity;
+import com.coffee.bus.entity.BusPatientEntity;
+import com.coffee.bus.service.LocalBusClinicService;
+import com.coffee.bus.service.LocalBusPatientService;
+import com.coffee.common.crud.BaseService;
+import com.coffee.common.crud.controller.BaseCrudController;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusHospitalController.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:28:00
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bus/clinic")
+@Api(tags = "病人临床手术管理",description = "统一权限前缀(bus:clinic),例如新增bus:clinic:add")
+public class BusClinicController extends BaseCrudController<BusClinicEntity, String> {
+    private final LocalBusClinicService clinicService;
+
+
+    /**
+     * 权限控制前缀
+     * @return
+     */
+    @Override
+    public String getPermissionPrefix() {
+        return "bus:clinic";
+    }
+
+    @Override
+    public BaseService<? extends Mapper<BusClinicEntity>, BusClinicEntity, String> getService() {
+        return clinicService;
+    }
+}

coffee-system/src/main/java/com/coffee/bus/controller/BusPatientController.java

@@ -0,0 +1,43 @@
+package com.coffee.bus.controller;
+
+import com.baomidou.mybatisplus.core.mapper.Mapper;
+import com.coffee.bus.entity.BusDoctorEntity;
+import com.coffee.bus.entity.BusPatientEntity;
+import com.coffee.bus.service.LocalBusDoctorService;
+import com.coffee.bus.service.LocalBusPatientService;
+import com.coffee.common.crud.BaseService;
+import com.coffee.common.crud.controller.BaseCrudController;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusHospitalController.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:28:00
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/bus/patient")
+@Api(tags = "医院病人管理",description = "统一权限前缀(bus:patient),例如新增bus:patient:add")
+public class BusPatientController extends BaseCrudController<BusPatientEntity, String> {
+    private final LocalBusPatientService patientService;
+
+
+    /**
+     * 权限控制前缀
+     * @return
+     */
+    @Override
+    public String getPermissionPrefix() {
+        return "bus:patient";
+    }
+
+    @Override
+    public BaseService<? extends Mapper<BusPatientEntity>, BusPatientEntity, String> getService() {
+        return patientService;
+    }
+}

coffee-system/src/main/java/com/coffee/bus/entity/BusClinicEntity.java

@@ -0,0 +1,109 @@
+package com.coffee.bus.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.coffee.common.config.mybatis.DateToBigIntHandler;
+import com.coffee.common.entity.TenantGenericEntity;
+import com.coffee.common.enums.SexEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumOrdinalTypeHandler;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusDoctorEntity.java
+ * @Description TODO
+ * @createTime 2022年03月21日 11:17:00
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName(value = "bus_clinic",autoResultMap = true)
+@ApiModel(value="病人临床手术信息", description="病人临床手术信息实体类")
+public class BusClinicEntity extends TenantGenericEntity<String,String> {
+
+    @ApiModelProperty(value = "临床手术名称")
+    @Length(max = 255,message = "临床手术名称长度不得超过255个字节")
+    private String name;
+
+    @ApiModelProperty(value = "病人id")
+    private String patientId;
+
+    @ApiModelProperty(value = "病号")
+    @Length(max = 255,message = "病号长度不得超过255个字节")
+    private String patientCode;
+
+    @ApiModelProperty(value = "手术开始时间")
+    @TableField(typeHandler = DateToBigIntHandler.class)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @ApiModelProperty(value = "手术结束时间")
+    @TableField(typeHandler = DateToBigIntHandler.class)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    @ApiModelProperty(value = "患者姓名")
+    @Length(max = 255,message = "患者姓名长度不得超过255个字节")
+    private String patientName;
+
+    @ApiModelProperty(value = "患者性别")
+    @TableField(typeHandler = EnumOrdinalTypeHandler.class)
+    private SexEnum patientGender;
+
+    @ApiModelProperty(value = "患者年龄")
+    private Integer patientAge;
+
+    @ApiModelProperty(value = "科室id")
+    @Length(max = 255,message = "科室id")
+    private String dept;
+
+    @ApiModelProperty(value = "病床号")
+    @Length(max = 255,message = "病床号长度不得超过255个字节")
+    private String bedNo;
+
+    @ApiModelProperty(value = "体重")
+    @Length(max = 255,message = "体重不得超过255个字节")
+    private String weight;
+
+    @ApiModelProperty(value = "身高")
+    @Length(max = 255,message = "身高不得超过255个字节")
+    private String height;
+
+    @ApiModelProperty(value = "麻醉医生")
+    @Length(max = 255,message = "麻醉医生不得超过255个字节")
+    private String anaDoctor;
+
+
+    @ApiModelProperty(value = "麻醉方式")
+    private String anaType;
+
+    @ApiModelProperty(value = "镇痛方式")
+    private String analType;
+
+    @ApiModelProperty(value = "手术医生")
+    @Length(max = 255,message = "手术医生不得超过255个字节")
+    private String surgeryDoctor;
+
+
+    @ApiModelProperty(value = "手术名称")
+    @Length(max = 255,message = "手术名称不得超过255个字节")
+    private String surgeryName;
+
+    @ApiModelProperty(value = "配方")
+    private String formula;
+
+
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic(value = "0",delval = "1")
+    private Integer isDelete;
+}

coffee-system/src/main/java/com/coffee/bus/entity/BusNetPumpEntity.java

@@ -6,6 +6,7 @@ import com.coffee.bus.enums.NetPumpAlarmEnum;
 import com.coffee.bus.enums.NetPumpStatusEnum;
 import com.coffee.common.config.mybatis.DateToBigIntHandler;
 import com.coffee.common.entity.TenantGenericEntity;
+import com.coffee.common.enums.SexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,7 +41,8 @@ public class BusNetPumpEntity extends TenantGenericEntity<String,String> {
     private String patientName;
 
     @ApiModelProperty(value = "病人性别")
-    private Integer patientSex;
+    @TableField(typeHandler = EnumOrdinalTypeHandler.class)
+    private SexEnum patientSex;
 
     @ApiModelProperty(value = "科室")
     private String dept;

coffee-system/src/main/java/com/coffee/bus/entity/BusPatientEntity.java

@@ -0,0 +1,43 @@
+package com.coffee.bus.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.coffee.common.entity.TenantGenericEntity;
+import com.coffee.common.enums.SexEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumOrdinalTypeHandler;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusDoctorEntity.java
+ * @Description TODO
+ * @createTime 2022年03月21日 11:17:00
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName(value = "bus_patient",autoResultMap = true)
+@ApiModel(value="住院病人基本信息", description="住院病人基本信息实体类")
+public class BusPatientEntity extends TenantGenericEntity<String,String> {
+    @ApiModelProperty(value = "病号")
+    @Length(max = 255,message = "病号长度不得超过255个字节")
+    private String code;
+
+    @ApiModelProperty(value = "病人名称")
+    @Length(max = 255,message = "医生岗位长度不得超过255个字节")
+    private String name;
+
+    @TableField(typeHandler = EnumOrdinalTypeHandler.class)
+    @ApiModelProperty(value = "性别")
+    private SexEnum gender;
+
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic(value = "0",delval = "1")
+    private Integer isDelete;
+}

coffee-system/src/main/java/com/coffee/bus/mapper/BusClinicMapper.java

@@ -0,0 +1,17 @@
+package com.coffee.bus.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.coffee.bus.entity.BusClinicEntity;
+import com.coffee.bus.entity.BusPatientEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusHospitalMapper.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:15:00
+ */
+@Mapper
+public interface BusClinicMapper extends BaseMapper<BusClinicEntity> {
+}

coffee-system/src/main/java/com/coffee/bus/mapper/BusPatientMapper.java

@@ -0,0 +1,17 @@
+package com.coffee.bus.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.coffee.bus.entity.BusDoctorEntity;
+import com.coffee.bus.entity.BusPatientEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName BusHospitalMapper.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:15:00
+ */
+@Mapper
+public interface BusPatientMapper extends BaseMapper<BusPatientEntity> {
+}

coffee-system/src/main/java/com/coffee/bus/service/LocalBusClinicService.java

@@ -0,0 +1,33 @@
+package com.coffee.bus.service;
+
+import com.coffee.bus.entity.BusClinicEntity;
+import com.coffee.bus.entity.BusPatientEntity;
+import com.coffee.bus.mapper.BusClinicMapper;
+import com.coffee.bus.mapper.BusPatientMapper;
+import com.coffee.common.crud.BaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName LocalBusHospitalService.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:27:00
+ */
+@Service
+public class LocalBusClinicService extends BaseService<BusClinicMapper, BusClinicEntity,String> {
+    @Override
+    public void validateBeforeSave(BusClinicEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeUpdate(BusClinicEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeDelete(String id) {
+
+    }
+}

coffee-system/src/main/java/com/coffee/bus/service/LocalBusPatientService.java

@@ -0,0 +1,33 @@
+package com.coffee.bus.service;
+
+import com.coffee.bus.entity.BusDoctorEntity;
+import com.coffee.bus.entity.BusPatientEntity;
+import com.coffee.bus.mapper.BusDoctorMapper;
+import com.coffee.bus.mapper.BusPatientMapper;
+import com.coffee.common.crud.BaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName LocalBusHospitalService.java
+ * @Description TODO
+ * @createTime 2022年03月19日 09:27:00
+ */
+@Service
+public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPatientEntity,String> {
+    @Override
+    public void validateBeforeSave(BusPatientEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeUpdate(BusPatientEntity entity) {
+
+    }
+
+    @Override
+    public void validateBeforeDelete(String id) {
+
+    }
+}