From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
index d0e9b91..dedcdc1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -1,7 +1,5 @@
package com.hz.his.dto.micro;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -14,9 +12,12 @@
**/
@Data
public class MicroRecordDto extends PageDto {
-
+ /**鏄惁鏌ヨ鏈�鏂扮殑*/
+ private Integer isSelectNew = 0;
/** 鐢ㄦ埛id */
private String userId;
+ /** 缇庨檯鐨偆鎶ュ憡鏍囪瘑 */
+ private String mjSkinReportId;
/** 寮�濮嬫椂闂� */
private String startTime;
/** 缁撴潫鏃堕棿 */
@@ -30,6 +31,20 @@
private String platformType;
/** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
private String opRoleId;
-
+ /** 鍒拌璁㈠崟id */
+ private String visitOrderId;
+ /** 鏄惁鑽夌*/
+ private Integer isDraft;
+ /**寤鸿淇℃伅*/
private List<MicroPlanDto> planList;
+ /**棰滃�艰鍒掍俊鎭�*/
+ private List<MicroDataDto> dataList;
+ /**鏌ヨ鏍囪瘑绫诲瀷:TreatPlan.typeStr*/
+ private String typeStr;
+ /**鏌ヨ涓�绾ф爣璇�*/
+ private String firstId;
+ /**鏌ヨ浜岀骇鏍囪瘑*/
+ private String secondId;
+ /**鍏宠仈澶氱骇鏍囪瘑*/
+ private List<MicroRecordIdDto> idList;
}
--
Gitblit v1.8.0