Merge branch 'dev'
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
package com.intc.health.domain.dto;
|
package com.intc.health.domain.dto;
|
||||||
|
|
||||||
|
import com.intc.common.core.web.domain.BaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
@@ -15,7 +16,7 @@ import java.util.Date;
|
|||||||
*/
|
*/
|
||||||
@ApiModel("慢性疾病档案Dto对象")
|
@ApiModel("慢性疾病档案Dto对象")
|
||||||
@Data
|
@Data
|
||||||
public class ChronicDiseaseRecordDto implements Serializable
|
public class ChronicDiseaseRecordDto extends BaseEntity implements Serializable
|
||||||
{
|
{
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
package com.intc.health.domain.dto;
|
package com.intc.health.domain.dto;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
import com.intc.common.core.web.domain.BaseEntity;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
@@ -16,7 +18,7 @@ import java.time.LocalDate;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@ApiModel("用药计划查询DTO")
|
@ApiModel("用药计划查询DTO")
|
||||||
public class MedicationPlanDto {
|
public class MedicationPlanDto extends BaseEntity implements Serializable {
|
||||||
|
|
||||||
@ApiModelProperty("主键ID")
|
@ApiModelProperty("主键ID")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
package com.intc.health.domain.dto;
|
package com.intc.health.domain.dto;
|
||||||
|
|
||||||
|
import com.intc.common.core.web.domain.BaseEntity;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -14,7 +16,7 @@ import java.time.LocalDate;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@ApiModel("服药任务查询DTO")
|
@ApiModel("服药任务查询DTO")
|
||||||
public class MedicationTaskDto {
|
public class MedicationTaskDto extends BaseEntity implements Serializable {
|
||||||
|
|
||||||
@ApiModelProperty("关联用药计划ID")
|
@ApiModelProperty("关联用药计划ID")
|
||||||
private Long planId;
|
private Long planId;
|
||||||
|
|||||||
Reference in New Issue
Block a user