Skip to content

B
byh-family-doctor
提交 e63756a8 authored 作者: 杨凯's avatar 杨凯
浏览文件
操作

feat:家庭医生初始化

上级 dad36e16
显示空白字符变更
内嵌 并排
正在显示 包含 73 行增加 和 19 行删除
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/QueryFamousDTO.java
浏览文件 @ e63756a8
......@@ -12,6 +12,7 @@ import lombok.Data;
@Data
public class QueryFamousDTO {
@ApiModelProperty("患者的登录id")
private String userId;
@ApiModelProperty("医疗平台编号")
......@@ -46,10 +47,4 @@ public class QueryFamousDTO {
hidden = true
)
private Integer status;
@ApiModelProperty(value = "服务类型：在线咨询：2，在线复诊：3")
private Integer type;
@ApiModelProperty("预约时间")
private String reserveTime;
}
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/SendImMsgDTO.java
浏览文件 @ e63756a8
package com.ebaiyihui.family.doctor.common.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
......@@ -11,11 +12,15 @@ import lombok.Data;
@Data
public class SendImMsgDTO {
@ApiModelProperty(value = "类型")
private Integer type;
@ApiModelProperty(value = "appCode")
private String appCode;
@ApiModelProperty(value = "医院编码")
private Long organId;
@ApiModelProperty(value = "签约编号")
private String admId;
}
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/SignedDoctorDTO.java
浏览文件 @ e63756a8
package com.ebaiyihui.family.doctor.common.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
......@@ -13,26 +14,35 @@ import javax.validation.constraints.NotNull;
@Data
public class SignedDoctorDTO {
@ApiModelProperty("姓名")
private String name;
private String idCard;
@ApiModelProperty("身份证号码")
private String credNo;
@ApiModelProperty("手机号码")
private String phone;
@ApiModelProperty("医生id")
@NotNull(message = "医生ID不能为空")
private Long doctorId;
@ApiModelProperty("医生名称")
private String doctorName;
@ApiModelProperty("部门id")
private Long deptId;
@ApiModelProperty("部门名称")
private String deptName;
@ApiModelProperty("患者id")
private String patientId;
@ApiModelProperty("签约编号")
private String admId;
@ApiModelProperty("签约状态1.未签约2.已签约3：已解约")
private Integer signStatus;
}
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/vo/DoctorListVo.java
浏览文件 @ e63756a8
......@@ -12,23 +12,53 @@ import lombok.Data;
@Data
public class DoctorListVo {
@ApiModelProperty(value = "医生id")
private String doctorId;
@ApiModelProperty(value = "医生名称")
private String doctorName;
@ApiModelProperty(value = "医生code")
private String doctorCode;
private Long titleId;
@ApiModelProperty(value = "医生title")
private String title;
@ApiModelProperty(value = "医院编码")
private Integer organId;
@ApiModelProperty(value = "医院名称")
private String organName;
@ApiModelProperty(value = "部门Id")
private Integer deptId;
@ApiModelProperty(value = "部门名称")
private String deptName;
@ApiModelProperty(value = "二级部门编码")
private Long stdSecondDeptId;
@ApiModelProperty(value = "手机号码")
private String phoneNum;
@ApiModelProperty(value = "肖像")
private String portrait;
@ApiModelProperty(value = "性别")
private Integer gender;
@ApiModelProperty(value = "医生职业")
private String profession;
@ApiModelProperty(value = "医生简介")
private String introduction;
private String servConfig;
@ApiModelProperty(value = "医院编码")
private Integer organCode;
/**
......@@ -37,12 +67,6 @@ public class DoctorListVo {
@ApiModelProperty(value = "是否是上次签名 1是，0不是")
private Integer lastSign;
/**
* 服务金额ServiceConfigData
*/
// private ServiceConfigVo serviceConfigData;
private String doctorLabelName;
@ApiModelProperty(value = "医生是否在线 1在线 -1下线")
......
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/entity/PatientSignEntity.java
浏览文件 @ e63756a8
......@@ -2,6 +2,7 @@ package com.ebaiyihui.family.doctor.server.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
......@@ -16,42 +17,61 @@ import java.util.Date;
@TableName(value = "patient_sign")
public class PatientSignEntity {
@ApiModelProperty("主键id")
@TableId
private Long id;
@ApiModelProperty("签约编号")
private String admId;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("平台code")
private String appCode;
@ApiModelProperty("组织id")
private Long organId;
@ApiModelProperty("组织名称")
private String organName;
@ApiModelProperty("患者id")
private String patientId;
@ApiModelProperty("患者im用户id")
private String patientUserId;
@ApiModelProperty("患者名称")
private String patientName;
@ApiModelProperty("患者手机号码")
private String patientPhone;
@ApiModelProperty("身份证号码")
private String credNo;
@ApiModelProperty("医生id")
private Long doctorId;
@ApiModelProperty("医生名称")
private String doctorName;
@ApiModelProperty("部门id")
private Long deptId;
@ApiModelProperty("部门名称")
private String deptName;
@ApiModelProperty("签约状态1.未签约2.已签约3：已解约")
private Integer signStatus;
@ApiModelProperty("改签状态1、正常2、已改签")
private Integer subStatus;
@ApiModelProperty("业务状态2:进行中3:已完成4:已过期")
private Integer status;
}
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientServiceImpl.java
浏览文件 @ e63756a8
......@@ -47,7 +47,7 @@ public class PatientServiceImpl implements PatientService {
String orderId = UUIDUtil.generateViewId();
String admId = UUIDUtil.getUUID();
String patientId = "jtys_" + reqVo.getIdCard();
String patientId = "jtys_" + reqVo.getCredNo();
String patientUserId = orderId + "_jtys";
QueryWrapper<PatientEntity> wrapper = new QueryWrapper<>();
PatientEntity patient = new PatientEntity();
......@@ -61,9 +61,9 @@ public class PatientServiceImpl implements PatientService {
patientEntity.setPatientName(reqVo.getName());
patientEntity.setPhone(reqVo.getPhone());
patientEntity.setPatientType(CommonConstants.PATIENT_TYPE);
patientEntity.setGender(Integer.valueOf(IDCardUtil.getGenderForInteger(reqVo.getIdCard())));
patientEntity.setBirthDates(IDCardUtil.getBirthByIdCard(reqVo.getIdCard()));
patientEntity.setCredNo(reqVo.getIdCard());
patientEntity.setGender(Integer.valueOf(IDCardUtil.getGenderForInteger(reqVo.getCredNo())));
patientEntity.setBirthDates(IDCardUtil.getBirthByIdCard(reqVo.getCredNo()));
patientEntity.setCredNo(reqVo.getCredNo());
patientEntity.setUserId(patientUserId);
log.info("数据库不存在添加患者: {}", JSON.toJSONString(patientEntity));
patientMapper.insert(patientEntity);
......@@ -98,7 +98,7 @@ public class PatientServiceImpl implements PatientService {
patientSignEntity.setDeptName(reqVo.getDeptName());
patientSignEntity.setSignStatus(reqVo.getSignStatus());
patientSignEntity.setPatientPhone(reqVo.getPhone());
patientSignEntity.setCredNo(reqVo.getIdCard());
patientSignEntity.setCredNo(reqVo.getCredNo());
patientSignEntity.setPatientId(patientId);
patientSignEntity.setPatientName(reqVo.getName());
patientSignEntity.setPatientUserId(patientUserId);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论