diff --git a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/TBasicDTO.java b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/TBasicDTO.java index 98cc98c..0dd4855 100644 --- a/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/TBasicDTO.java +++ b/docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/TBasicDTO.java @@ -1,5 +1,6 @@ -package com.docus.server.record.pojo.dto; +package com.docus.server.archivefile.pojo.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Map; @@ -14,29 +15,52 @@ import java.util.Map; */ @Data public class TBasicDTO { - private String serialId; - private String receive; - private String send; + // ---------------------- TBasicDTO info ---------------------- + @ApiModelProperty(value = "记账号") private String jzh; + @ApiModelProperty(value = "病案号") private String inpatientNo; + @ApiModelProperty(value = "住院次数") private String admissTimes; + @ApiModelProperty(value = "患者姓名") private String name; + @ApiModelProperty(value = "住院日期") private String admissDate; + @ApiModelProperty(value = "出院日期") private String disDate; + @ApiModelProperty(value = "住院科室名称") private String admissDeptName; + @ApiModelProperty(value = "出院科室名称") private String disDeptName; + @ApiModelProperty(value = "主管医生") private String attending; + @ApiModelProperty(value = "主管医生名称") private String attendingName; + @ApiModelProperty(value = "责任护士") private String dutyNurse; + @ApiModelProperty(value = "住院科室") private String admissDept; + @ApiModelProperty(value = "年龄_岁") private String age; + @ApiModelProperty(value = "性别") private String sex; + @ApiModelProperty(value = "身份证") private String idCard; + @ApiModelProperty(value = "出院科室") private String disDept; + @ApiModelProperty(value = "性别名称") private String sexName; + @ApiModelProperty(value = "床位号") private String bedNum; + @ApiModelProperty(value = "是否死亡") private String isDead; + @ApiModelProperty(value = "实际住院天数") private String admissDays; + // ---------------------- xml info ---------------------- + private String serialId; + private String receive; + private String send; + // ---------------------- sdry info ---------------------- private String wardCode; private String wardName; private String sdryIndex; diff --git a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java b/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java index 98cc98c..c931285 100644 --- a/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java +++ b/docus-medical-record/src/main/java/com/docus/server/record/pojo/dto/TBasicDTO.java @@ -1,5 +1,6 @@ package com.docus.server.record.pojo.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Map; @@ -14,33 +15,55 @@ import java.util.Map; */ @Data public class TBasicDTO { - private String serialId; - private String receive; - private String send; + // ---------------------- TBasicDTO info ---------------------- + @ApiModelProperty(value = "记账号") private String jzh; + @ApiModelProperty(value = "病案号") private String inpatientNo; + @ApiModelProperty(value = "住院次数") private String admissTimes; + @ApiModelProperty(value = "患者姓名") private String name; + @ApiModelProperty(value = "住院日期") private String admissDate; + @ApiModelProperty(value = "出院日期") private String disDate; + @ApiModelProperty(value = "住院科室名称") private String admissDeptName; + @ApiModelProperty(value = "出院科室名称") private String disDeptName; + @ApiModelProperty(value = "主管医生") private String attending; + @ApiModelProperty(value = "主管医生名称") private String attendingName; + @ApiModelProperty(value = "责任护士") private String dutyNurse; + @ApiModelProperty(value = "住院科室") private String admissDept; + @ApiModelProperty(value = "年龄_岁") private String age; + @ApiModelProperty(value = "性别") private String sex; + @ApiModelProperty(value = "身份证") private String idCard; + @ApiModelProperty(value = "出院科室") private String disDept; + @ApiModelProperty(value = "性别名称") private String sexName; + @ApiModelProperty(value = "床位号") private String bedNum; + @ApiModelProperty(value = "是否死亡") private String isDead; + @ApiModelProperty(value = "实际住院天数") private String admissDays; + // ---------------------- xml info ---------------------- + private String serialId; + private String receive; + private String send; + // ---------------------- sdry info ---------------------- private String wardCode; private String wardName; private String sdryIndex; - /** * 拓展参数 */ diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java index af2d7a9..debc1a0 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java +++ b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/DeptDTO.java @@ -10,7 +10,7 @@ import java.util.Map; */ @Data public class DeptDTO { - + // ---------------------- DeptDTO info ---------------------- /** * 科室代码 */ @@ -21,6 +21,16 @@ public class DeptDTO { */ private String deptName; + /** + * 操作人ID + */ + private String authorId; + /** + * 操作人名称 + */ + private String authorName; + + // ---------------------- xml info ---------------------- /** * id-消息流水号 返回消息体需要 */ @@ -39,14 +49,6 @@ public class DeptDTO { */ private String operateType; - /** - * 操作人ID - */ - private String authorId; - /** - * 操作人名称 - */ - private String authorName; /** * xml原始报文 */ diff --git a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java index b103440..51f554d 100644 --- a/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java +++ b/docus-sys/src/main/java/com/docus/server/sys/common/pojo/dto/UserDTO.java @@ -10,50 +10,50 @@ import java.util.Map; */ @Data public class UserDTO { + // ---------------------- UserDTO info ---------------------- /** - * id-消息流水号 返回消息体需要 - */ - private String messageId; - /** - * 接收方 - */ - private String receiver; - - /** - * 用户操作 operateType有三种值:C 代表新增、U 代表修改、D 代表删除 + * 用户工号 */ - private String operateType; - + private String userName; /** * 用户姓名 */ private String name; /** - * 用户工号 + * 到时同步完让实施找下不重复的导入到角色表,程序再判断职位对应角色表存角色id(roleId),初始roleId=0 */ - private String userName; + private String position; /** * 所属科室编号 */ private String deptId; - /** - * 到时同步完让实施找下不重复的导入到角色表,程序再判断职位对应角色表存角色id(roleId),初始roleId=0 - */ - private String position; /** * 角色Id 初始 0 */ private Long roleId; - /** * 操作人名称 */ private String authorName; - /** * 操作人ID */ private String authorId; + + // ---------------------- base info ---------------------- + /** + * id-消息流水号 返回消息体需要 + */ + private String messageId; + /** + * 接收方 + */ + private String receiver; + + /** + * 用户操作 operateType有三种值:C 代表新增、U 代表修改、D 代表删除 + */ + private String operateType; /** * 拓展参数 */