可编辑后端部分接口

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -14,9 +14,7 @@ import org.springframework.security.jwt.crypto.sign.RsaVerifier;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
 import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
-import org.springframework.security.oauth2.provider.error.OAuth2AuthenticationEntryPoint;
 import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
-import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
 import org.springframework.util.FileCopyUtils;
 
 import java.io.IOException;
@@ -291,6 +289,21 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/qcType/update").permitAll()
                 .antMatchers("/qc/qcType/copy").permitAll()
                 .antMatchers("/medNewsNotice/**").permitAll()
+                .antMatchers("/str/strFirstRecord/infos").permitAll()
+                .antMatchers("/str/WardRecord/infos").permitAll()
+                .antMatchers("/str/ConsultationApply/infos").permitAll()
+                .antMatchers("/str/ConsultationResult/infos").permitAll()
+                .antMatchers("/str/OperativeFirstRecord/infos").permitAll()
+                .antMatchers("/str/DeathDiscussion/infos").permitAll()
+                .antMatchers("/str/PreoperativeDiscussion/infos").permitAll()
+                .antMatchers("/str/OperativeNote/infos").permitAll()
+                .antMatchers("/str/IllCritically/infos").permitAll()
+                .antMatchers("/str/DeathNote/infos").permitAll()
+                .antMatchers("/str/LeaveHospital/infos").permitAll()
+                .antMatchers("/str/CrisisNote/infos").permitAll()
+                .antMatchers("/str/RescueNote/infos").permitAll()
+                .antMatchers("/str/TransferOutNote/infos").permitAll()
+                .antMatchers("/str/TransferInNote/infos").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -1,6 +1,5 @@
 package com.diagbot.config.security;
 
-import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
 import com.diagbot.facade.TokenFacade;
@@ -388,6 +387,21 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/qcType/add", request)
                 || matchers("/qc/qcType/update", request)
                 || matchers("/qc/qcType/copy", request)
+                || matchers("/str/strFirstRecord/infos", request)
+                || matchers("/str/WardRecord/infos", request)
+                || matchers("/str/ConsultationApply/infos", request)
+                || matchers("/str/ConsultationResult/infos", request)
+                || matchers("/str/OperativeFirstRecord/infos", request)
+                || matchers("/str/DeathDiscussion/infos", request)
+                || matchers("/str/PreoperativeDiscussion/infos", request)
+                || matchers("/str/OperativeNote/infos", request)
+                || matchers("/str/IllCritically/infos", request)
+                || matchers("/str/DeathNote/infos", request)
+                || matchers("/str/LeaveHospital/infos", request)
+                || matchers("/str/CrisisNote/infos", request)
+                || matchers("/str/RescueNote/infos", request)
+                || matchers("/str/TransferOutNote/infos", request)
+                || matchers("/str/TransferInNote/infos", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/entity/StrConsultationApply.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,459 +17,122 @@ import java.util.Date;
  * 会诊申请单
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_consultation_apply")
+@ApiModel(value="StrConsultationApply对象", description="会诊申请单")
 public class StrConsultationApply implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private Date behospitalDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 申请科室
-     */
+    @ApiModelProperty(value = "申请科室")
     private String applyDept;
 
-    /**
-     * 申请医生
-     */
+    @ApiModelProperty(value = "申请医生")
     private String applyDoctor;
 
-    /**
-     * 申请日期
-     */
+    @ApiModelProperty(value = "申请日期")
     private Date applyDate;
 
-    /**
-     * 会诊类别
-     */
+    @ApiModelProperty(value = "会诊类别")
     private String inviteType;
 
-    /**
-     * 会诊科室
-     */
+    @ApiModelProperty(value = "会诊科室")
     private String inviteDept;
 
-    /**
-     * 会诊医生
-     */
+    @ApiModelProperty(value = "会诊医生")
     private String inviteDoctor;
 
-    /**
-     * 简要病情
-     */
+    @ApiModelProperty(value = "简要病情")
     private String briefNote;
 
-    /**
-     * 当前诊断
-     */
+    @ApiModelProperty(value = "当前诊断")
     private String diagnosis;
 
-    /**
-     * 诊疗情况
-     */
+    @ApiModelProperty(value = "诊疗情况")
     private String treatmentSituation;
 
-    /**
-     * 会诊时间
-     */
+    @ApiModelProperty(value = "会诊时间")
     private Date consultationDate;
 
-    /**
-     * 会诊目的
-     */
+    @ApiModelProperty(value = "会诊目的")
     private String consultationPurpose;
 
-    /**
-     * 会诊意见
-     */
+    @ApiModelProperty(value = "会诊意见")
     private String consultationOpinions;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public Date getBehospitalDate() {
-        return behospitalDate;
-    }
-
-    public void setBehospitalDate(Date behospitalDate) {
-        this.behospitalDate = behospitalDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public String getApplyDept() {
-        return applyDept;
-    }
-
-    public void setApplyDept(String applyDept) {
-        this.applyDept = applyDept;
-    }
-    public String getApplyDoctor() {
-        return applyDoctor;
-    }
-
-    public void setApplyDoctor(String applyDoctor) {
-        this.applyDoctor = applyDoctor;
-    }
-    public Date getApplyDate() {
-        return applyDate;
-    }
-
-    public void setApplyDate(Date applyDate) {
-        this.applyDate = applyDate;
-    }
-    public String getInviteType() {
-        return inviteType;
-    }
-
-    public void setInviteType(String inviteType) {
-        this.inviteType = inviteType;
-    }
-    public String getInviteDept() {
-        return inviteDept;
-    }
-
-    public void setInviteDept(String inviteDept) {
-        this.inviteDept = inviteDept;
-    }
-    public String getInviteDoctor() {
-        return inviteDoctor;
-    }
-
-    public void setInviteDoctor(String inviteDoctor) {
-        this.inviteDoctor = inviteDoctor;
-    }
-    public String getBriefNote() {
-        return briefNote;
-    }
-
-    public void setBriefNote(String briefNote) {
-        this.briefNote = briefNote;
-    }
-    public String getDiagnosis() {
-        return diagnosis;
-    }
-
-    public void setDiagnosis(String diagnosis) {
-        this.diagnosis = diagnosis;
-    }
-    public String getTreatmentSituation() {
-        return treatmentSituation;
-    }
-
-    public void setTreatmentSituation(String treatmentSituation) {
-        this.treatmentSituation = treatmentSituation;
-    }
-    public Date getConsultationDate() {
-        return consultationDate;
-    }
-
-    public void setConsultationDate(Date consultationDate) {
-        this.consultationDate = consultationDate;
-    }
-    public String getConsultationPurpose() {
-        return consultationPurpose;
-    }
-
-    public void setConsultationPurpose(String consultationPurpose) {
-        this.consultationPurpose = consultationPurpose;
-    }
-    public String getConsultationOpinions() {
-        return consultationOpinions;
-    }
-
-    public void setConsultationOpinions(String consultationOpinions) {
-        this.consultationOpinions = consultationOpinions;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrConsultationApply{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", behospitalDate=" + behospitalDate +
-            ", recTitle=" + recTitle +
-            ", applyDept=" + applyDept +
-            ", applyDoctor=" + applyDoctor +
-            ", applyDate=" + applyDate +
-            ", inviteType=" + inviteType +
-            ", inviteDept=" + inviteDept +
-            ", inviteDoctor=" + inviteDoctor +
-            ", briefNote=" + briefNote +
-            ", diagnosis=" + diagnosis +
-            ", treatmentSituation=" + treatmentSituation +
-            ", consultationDate=" + consultationDate +
-            ", consultationPurpose=" + consultationPurpose +
-            ", consultationOpinions=" + consultationOpinions +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "注意事项")
+    private String notes;
+
 }

src/main/java/com/diagbot/entity/StrConsultationResult.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,433 +17,117 @@ import java.util.Date;
  * 会诊结果单
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_consultation_result")
+@ApiModel(value="StrConsultationResult对象", description="会诊结果单")
 public class StrConsultationResult implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private Date behospitalDate;
 
-    /**
-     * 申请科室
-     */
+    @ApiModelProperty(value = "申请科室")
     private String applyDept;
 
-    /**
-     * 申请医生
-     */
+    @ApiModelProperty(value = "申请医生")
     private String applyDoctor;
 
-    /**
-     * 申请日期
-     */
+    @ApiModelProperty(value = "申请日期")
     private Date applyDate;
 
-    /**
-     * 会诊类别
-     */
+    @ApiModelProperty(value = "会诊类别")
     private String inviteType;
 
-    /**
-     * 会诊科室
-     */
+    @ApiModelProperty(value = "会诊科室")
     private String inviteDept;
 
-    /**
-     * 会诊医生
-     */
+    @ApiModelProperty(value = "会诊医生")
     private String inviteDoctor;
 
-    /**
-     * 当前诊断
-     */
+    @ApiModelProperty(value = "当前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 会诊目的
-     */
+    @ApiModelProperty(value = "会诊目的")
     private String consultationPurpose;
 
-    /**
-     * 会诊意见
-     */
+    @ApiModelProperty(value = "会诊意见")
     private String consultationOpinions;
 
-    /**
-     * 会诊到达时间
-     */
+    @ApiModelProperty(value = "会诊到达时间")
     private Date consultationArriveDate;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getBehospitalDate() {
-        return behospitalDate;
-    }
-
-    public void setBehospitalDate(Date behospitalDate) {
-        this.behospitalDate = behospitalDate;
-    }
-    public String getApplyDept() {
-        return applyDept;
-    }
-
-    public void setApplyDept(String applyDept) {
-        this.applyDept = applyDept;
-    }
-    public String getApplyDoctor() {
-        return applyDoctor;
-    }
-
-    public void setApplyDoctor(String applyDoctor) {
-        this.applyDoctor = applyDoctor;
-    }
-    public Date getApplyDate() {
-        return applyDate;
-    }
-
-    public void setApplyDate(Date applyDate) {
-        this.applyDate = applyDate;
-    }
-    public String getInviteType() {
-        return inviteType;
-    }
-
-    public void setInviteType(String inviteType) {
-        this.inviteType = inviteType;
-    }
-    public String getInviteDept() {
-        return inviteDept;
-    }
-
-    public void setInviteDept(String inviteDept) {
-        this.inviteDept = inviteDept;
-    }
-    public String getInviteDoctor() {
-        return inviteDoctor;
-    }
-
-    public void setInviteDoctor(String inviteDoctor) {
-        this.inviteDoctor = inviteDoctor;
-    }
-    public String getCurrentDiagnosis() {
-        return currentDiagnosis;
-    }
-
-    public void setCurrentDiagnosis(String currentDiagnosis) {
-        this.currentDiagnosis = currentDiagnosis;
-    }
-    public String getConsultationPurpose() {
-        return consultationPurpose;
-    }
-
-    public void setConsultationPurpose(String consultationPurpose) {
-        this.consultationPurpose = consultationPurpose;
-    }
-    public String getConsultationOpinions() {
-        return consultationOpinions;
-    }
-
-    public void setConsultationOpinions(String consultationOpinions) {
-        this.consultationOpinions = consultationOpinions;
-    }
-    public Date getConsultationArriveDate() {
-        return consultationArriveDate;
-    }
-
-    public void setConsultationArriveDate(Date consultationArriveDate) {
-        this.consultationArriveDate = consultationArriveDate;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrConsultationResult{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", behospitalDate=" + behospitalDate +
-            ", applyDept=" + applyDept +
-            ", applyDoctor=" + applyDoctor +
-            ", applyDate=" + applyDate +
-            ", inviteType=" + inviteType +
-            ", inviteDept=" + inviteDept +
-            ", inviteDoctor=" + inviteDoctor +
-            ", currentDiagnosis=" + currentDiagnosis +
-            ", consultationPurpose=" + consultationPurpose +
-            ", consultationOpinions=" + consultationOpinions +
-            ", consultationArriveDate=" + consultationArriveDate +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "注意事项")
+    private String note;
+
+
 }

src/main/java/com/diagbot/entity/StrCrisisNote.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,329 +17,93 @@ import java.util.Date;
  * 危急值记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-27
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_crisis_note")
+@ApiModel(value="StrCrisisNote对象", description="危急值记录")
 public class StrCrisisNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 危急值报告
-     */
+    @ApiModelProperty(value = "危急值报告")
     private String crisisNote;
 
-    /**
-     * 病情分析及处理
-     */
+    @ApiModelProperty(value = "病情分析及处理（病因及处理意见）")
     private String briefNote;
 
-    /**
-     * 接收时间
-     */
+    @ApiModelProperty(value = "接收时间")
     private Date recieveDate;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public String getCrisisNote() {
-        return crisisNote;
-    }
-
-    public void setCrisisNote(String crisisNote) {
-        this.crisisNote = crisisNote;
-    }
-    public String getBriefNote() {
-        return briefNote;
-    }
-
-    public void setBriefNote(String briefNote) {
-        this.briefNote = briefNote;
-    }
-    public Date getRecieveDate() {
-        return recieveDate;
-    }
-
-    public void setRecieveDate(Date recieveDate) {
-        this.recieveDate = recieveDate;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
+    @ApiModelProperty(value = "入院日期")
+    private Date behospitalDate;
 
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
 
-    @Override
-    public String toString() {
-        return "StrCrisisNote{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", crisisNote=" + crisisNote +
-            ", briefNote=" + briefNote +
-            ", recieveDate=" + recieveDate +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
 }

src/main/java/com/diagbot/entity/StrDeathDiscussion.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,433 +17,117 @@ import java.util.Date;
  * 死亡病例讨论记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_death_discussion")
+@ApiModel(value="StrDeathDiscussion对象", description="死亡病例讨论记录")
 public class StrDeathDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 死亡诊断
-     */
+    @ApiModelProperty(value = "死亡诊断")
     private String deathDiagnosis;
 
-    /**
-     * 死亡原因
-     */
+    @ApiModelProperty(value = "死亡原因")
     private String deathReason;
 
-    /**
-     * 死亡时间
-     */
+    @ApiModelProperty(value = "死亡时间")
     private Date deathDate;
 
-    /**
-     * 讨论时间
-     */
+    @ApiModelProperty(value = "讨论时间")
     private Date discussDate;
 
-    /**
-     * 讨论地点
-     */
+    @ApiModelProperty(value = "讨论地点")
     private String discussPlace;
 
-    /**
-     * 主持人
-     */
-    private String anchor;
+    @ApiModelProperty(value = "主持人姓名及专业技术职务")
+    private String anchorPosition;
 
-    /**
-     * 参加人员
-     */
+    @ApiModelProperty(value = "参加人员")
     private String participant;
 
-    /**
-     * 病史简介
-     */
+    @ApiModelProperty(value = "病史简介")
     private String briefHistory;
 
-    /**
-     * 讨论内容
-     */
+    @ApiModelProperty(value = "讨论内容（具体讨论意见）")
     private String discussionContent;
 
-    /**
-     * 主持人小结
-     */
+    @ApiModelProperty(value = "主持人小结")
     private String anchorConclusion;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public String getTentativeDiagnosis() {
-        return tentativeDiagnosis;
-    }
-
-    public void setTentativeDiagnosis(String tentativeDiagnosis) {
-        this.tentativeDiagnosis = tentativeDiagnosis;
-    }
-    public String getDeathDiagnosis() {
-        return deathDiagnosis;
-    }
-
-    public void setDeathDiagnosis(String deathDiagnosis) {
-        this.deathDiagnosis = deathDiagnosis;
-    }
-    public String getDeathReason() {
-        return deathReason;
-    }
-
-    public void setDeathReason(String deathReason) {
-        this.deathReason = deathReason;
-    }
-    public Date getDeathDate() {
-        return deathDate;
-    }
-
-    public void setDeathDate(Date deathDate) {
-        this.deathDate = deathDate;
-    }
-    public Date getDiscussDate() {
-        return discussDate;
-    }
-
-    public void setDiscussDate(Date discussDate) {
-        this.discussDate = discussDate;
-    }
-    public String getDiscussPlace() {
-        return discussPlace;
-    }
-
-    public void setDiscussPlace(String discussPlace) {
-        this.discussPlace = discussPlace;
-    }
-    public String getAnchor() {
-        return anchor;
-    }
-
-    public void setAnchor(String anchor) {
-        this.anchor = anchor;
-    }
-    public String getParticipant() {
-        return participant;
-    }
-
-    public void setParticipant(String participant) {
-        this.participant = participant;
-    }
-    public String getBriefHistory() {
-        return briefHistory;
-    }
-
-    public void setBriefHistory(String briefHistory) {
-        this.briefHistory = briefHistory;
-    }
-    public String getDiscussionContent() {
-        return discussionContent;
-    }
-
-    public void setDiscussionContent(String discussionContent) {
-        this.discussionContent = discussionContent;
-    }
-    public String getAnchorConclusion() {
-        return anchorConclusion;
-    }
-
-    public void setAnchorConclusion(String anchorConclusion) {
-        this.anchorConclusion = anchorConclusion;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrDeathDiscussion{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", tentativeDiagnosis=" + tentativeDiagnosis +
-            ", deathDiagnosis=" + deathDiagnosis +
-            ", deathReason=" + deathReason +
-            ", deathDate=" + deathDate +
-            ", discussDate=" + discussDate +
-            ", discussPlace=" + discussPlace +
-            ", anchor=" + anchor +
-            ", participant=" + participant +
-            ", briefHistory=" + briefHistory +
-            ", discussionContent=" + discussionContent +
-            ", anchorConclusion=" + anchorConclusion +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "主持人签名")
+    private String anchor;
+
+
 }

src/main/java/com/diagbot/entity/StrDeathNote.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,381 +17,102 @@ import java.util.Date;
  * 死亡记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_death_note")
+@ApiModel(value="StrDeathNote对象", description="死亡记录")
 public class StrDeathNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private Date behospitalDate;
 
-    /**
-     * 死亡日期
-     */
+    @ApiModelProperty(value = "死亡日期")
     private Date deathDate;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊疗经过
-     */
+    @ApiModelProperty(value = "诊疗经过")
     private String treatmentProcess;
 
-    /**
-     * 死亡原因
-     */
+    @ApiModelProperty(value = "死亡原因")
     private String deathReason;
 
-    /**
-     * 死亡诊断
-     */
+    @ApiModelProperty(value = "死亡诊断")
     private String deathDiagnosis;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getBehospitalDate() {
-        return behospitalDate;
-    }
-
-    public void setBehospitalDate(Date behospitalDate) {
-        this.behospitalDate = behospitalDate;
-    }
-    public Date getDeathDate() {
-        return deathDate;
-    }
-
-    public void setDeathDate(Date deathDate) {
-        this.deathDate = deathDate;
-    }
-    public String getBehospitalSituation() {
-        return behospitalSituation;
-    }
-
-    public void setBehospitalSituation(String behospitalSituation) {
-        this.behospitalSituation = behospitalSituation;
-    }
-    public String getTentativeDiagnosis() {
-        return tentativeDiagnosis;
-    }
-
-    public void setTentativeDiagnosis(String tentativeDiagnosis) {
-        this.tentativeDiagnosis = tentativeDiagnosis;
-    }
-    public String getTreatmentProcess() {
-        return treatmentProcess;
-    }
-
-    public void setTreatmentProcess(String treatmentProcess) {
-        this.treatmentProcess = treatmentProcess;
-    }
-    public String getDeathReason() {
-        return deathReason;
-    }
-
-    public void setDeathReason(String deathReason) {
-        this.deathReason = deathReason;
-    }
-    public String getDeathDiagnosis() {
-        return deathDiagnosis;
-    }
-
-    public void setDeathDiagnosis(String deathDiagnosis) {
-        this.deathDiagnosis = deathDiagnosis;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrDeathNote{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", behospitalDate=" + behospitalDate +
-            ", deathDate=" + deathDate +
-            ", behospitalSituation=" + behospitalSituation +
-            ", tentativeDiagnosis=" + tentativeDiagnosis +
-            ", treatmentProcess=" + treatmentProcess +
-            ", deathReason=" + deathReason +
-            ", deathDiagnosis=" + deathDiagnosis +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+
 }

src/main/java/com/diagbot/entity/StrFirstRecord.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,420 +17,129 @@ import java.util.Date;
  * 首次病程录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_first_record")
+@ApiModel(value="StrFirstRecord对象", description="首次病程录")
 public class StrFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 现病史
-     */
+    @ApiModelProperty(value = "现病史")
     private String present;
 
-    /**
-     * 既往史
-     */
+    @ApiModelProperty(value = "既往史")
     private String pastHistory;
 
-    /**
-     * 查体
-     */
+    @ApiModelProperty(value = "查体")
     private String vital;
 
-    /**
-     * 辅检
-     */
+    @ApiModelProperty(value = "辅检")
     private String assistantExam;
 
-    /**
-     * 病例特点
-     */
+    @ApiModelProperty(value = "病例特点")
     private String caseCharacter;
 
-    /**
-     * 初步诊断
-     */
+    @ApiModelProperty(value = "初步诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊断依据
-     */
+    @ApiModelProperty(value = "诊断依据")
     private String supplyDiagnosis;
 
-    /**
-     * 鉴别诊断
-     */
+    @ApiModelProperty(value = "鉴别诊断")
     private String revisedDiagnosis;
 
-    /**
-     * 诊疗计划(方案)
-     */
+    @ApiModelProperty(value = "诊疗计划(方案)")
     private String treatPlan;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public String getChief() {
-        return chief;
-    }
-
-    public void setChief(String chief) {
-        this.chief = chief;
-    }
-    public String getPresent() {
-        return present;
-    }
-
-    public void setPresent(String present) {
-        this.present = present;
-    }
-    public String getPastHistory() {
-        return pastHistory;
-    }
-
-    public void setPastHistory(String pastHistory) {
-        this.pastHistory = pastHistory;
-    }
-    public String getVital() {
-        return vital;
-    }
-
-    public void setVital(String vital) {
-        this.vital = vital;
-    }
-    public String getAssistantExam() {
-        return assistantExam;
-    }
-
-    public void setAssistantExam(String assistantExam) {
-        this.assistantExam = assistantExam;
-    }
-    public String getCaseCharacter() {
-        return caseCharacter;
-    }
-
-    public void setCaseCharacter(String caseCharacter) {
-        this.caseCharacter = caseCharacter;
-    }
-    public String getTentativeDiagnosis() {
-        return tentativeDiagnosis;
-    }
-
-    public void setTentativeDiagnosis(String tentativeDiagnosis) {
-        this.tentativeDiagnosis = tentativeDiagnosis;
-    }
-    public String getSupplyDiagnosis() {
-        return supplyDiagnosis;
-    }
-
-    public void setSupplyDiagnosis(String supplyDiagnosis) {
-        this.supplyDiagnosis = supplyDiagnosis;
-    }
-    public String getRevisedDiagnosis() {
-        return revisedDiagnosis;
-    }
-
-    public void setRevisedDiagnosis(String revisedDiagnosis) {
-        this.revisedDiagnosis = revisedDiagnosis;
-    }
-    public String getTreatPlan() {
-        return treatPlan;
-    }
-
-    public void setTreatPlan(String treatPlan) {
-        this.treatPlan = treatPlan;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrFirstRecord{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", chief=" + chief +
-            ", present=" + present +
-            ", pastHistory=" + pastHistory +
-            ", vital=" + vital +
-            ", assistantExam=" + assistantExam +
-            ", caseCharacter=" + caseCharacter +
-            ", tentativeDiagnosis=" + tentativeDiagnosis +
-            ", supplyDiagnosis=" + supplyDiagnosis +
-            ", revisedDiagnosis=" + revisedDiagnosis +
-            ", treatPlan=" + treatPlan +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "主诊医生")
+    private String chiefDoctor;
+
+    @ApiModelProperty(value = "发热")
+    private String fever;
+
+    @ApiModelProperty(value = "咳嗽等呼吸道症状")
+    private String coughSymptom;
+
+    @ApiModelProperty(value = "入院时使用的治疗性药物")
+    private String entryMedication;
+
+    @ApiModelProperty(value = "成瘾药物")
+    private String addiMedication;
+
+    @ApiModelProperty(value = "入院时间")
+    private Date behospitalDate;
+
+
 }

src/main/java/com/diagbot/entity/StrIllCritically.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,316 +17,90 @@ import java.util.Date;
  * 病危通知单
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_ill_critically")
+@ApiModel(value="StrIllCritically对象", description="病危通知单")
 public class StrIllCritically implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 当前诊断
-     */
+    @ApiModelProperty(value = "当前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 病情危重情况
-     */
+    @ApiModelProperty(value = "病情危重情况")
     private String criticalSituation;
 
-    /**
-     * 患者签名
-     */
+    @ApiModelProperty(value = "患者/家属签名")
     private String patientSign;
 
-    /**
-     * 患者签名时间
-     */
+    @ApiModelProperty(value = "患者/家属签名时间")
     private Date patientSignDate;
 
-    /**
-     * 医生签名
-     */
+    @ApiModelProperty(value = "医生签名")
     private String doctorSign;
 
-    /**
-     * 医生签名时间
-     */
+    @ApiModelProperty(value = "医生签名时间")
     private Date doctorSignDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public String getCurrentDiagnosis() {
-        return currentDiagnosis;
-    }
-
-    public void setCurrentDiagnosis(String currentDiagnosis) {
-        this.currentDiagnosis = currentDiagnosis;
-    }
-    public String getCriticalSituation() {
-        return criticalSituation;
-    }
-
-    public void setCriticalSituation(String criticalSituation) {
-        this.criticalSituation = criticalSituation;
-    }
-    public String getPatientSign() {
-        return patientSign;
-    }
-
-    public void setPatientSign(String patientSign) {
-        this.patientSign = patientSign;
-    }
-    public Date getPatientSignDate() {
-        return patientSignDate;
-    }
-
-    public void setPatientSignDate(Date patientSignDate) {
-        this.patientSignDate = patientSignDate;
-    }
-    public String getDoctorSign() {
-        return doctorSign;
-    }
-
-    public void setDoctorSign(String doctorSign) {
-        this.doctorSign = doctorSign;
-    }
-    public Date getDoctorSignDate() {
-        return doctorSignDate;
-    }
-
-    public void setDoctorSignDate(Date doctorSignDate) {
-        this.doctorSignDate = doctorSignDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
+    @ApiModelProperty(value = "记录时间")
+    private Date recDate;
 
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
 
-    @Override
-    public String toString() {
-        return "StrIllCritically{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", currentDiagnosis=" + currentDiagnosis +
-            ", criticalSituation=" + criticalSituation +
-            ", patientSign=" + patientSign +
-            ", patientSignDate=" + patientSignDate +
-            ", doctorSign=" + doctorSign +
-            ", doctorSignDate=" + doctorSignDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
 }

src/main/java/com/diagbot/entity/StrLeaveHospital.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,420 +17,159 @@ import java.util.Date;
  * 出院小结
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_leave_hospital")
+@ApiModel(value="StrLeaveHospital对象", description="出院小结")
 public class StrLeaveHospital implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private Date behospitalDate;
 
-    /**
-     * 出院日期
-     */
+    @ApiModelProperty(value = "出院日期")
     private Date leaveHospitalDate;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 出院诊断
-     */
+    @ApiModelProperty(value = "出院诊断")
     private String leaveDiagnosis;
 
-    /**
-     * 住院天数
-     */
+    @ApiModelProperty(value = "住院天数")
     private String behospitalDayNum;
 
-    /**
-     * 入院原因
-     */
+    @ApiModelProperty(value = "入院原因")
     private String behospitalReason;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 诊治经过
-     */
+    @ApiModelProperty(value = "诊治经过")
     private String treatmentProcess;
 
-    /**
-     * 出院情况
-     */
+    @ApiModelProperty(value = "出院情况")
     private String leaveHospitalSituation;
 
-    /**
-     * 出院医嘱
-     */
+    @ApiModelProperty(value = "出院医嘱")
     private String leaveHospitalDoctoradvice;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getBehospitalDate() {
-        return behospitalDate;
-    }
-
-    public void setBehospitalDate(Date behospitalDate) {
-        this.behospitalDate = behospitalDate;
-    }
-    public Date getLeaveHospitalDate() {
-        return leaveHospitalDate;
-    }
-
-    public void setLeaveHospitalDate(Date leaveHospitalDate) {
-        this.leaveHospitalDate = leaveHospitalDate;
-    }
-    public String getTentativeDiagnosis() {
-        return tentativeDiagnosis;
-    }
-
-    public void setTentativeDiagnosis(String tentativeDiagnosis) {
-        this.tentativeDiagnosis = tentativeDiagnosis;
-    }
-    public String getLeaveDiagnosis() {
-        return leaveDiagnosis;
-    }
-
-    public void setLeaveDiagnosis(String leaveDiagnosis) {
-        this.leaveDiagnosis = leaveDiagnosis;
-    }
-    public String getBehospitalDayNum() {
-        return behospitalDayNum;
-    }
-
-    public void setBehospitalDayNum(String behospitalDayNum) {
-        this.behospitalDayNum = behospitalDayNum;
-    }
-    public String getBehospitalReason() {
-        return behospitalReason;
-    }
-
-    public void setBehospitalReason(String behospitalReason) {
-        this.behospitalReason = behospitalReason;
-    }
-    public String getBehospitalSituation() {
-        return behospitalSituation;
-    }
-
-    public void setBehospitalSituation(String behospitalSituation) {
-        this.behospitalSituation = behospitalSituation;
-    }
-    public String getTreatmentProcess() {
-        return treatmentProcess;
-    }
-
-    public void setTreatmentProcess(String treatmentProcess) {
-        this.treatmentProcess = treatmentProcess;
-    }
-    public String getLeaveHospitalSituation() {
-        return leaveHospitalSituation;
-    }
-
-    public void setLeaveHospitalSituation(String leaveHospitalSituation) {
-        this.leaveHospitalSituation = leaveHospitalSituation;
-    }
-    public String getLeaveHospitalDoctoradvice() {
-        return leaveHospitalDoctoradvice;
-    }
-
-    public void setLeaveHospitalDoctoradvice(String leaveHospitalDoctoradvice) {
-        this.leaveHospitalDoctoradvice = leaveHospitalDoctoradvice;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrLeaveHospital{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", behospitalDate=" + behospitalDate +
-            ", leaveHospitalDate=" + leaveHospitalDate +
-            ", tentativeDiagnosis=" + tentativeDiagnosis +
-            ", leaveDiagnosis=" + leaveDiagnosis +
-            ", behospitalDayNum=" + behospitalDayNum +
-            ", behospitalReason=" + behospitalReason +
-            ", behospitalSituation=" + behospitalSituation +
-            ", treatmentProcess=" + treatmentProcess +
-            ", leaveHospitalSituation=" + leaveHospitalSituation +
-            ", leaveHospitalDoctoradvice=" + leaveHospitalDoctoradvice +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "主诊医生")
+    private String chiefDoctor;
+
+    @ApiModelProperty(value = "出院诊断（中医）")
+    private String leaveDiagnosisCh;
+
+    @ApiModelProperty(value = "出院状态")
+    private String leaveHospitalCondition;
+
+    @ApiModelProperty(value = "出院去向")
+    private String leaveHospitalDisposition;
+
+    @ApiModelProperty(value = "出院带药")
+    private String leaveHospitalMedication;
+
+    @ApiModelProperty(value = "食物药物相互作用指导")
+    private String foodMedicationAdvice;
+
+    @ApiModelProperty(value = "饮食指导")
+    private String foodAdvice;
+
+    @ApiModelProperty(value = "特殊饮食指导")
+    private String foodAdviceSpecial;
+
+    @ApiModelProperty(value = "植入物指导")
+    private String implantAdvice;
+
+    @ApiModelProperty(value = "其他指导")
+    private String otherAdvice;
+
+    @ApiModelProperty(value = "复诊时间")
+    private String followDateRecord;
+
+    @ApiModelProperty(value = "复诊地点")
+    private String followPlace;
+
+    @ApiModelProperty(value = "复诊目的")
+    private String followPurpose;
+
+    @ApiModelProperty(value = "复诊科室")
+    private String followDept;
+
+    @ApiModelProperty(value = "NRS2002评分")
+    private String followScore;
+
+    @ApiModelProperty(value = "复诊紧急就医")
+    private String followEmergency;
+
+
 }

src/main/java/com/diagbot/entity/StrOperativeFirstRecord.java

@@ -1,5 +1,12 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,524 +15,140 @@ import java.util.Date;
  * 术后首程
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_operative_first_record")
+@ApiModel(value="StrOperativeFirstRecord对象", description="术后首程")
 public class StrOperativeFirstRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 手术日期
-     */
+    @ApiModelProperty(value = "手术日期")
     private Date operationDate;
 
-    /**
-     * 开始时间
-     */
+    @ApiModelProperty(value = "开始时间")
     private Date startTime;
 
-    /**
-     * 结束时间
-     */
+    @ApiModelProperty(value = "结束时间")
     private Date endTime;
 
-    /**
-     * 麻醉方式
-     */
+    @ApiModelProperty(value = "麻醉方式")
     private String narcosisType;
 
-    /**
-     * 麻醉医师
-     */
+    @ApiModelProperty(value = "麻醉医师")
     private String narcosisDoctor;
 
-    /**
-     * 术前诊断
-     */
+    @ApiModelProperty(value = "术前诊断")
     private String preoperationDiagnosis;
 
-    /**
-     * 术（中）后诊断
-     */
+    @ApiModelProperty(value = "术（中）后诊断")
     private String postoperativeDiagnosis;
 
-    /**
-     * 手术人员
-     */
+    @ApiModelProperty(value = "手术人员")
     private String operationMan;
 
-    /**
-     * 手术名称方式
-     */
+    @ApiModelProperty(value = "手术名称方式")
     private String operationName;
 
-    /**
-     * 手术简要经过
-     */
+    @ApiModelProperty(value = "手术简要经过")
     private String operationProcess;
 
-    /**
-     * 患者术后情况
-     */
+    @ApiModelProperty(value = "患者术后情况（病人出手术室时一般情况）")
     private String postoperativeSituation;
 
-    /**
-     * 术后处理措施
-     */
+    @ApiModelProperty(value = "术后处理措施")
     private String postoperativeTreatment;
 
-    /**
-     * 术后注意事项
-     */
+    @ApiModelProperty(value = "术后注意事项")
     private String postoperativeNotice;
 
-    /**
-     * 术后可能出现的并发症及预防措施
-     */
+    @ApiModelProperty(value = "术后可能出现的并发症及预防措施")
     private String postoperativeComplication;
 
-    /**
-     * 手术切除标本
-     */
+    @ApiModelProperty(value = "手术切除标本")
     private String operationSpecimen;
 
-    /**
-     * 术中出血量
-     */
+    @ApiModelProperty(value = "术中出血量")
     private String operationBleed;
 
-    /**
-     * 术中输血量
-     */
+    @ApiModelProperty(value = "术中输血量")
     private String operationBloodTransfusion;
 
-    /**
-     * 术中并发症
-     */
+    @ApiModelProperty(value = "术中并发症")
     private String operationComplication;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getOperationDate() {
-        return operationDate;
-    }
-
-    public void setOperationDate(Date operationDate) {
-        this.operationDate = operationDate;
-    }
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-    public String getNarcosisType() {
-        return narcosisType;
-    }
-
-    public void setNarcosisType(String narcosisType) {
-        this.narcosisType = narcosisType;
-    }
-    public String getNarcosisDoctor() {
-        return narcosisDoctor;
-    }
-
-    public void setNarcosisDoctor(String narcosisDoctor) {
-        this.narcosisDoctor = narcosisDoctor;
-    }
-    public String getPreoperationDiagnosis() {
-        return preoperationDiagnosis;
-    }
-
-    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
-        this.preoperationDiagnosis = preoperationDiagnosis;
-    }
-    public String getPostoperativeDiagnosis() {
-        return postoperativeDiagnosis;
-    }
-
-    public void setPostoperativeDiagnosis(String postoperativeDiagnosis) {
-        this.postoperativeDiagnosis = postoperativeDiagnosis;
-    }
-    public String getOperationMan() {
-        return operationMan;
-    }
-
-    public void setOperationMan(String operationMan) {
-        this.operationMan = operationMan;
-    }
-    public String getOperationName() {
-        return operationName;
-    }
-
-    public void setOperationName(String operationName) {
-        this.operationName = operationName;
-    }
-    public String getOperationProcess() {
-        return operationProcess;
-    }
-
-    public void setOperationProcess(String operationProcess) {
-        this.operationProcess = operationProcess;
-    }
-    public String getPostoperativeSituation() {
-        return postoperativeSituation;
-    }
-
-    public void setPostoperativeSituation(String postoperativeSituation) {
-        this.postoperativeSituation = postoperativeSituation;
-    }
-    public String getPostoperativeTreatment() {
-        return postoperativeTreatment;
-    }
-
-    public void setPostoperativeTreatment(String postoperativeTreatment) {
-        this.postoperativeTreatment = postoperativeTreatment;
-    }
-    public String getPostoperativeNotice() {
-        return postoperativeNotice;
-    }
-
-    public void setPostoperativeNotice(String postoperativeNotice) {
-        this.postoperativeNotice = postoperativeNotice;
-    }
-    public String getPostoperativeComplication() {
-        return postoperativeComplication;
-    }
-
-    public void setPostoperativeComplication(String postoperativeComplication) {
-        this.postoperativeComplication = postoperativeComplication;
-    }
-    public String getOperationSpecimen() {
-        return operationSpecimen;
-    }
-
-    public void setOperationSpecimen(String operationSpecimen) {
-        this.operationSpecimen = operationSpecimen;
-    }
-    public String getOperationBleed() {
-        return operationBleed;
-    }
-
-    public void setOperationBleed(String operationBleed) {
-        this.operationBleed = operationBleed;
-    }
-    public String getOperationBloodTransfusion() {
-        return operationBloodTransfusion;
-    }
-
-    public void setOperationBloodTransfusion(String operationBloodTransfusion) {
-        this.operationBloodTransfusion = operationBloodTransfusion;
-    }
-    public String getOperationComplication() {
-        return operationComplication;
-    }
-
-    public void setOperationComplication(String operationComplication) {
-        this.operationComplication = operationComplication;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrOperativeFirstRecord{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", operationDate=" + operationDate +
-            ", startTime=" + startTime +
-            ", endTime=" + endTime +
-            ", narcosisType=" + narcosisType +
-            ", narcosisDoctor=" + narcosisDoctor +
-            ", preoperationDiagnosis=" + preoperationDiagnosis +
-            ", postoperativeDiagnosis=" + postoperativeDiagnosis +
-            ", operationMan=" + operationMan +
-            ", operationName=" + operationName +
-            ", operationProcess=" + operationProcess +
-            ", postoperativeSituation=" + postoperativeSituation +
-            ", postoperativeTreatment=" + postoperativeTreatment +
-            ", postoperativeNotice=" + postoperativeNotice +
-            ", postoperativeComplication=" + postoperativeComplication +
-            ", operationSpecimen=" + operationSpecimen +
-            ", operationBleed=" + operationBleed +
-            ", operationBloodTransfusion=" + operationBloodTransfusion +
-            ", operationComplication=" + operationComplication +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "主刀医生")
+    private String chiefDoctor;
+
+    @ApiModelProperty(value = "患者/家属签名")
+    private String patientSign;
+
+
 }

src/main/java/com/diagbot/entity/StrOperativeNote.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,537 +17,162 @@ import java.util.Date;
  * 手术记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_operative_note")
+@ApiModel(value="StrOperativeNote对象", description="手术记录")
 public class StrOperativeNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 手术日期
-     */
+    @ApiModelProperty(value = "手术日期")
     private Date operationDate;
 
-    /**
-     * 开始时间
-     */
+    @ApiModelProperty(value = "开始时间")
     private Date startTime;
 
-    /**
-     * 结束时间
-     */
+    @ApiModelProperty(value = "结束时间")
     private Date endTime;
 
-    /**
-     * 术前诊断
-     */
+    @ApiModelProperty(value = "术前诊断")
     private String preoperationDiagnosis;
 
-    /**
-     * 手术名称
-     */
+    @ApiModelProperty(value = "手术名称")
     private String operationName;
 
-    /**
-     * 术（中）后诊断
-     */
+    @ApiModelProperty(value = "术（中）后诊断")
     private String postoperativeDiagnosis;
 
-    /**
-     * 主刀医师
-     */
+    @ApiModelProperty(value = "主刀医师")
     private String operationSurgeon;
 
-    /**
-     * 一助
-     */
+    @ApiModelProperty(value = "一助")
     private String firstHelping;
 
-    /**
-     * 二助
-     */
+    @ApiModelProperty(value = "二助")
     private String secondHelping;
 
-    /**
-     * 麻醉医师
-     */
+    @ApiModelProperty(value = "麻醉医师")
     private String narcosisDoctor;
 
-    /**
-     * 麻醉方式
-     */
+    @ApiModelProperty(value = "麻醉方式")
     private String narcosisType;
 
-    /**
-     * 切口类别
-     */
+    @ApiModelProperty(value = "切口类别")
     private String cutType;
 
-    /**
-     * 病理诊断
-     */
+    @ApiModelProperty(value = "病理（冰冻）诊断")
     private String pathologicalDiagnosis;
 
-    /**
-     * 是否术中植入物
-     */
+    @ApiModelProperty(value = "是否术中植入物")
     private String isImplants;
 
-    /**
-     * 植入物名称
-     */
+    @ApiModelProperty(value = "植入物名称")
     private String implantsName;
 
-    /**
-     * 出血
-     */
+    @ApiModelProperty(value = "出血")
     private String bloodLoss;
 
-    /**
-     * 术中所见
-     */
+    @ApiModelProperty(value = "术中所见")
     private String intraoperativeView;
 
-    /**
-     * 术后注意事项
-     */
+    @ApiModelProperty(value = "术后注意事项")
     private String postoperativeNotice;
 
-    /**
-     * 手术经过及处理
-     */
+    @ApiModelProperty(value = "手术经过及处理")
     private String operationProcess;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getOperationDate() {
-        return operationDate;
-    }
-
-    public void setOperationDate(Date operationDate) {
-        this.operationDate = operationDate;
-    }
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-    public String getPreoperationDiagnosis() {
-        return preoperationDiagnosis;
-    }
-
-    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
-        this.preoperationDiagnosis = preoperationDiagnosis;
-    }
-    public String getOperationName() {
-        return operationName;
-    }
-
-    public void setOperationName(String operationName) {
-        this.operationName = operationName;
-    }
-    public String getPostoperativeDiagnosis() {
-        return postoperativeDiagnosis;
-    }
-
-    public void setPostoperativeDiagnosis(String postoperativeDiagnosis) {
-        this.postoperativeDiagnosis = postoperativeDiagnosis;
-    }
-    public String getOperationSurgeon() {
-        return operationSurgeon;
-    }
-
-    public void setOperationSurgeon(String operationSurgeon) {
-        this.operationSurgeon = operationSurgeon;
-    }
-    public String getFirstHelping() {
-        return firstHelping;
-    }
-
-    public void setFirstHelping(String firstHelping) {
-        this.firstHelping = firstHelping;
-    }
-    public String getSecondHelping() {
-        return secondHelping;
-    }
-
-    public void setSecondHelping(String secondHelping) {
-        this.secondHelping = secondHelping;
-    }
-    public String getNarcosisDoctor() {
-        return narcosisDoctor;
-    }
-
-    public void setNarcosisDoctor(String narcosisDoctor) {
-        this.narcosisDoctor = narcosisDoctor;
-    }
-    public String getNarcosisType() {
-        return narcosisType;
-    }
-
-    public void setNarcosisType(String narcosisType) {
-        this.narcosisType = narcosisType;
-    }
-    public String getCutType() {
-        return cutType;
-    }
-
-    public void setCutType(String cutType) {
-        this.cutType = cutType;
-    }
-    public String getPathologicalDiagnosis() {
-        return pathologicalDiagnosis;
-    }
-
-    public void setPathologicalDiagnosis(String pathologicalDiagnosis) {
-        this.pathologicalDiagnosis = pathologicalDiagnosis;
-    }
-    public String getIsImplants() {
-        return isImplants;
-    }
-
-    public void setIsImplants(String isImplants) {
-        this.isImplants = isImplants;
-    }
-    public String getImplantsName() {
-        return implantsName;
-    }
-
-    public void setImplantsName(String implantsName) {
-        this.implantsName = implantsName;
-    }
-    public String getBloodLoss() {
-        return bloodLoss;
-    }
-
-    public void setBloodLoss(String bloodLoss) {
-        this.bloodLoss = bloodLoss;
-    }
-    public String getIntraoperativeView() {
-        return intraoperativeView;
-    }
-
-    public void setIntraoperativeView(String intraoperativeView) {
-        this.intraoperativeView = intraoperativeView;
-    }
-    public String getPostoperativeNotice() {
-        return postoperativeNotice;
-    }
-
-    public void setPostoperativeNotice(String postoperativeNotice) {
-        this.postoperativeNotice = postoperativeNotice;
-    }
-    public String getOperationProcess() {
-        return operationProcess;
-    }
-
-    public void setOperationProcess(String operationProcess) {
-        this.operationProcess = operationProcess;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrOperativeNote{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", operationDate=" + operationDate +
-            ", startTime=" + startTime +
-            ", endTime=" + endTime +
-            ", preoperationDiagnosis=" + preoperationDiagnosis +
-            ", operationName=" + operationName +
-            ", postoperativeDiagnosis=" + postoperativeDiagnosis +
-            ", operationSurgeon=" + operationSurgeon +
-            ", firstHelping=" + firstHelping +
-            ", secondHelping=" + secondHelping +
-            ", narcosisDoctor=" + narcosisDoctor +
-            ", narcosisType=" + narcosisType +
-            ", cutType=" + cutType +
-            ", pathologicalDiagnosis=" + pathologicalDiagnosis +
-            ", isImplants=" + isImplants +
-            ", implantsName=" + implantsName +
-            ", bloodLoss=" + bloodLoss +
-            ", intraoperativeView=" + intraoperativeView +
-            ", postoperativeNotice=" + postoperativeNotice +
-            ", operationProcess=" + operationProcess +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "入院时间")
+    private Date behospitalDate;
+
+    @ApiModelProperty(value = "手术时数")
+    private String operationTime;
+
+    @ApiModelProperty(value = "处理标本")
+    private String specimen;
+
+    @ApiModelProperty(value = "输血情况")
+    private String transfusion;
+
+    @ApiModelProperty(value = "红细胞")
+    private String redBlood;
+
+    @ApiModelProperty(value = "血小板")
+    private String platelet;
+
+    @ApiModelProperty(value = "血浆")
+    private String Plasma;
+
+    @ApiModelProperty(value = "全血")
+    private String wholeBlood;
+
+
 }

src/main/java/com/diagbot/entity/StrPreoperativeDiscussion.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,459 +17,126 @@ import java.util.Date;
  * 术前讨论小结
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_preoperative_discussion")
+@ApiModel(value="StrPreoperativeDiscussion对象", description="术前讨论小结")
 public class StrPreoperativeDiscussion implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 讨论时间
-     */
+    @ApiModelProperty(value = "讨论时间")
     private Date discussTime;
 
-    /**
-     * 讨论方式
-     */
+    @ApiModelProperty(value = "讨论方式")
     private String discussType;
 
-    /**
-     * 参加人员
-     */
+    @ApiModelProperty(value = "参加人员")
     private String participant;
 
-    /**
-     * 简要病情
-     */
+    @ApiModelProperty(value = "简要病情")
     private String briefNote;
 
-    /**
-     * 术前诊断
-     */
+    @ApiModelProperty(value = "术前诊断")
     private String preoperationDiagnosis;
 
-    /**
-     * 手术指征与禁忌
-     */
+    @ApiModelProperty(value = "手术指征与禁忌")
     private String operationIndication;
 
-    /**
-     * 可替代的方案
-     */
+    @ApiModelProperty(value = "可替代的方案")
     private String replacePlan;
 
-    /**
-     * 拟施手术方式、名称及可能的变更与禁忌症
-     */
+    @ApiModelProperty(value = "拟施手术方式、名称及可能的变更与禁忌症")
     private String operationName;
 
-    /**
-     * 拟施麻醉方式
-     */
+    @ApiModelProperty(value = "拟施麻醉方式")
     private String anesthesiaType;
 
-    /**
-     * 术前准备
-     */
+    @ApiModelProperty(value = "术前准备")
     private String preoperationPrepare;
 
-    /**
-     * 主要术中、术后风险及防范措施
-     */
+    @ApiModelProperty(value = "主要术中、术后风险及防范措施")
     private String intraoperativeRisk;
 
-    /**
-     * 术中注意事项
-     */
+    @ApiModelProperty(value = "术中注意事项")
     private String intraoperativeNotice;
 
-    /**
-     * 术后注意事项
-     */
+    @ApiModelProperty(value = "术后注意事项")
     private String postoperativeNotice;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getDiscussTime() {
-        return discussTime;
-    }
-
-    public void setDiscussTime(Date discussTime) {
-        this.discussTime = discussTime;
-    }
-    public String getDiscussType() {
-        return discussType;
-    }
-
-    public void setDiscussType(String discussType) {
-        this.discussType = discussType;
-    }
-    public String getParticipant() {
-        return participant;
-    }
-
-    public void setParticipant(String participant) {
-        this.participant = participant;
-    }
-    public String getBriefNote() {
-        return briefNote;
-    }
-
-    public void setBriefNote(String briefNote) {
-        this.briefNote = briefNote;
-    }
-    public String getPreoperationDiagnosis() {
-        return preoperationDiagnosis;
-    }
-
-    public void setPreoperationDiagnosis(String preoperationDiagnosis) {
-        this.preoperationDiagnosis = preoperationDiagnosis;
-    }
-    public String getOperationIndication() {
-        return operationIndication;
-    }
-
-    public void setOperationIndication(String operationIndication) {
-        this.operationIndication = operationIndication;
-    }
-    public String getReplacePlan() {
-        return replacePlan;
-    }
-
-    public void setReplacePlan(String replacePlan) {
-        this.replacePlan = replacePlan;
-    }
-    public String getOperationName() {
-        return operationName;
-    }
-
-    public void setOperationName(String operationName) {
-        this.operationName = operationName;
-    }
-    public String getAnesthesiaType() {
-        return anesthesiaType;
-    }
-
-    public void setAnesthesiaType(String anesthesiaType) {
-        this.anesthesiaType = anesthesiaType;
-    }
-    public String getPreoperationPrepare() {
-        return preoperationPrepare;
-    }
-
-    public void setPreoperationPrepare(String preoperationPrepare) {
-        this.preoperationPrepare = preoperationPrepare;
-    }
-    public String getIntraoperativeRisk() {
-        return intraoperativeRisk;
-    }
-
-    public void setIntraoperativeRisk(String intraoperativeRisk) {
-        this.intraoperativeRisk = intraoperativeRisk;
-    }
-    public String getIntraoperativeNotice() {
-        return intraoperativeNotice;
-    }
-
-    public void setIntraoperativeNotice(String intraoperativeNotice) {
-        this.intraoperativeNotice = intraoperativeNotice;
-    }
-    public String getPostoperativeNotice() {
-        return postoperativeNotice;
-    }
-
-    public void setPostoperativeNotice(String postoperativeNotice) {
-        this.postoperativeNotice = postoperativeNotice;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrPreoperativeDiscussion{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", sex=" + sex +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", discussTime=" + discussTime +
-            ", discussType=" + discussType +
-            ", participant=" + participant +
-            ", briefNote=" + briefNote +
-            ", preoperationDiagnosis=" + preoperationDiagnosis +
-            ", operationIndication=" + operationIndication +
-            ", replacePlan=" + replacePlan +
-            ", operationName=" + operationName +
-            ", anesthesiaType=" + anesthesiaType +
-            ", preoperationPrepare=" + preoperationPrepare +
-            ", intraoperativeRisk=" + intraoperativeRisk +
-            ", intraoperativeNotice=" + intraoperativeNotice +
-            ", postoperativeNotice=" + postoperativeNotice +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "入院时间")
+    private Date behospitalDate;
+
+    @ApiModelProperty(value = "可能出现的问题和对策")
+    private String potentialIssues;
+
+
 }

src/main/java/com/diagbot/entity/StrRescueNote.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,355 +17,96 @@ import java.util.Date;
  * 抢救记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-27
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_rescue_note")
+@ApiModel(value="StrRescueNote对象", description="抢救记录")
 public class StrRescueNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 开始时间
-     */
+    @ApiModelProperty(value = "开始时间")
     private Date startTime;
 
-    /**
-     * 结束时间
-     */
+    @ApiModelProperty(value = "结束时间")
     private Date endTime;
 
-    /**
-     * 简要病情
-     */
+    @ApiModelProperty(value = "简要病情")
     private String briefNote;
 
-    /**
-     * 抢救措施
-     */
+    @ApiModelProperty(value = "抢救措施")
     private String resuscitation;
 
-    /**
-     * 参加抢救的医务人员姓名及专业技术职称
-     */
+    @ApiModelProperty(value = "参加抢救的医务人员姓名及专业技术职称")
     private String rescueMan;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-    public String getBriefNote() {
-        return briefNote;
-    }
-
-    public void setBriefNote(String briefNote) {
-        this.briefNote = briefNote;
-    }
-    public String getResuscitation() {
-        return resuscitation;
-    }
-
-    public void setResuscitation(String resuscitation) {
-        this.resuscitation = resuscitation;
-    }
-    public String getRescueMan() {
-        return rescueMan;
-    }
-
-    public void setRescueMan(String rescueMan) {
-        this.rescueMan = rescueMan;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrRescueNote{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", startTime=" + startTime +
-            ", endTime=" + endTime +
-            ", briefNote=" + briefNote +
-            ", resuscitation=" + resuscitation +
-            ", rescueMan=" + rescueMan +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+
 }

src/main/java/com/diagbot/entity/StrTransferInNote.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,420 +17,126 @@ import java.util.Date;
  * 转入记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-27
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_transfer_in_note")
+@ApiModel(value="StrTransferInNote对象", description="转入记录")
 public class StrTransferInNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 转入日期
-     */
+    @ApiModelProperty(value = "转入日期")
     private Date transferInDate;
 
-    /**
-     * 转出科室
-     */
+    @ApiModelProperty(value = "转出科室")
     private String transferOutDept;
 
-    /**
-     * 转入科室
-     */
+    @ApiModelProperty(value = "转入科室")
     private String transferInDept;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 目前病情
-     */
+    @ApiModelProperty(value = "目前病情")
     private String currentSituation;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊疗经过
-     */
+    @ApiModelProperty(value = "诊疗经过")
     private String treatmentProcess;
 
-    /**
-     * 目前诊断
-     */
+    @ApiModelProperty(value = "目前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 转入诊疗计划
-     */
+    @ApiModelProperty(value = "转入诊疗计划")
     private String treatPlan;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getTransferInDate() {
-        return transferInDate;
-    }
-
-    public void setTransferInDate(Date transferInDate) {
-        this.transferInDate = transferInDate;
-    }
-    public String getTransferOutDept() {
-        return transferOutDept;
-    }
-
-    public void setTransferOutDept(String transferOutDept) {
-        this.transferOutDept = transferOutDept;
-    }
-    public String getTransferInDept() {
-        return transferInDept;
-    }
-
-    public void setTransferInDept(String transferInDept) {
-        this.transferInDept = transferInDept;
-    }
-    public String getChief() {
-        return chief;
-    }
-
-    public void setChief(String chief) {
-        this.chief = chief;
-    }
-    public String getBehospitalSituation() {
-        return behospitalSituation;
-    }
-
-    public void setBehospitalSituation(String behospitalSituation) {
-        this.behospitalSituation = behospitalSituation;
-    }
-    public String getCurrentSituation() {
-        return currentSituation;
-    }
-
-    public void setCurrentSituation(String currentSituation) {
-        this.currentSituation = currentSituation;
-    }
-    public String getTentativeDiagnosis() {
-        return tentativeDiagnosis;
-    }
-
-    public void setTentativeDiagnosis(String tentativeDiagnosis) {
-        this.tentativeDiagnosis = tentativeDiagnosis;
-    }
-    public String getTreatmentProcess() {
-        return treatmentProcess;
-    }
-
-    public void setTreatmentProcess(String treatmentProcess) {
-        this.treatmentProcess = treatmentProcess;
-    }
-    public String getCurrentDiagnosis() {
-        return currentDiagnosis;
-    }
-
-    public void setCurrentDiagnosis(String currentDiagnosis) {
-        this.currentDiagnosis = currentDiagnosis;
-    }
-    public String getTreatPlan() {
-        return treatPlan;
-    }
-
-    public void setTreatPlan(String treatPlan) {
-        this.treatPlan = treatPlan;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrTransferInNote{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", transferInDate=" + transferInDate +
-            ", transferOutDept=" + transferOutDept +
-            ", transferInDept=" + transferInDept +
-            ", chief=" + chief +
-            ", behospitalSituation=" + behospitalSituation +
-            ", currentSituation=" + currentSituation +
-            ", tentativeDiagnosis=" + tentativeDiagnosis +
-            ", treatmentProcess=" + treatmentProcess +
-            ", currentDiagnosis=" + currentDiagnosis +
-            ", treatPlan=" + treatPlan +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "入院日期")
+    private Date behospitalDate;
+
+    @ApiModelProperty(value = "转科日期")
+    private Date transferDate;
+
+    @ApiModelProperty(value = "接科情况")
+    private String transferInSituation;
+
+    @ApiModelProperty(value = "患者签字")
+    private String patientSign;
+
+    @ApiModelProperty(value = "患者签字时间")
+    private Date patientTime;
+
+
 }

src/main/java/com/diagbot/entity/StrTransferOutNote.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,420 +17,135 @@ import java.util.Date;
  * 转出记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-27
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_transfer_out_note")
+@ApiModel(value="StrTransferOutNote对象", description="转出记录")
 public class StrTransferOutNote implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 转入日期   --实际转出日期 ！！不能改动
-     */
+    @ApiModelProperty(value = "转入日期")
     private Date transferInDate;
 
-    /**
-     * 转出科室
-     */
+    @ApiModelProperty(value = "转出科室")
     private String transferOutDept;
 
-    /**
-     * 转入科室
-     */
+    @ApiModelProperty(value = "转入科室")
     private String transferInDept;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 目前病情
-     */
+    @ApiModelProperty(value = "目前病情")
     private String currentSituation;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊疗经过
-     */
+    @ApiModelProperty(value = "诊疗经过")
     private String treatmentProcess;
 
-    /**
-     * 目前诊断
-     */
+    @ApiModelProperty(value = "目前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 转入诊疗计划
-     */
+    @ApiModelProperty(value = "转入诊疗计划")
     private String treatPlan;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public String getRecTitle() {
-        return recTitle;
-    }
-
-    public void setRecTitle(String recTitle) {
-        this.recTitle = recTitle;
-    }
-    public Date getTransferInDate() {
-        return transferInDate;
-    }
-
-    public void setTransferInDate(Date transferInDate) {
-        this.transferInDate = transferInDate;
-    }
-    public String getTransferOutDept() {
-        return transferOutDept;
-    }
-
-    public void setTransferOutDept(String transferOutDept) {
-        this.transferOutDept = transferOutDept;
-    }
-    public String getTransferInDept() {
-        return transferInDept;
-    }
-
-    public void setTransferInDept(String transferInDept) {
-        this.transferInDept = transferInDept;
-    }
-    public String getChief() {
-        return chief;
-    }
-
-    public void setChief(String chief) {
-        this.chief = chief;
-    }
-    public String getBehospitalSituation() {
-        return behospitalSituation;
-    }
-
-    public void setBehospitalSituation(String behospitalSituation) {
-        this.behospitalSituation = behospitalSituation;
-    }
-    public String getCurrentSituation() {
-        return currentSituation;
-    }
-
-    public void setCurrentSituation(String currentSituation) {
-        this.currentSituation = currentSituation;
-    }
-    public String getTentativeDiagnosis() {
-        return tentativeDiagnosis;
-    }
-
-    public void setTentativeDiagnosis(String tentativeDiagnosis) {
-        this.tentativeDiagnosis = tentativeDiagnosis;
-    }
-    public String getTreatmentProcess() {
-        return treatmentProcess;
-    }
-
-    public void setTreatmentProcess(String treatmentProcess) {
-        this.treatmentProcess = treatmentProcess;
-    }
-    public String getCurrentDiagnosis() {
-        return currentDiagnosis;
-    }
-
-    public void setCurrentDiagnosis(String currentDiagnosis) {
-        this.currentDiagnosis = currentDiagnosis;
-    }
-    public String getTreatPlan() {
-        return treatPlan;
-    }
-
-    public void setTreatPlan(String treatPlan) {
-        this.treatPlan = treatPlan;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrTransferOutNote{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", transferInDate=" + transferInDate +
-            ", transferOutDept=" + transferOutDept +
-            ", transferInDept=" + transferInDept +
-            ", chief=" + chief +
-            ", behospitalSituation=" + behospitalSituation +
-            ", currentSituation=" + currentSituation +
-            ", tentativeDiagnosis=" + tentativeDiagnosis +
-            ", treatmentProcess=" + treatmentProcess +
-            ", currentDiagnosis=" + currentDiagnosis +
-            ", treatPlan=" + treatPlan +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+    @ApiModelProperty(value = "入院时间")
+    private Date behospitalDate;
+
+    @ApiModelProperty(value = "转科日期")
+    private Date transferDate;
+
+    @ApiModelProperty(value = "用药和其它治疗")
+    private String medication;
+
+    @ApiModelProperty(value = "转科原因")
+    private String transferReason;
+
+    @ApiModelProperty(value = "注意事项")
+    private String note;
+
+    @ApiModelProperty(value = "转运前情况")
+    private String transferInSituation;
+
+    @ApiModelProperty(value = "患者签字")
+    private String patient;
+
+    @ApiModelProperty(value = "患者签字时间")
+    private Date patientTime;
+
+
 }

src/main/java/com/diagbot/entity/StrWardRecord.java

@@ -1,5 +1,14 @@
 package com.diagbot.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,381 +17,102 @@ import java.util.Date;
  * 查房记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-26
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_ward_record")
+@ApiModel(value="StrWardRecord对象", description="查房记录")
 public class StrWardRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private Date recordDate;
 
-    /**
-     * 查房日期
-     */
+    @ApiModelProperty(value = "查房日期")
     private Date wardDate;
 
-    /**
-     * 查房医生
-     */
+    @ApiModelProperty(value = "查房医生")
     private String wardDoctor;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String wardTitle;
 
-    /**
-     * 病情记录
-     */
+    @ApiModelProperty(value = "病情记录")
     private String wardContent;
 
-    /**
-     * S
-     */
+    @ApiModelProperty(value = "S")
     private String wardS;
 
-    /**
-     * O
-     */
+    @ApiModelProperty(value = "O")
     private String wardO;
 
-    /**
-     * A
-     */
+    @ApiModelProperty(value = "A")
     private String wardA;
 
-    /**
-     * P
-     */
+    @ApiModelProperty(value = "P")
     private String wardP;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private Date recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private Date auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
     private String isDeleted;
 
-    /**
-     * 记录创建时间
-     */
+    @ApiModelProperty(value = "记录创建时间")
     private Date gmtCreate;
 
-    /**
-     * 记录修改时间
-     */
+    @ApiModelProperty(value = "记录修改时间")
     private Date gmtModified;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
     private String creator;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
     private String modifier;
 
-    public String getRecId() {
-        return recId;
-    }
-
-    public void setRecId(String recId) {
-        this.recId = recId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-    public String getBedNo() {
-        return bedNo;
-    }
-
-    public void setBedNo(String bedNo) {
-        this.bedNo = bedNo;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-    public Date getRecordDate() {
-        return recordDate;
-    }
-
-    public void setRecordDate(Date recordDate) {
-        this.recordDate = recordDate;
-    }
-    public Date getWardDate() {
-        return wardDate;
-    }
-
-    public void setWardDate(Date wardDate) {
-        this.wardDate = wardDate;
-    }
-    public String getWardDoctor() {
-        return wardDoctor;
-    }
-
-    public void setWardDoctor(String wardDoctor) {
-        this.wardDoctor = wardDoctor;
-    }
-    public String getWardTitle() {
-        return wardTitle;
-    }
-
-    public void setWardTitle(String wardTitle) {
-        this.wardTitle = wardTitle;
-    }
-    public String getWardContent() {
-        return wardContent;
-    }
-
-    public void setWardContent(String wardContent) {
-        this.wardContent = wardContent;
-    }
-    public String getWardS() {
-        return wardS;
-    }
-
-    public void setWardS(String wardS) {
-        this.wardS = wardS;
-    }
-    public String getWardO() {
-        return wardO;
-    }
-
-    public void setWardO(String wardO) {
-        this.wardO = wardO;
-    }
-    public String getWardA() {
-        return wardA;
-    }
-
-    public void setWardA(String wardA) {
-        this.wardA = wardA;
-    }
-    public String getWardP() {
-        return wardP;
-    }
-
-    public void setWardP(String wardP) {
-        this.wardP = wardP;
-    }
-    public String getRecDoctor() {
-        return recDoctor;
-    }
-
-    public void setRecDoctor(String recDoctor) {
-        this.recDoctor = recDoctor;
-    }
-    public Date getRecDate() {
-        return recDate;
-    }
-
-    public void setRecDate(Date recDate) {
-        this.recDate = recDate;
-    }
-    public String getAuditDoctor() {
-        return auditDoctor;
-    }
-
-    public void setAuditDoctor(String auditDoctor) {
-        this.auditDoctor = auditDoctor;
-    }
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-    public String getWholeData() {
-        return wholeData;
-    }
-
-    public void setWholeData(String wholeData) {
-        this.wholeData = wholeData;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "StrWardRecord{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", sex=" + sex +
-            ", recordDate=" + recordDate +
-            ", wardDate=" + wardDate +
-            ", wardDoctor=" + wardDoctor +
-            ", wardTitle=" + wardTitle +
-            ", wardContent=" + wardContent +
-            ", wardS=" + wardS +
-            ", wardO=" + wardO +
-            ", wardA=" + wardA +
-            ", wardP=" + wardP +
-            ", recDoctor=" + recDoctor +
-            ", recDate=" + recDate +
-            ", auditDoctor=" + auditDoctor +
-            ", auditDate=" + auditDate +
-            ", wholeData=" + wholeData +
-            ", remark=" + remark +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
+
 }

src/main/java/com/diagbot/facade/StrConsultationApplyFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrConsultationApply;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrConsultationApplyServiceImpl;
+import com.diagbot.vo.str.StrConsultationApplyVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,32 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrConsultationApplyFacade extends StrConsultationApplyServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrConsultationApplyVO> sendConsultationApplyInfos(StrConsultationApply strConsultationApply) {
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strConsultationApply.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 30)//会诊申请单的病历模版id为30，写死
+                    .eq(MedicalRecord::getRecDate, strConsultationApply.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strConsultationApply.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strConsultationApply);
+            strConsultationApply.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strConsultationApply);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrConsultationResultFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrConsultationResult;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrConsultationResultServiceImpl;
+import com.diagbot.vo.str.StrConsultationResultVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrConsultationResultFacade extends StrConsultationResultServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrConsultationResultVO> sendConsultationResultInfos(StrConsultationResult strConsultationResult) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strConsultationResult.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 31)//会诊结果单的病历模版id为31，写死
+                    .eq(MedicalRecord::getRecDate, strConsultationResult.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strConsultationResult.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strConsultationResult);
+            strConsultationResult.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strConsultationResult);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrCrisisNoteFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrCrisisNote;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrCrisisNoteServiceImpl;
+import com.diagbot.vo.str.StrCrisisNoteVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrCrisisNoteFacade extends StrCrisisNoteServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrCrisisNoteVO> sendCrisisNoteInfos(StrCrisisNote strCrisisNote) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strCrisisNote.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 23)//危急值记录的病历模版id为23，写死
+                    .eq(MedicalRecord::getRecDate, strCrisisNote.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strCrisisNote.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strCrisisNote);
+            strCrisisNote.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strCrisisNote);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrDeathDiscussionFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrDeathDiscussion;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrDeathDiscussionServiceImpl;
+import com.diagbot.vo.str.StrDeathDiscussionVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,32 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrDeathDiscussionFacade extends StrDeathDiscussionServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrDeathDiscussionVO> sendDeathDiscussionInfos(StrDeathDiscussion strDeathDiscussion) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strDeathDiscussion.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 3)//死亡病历讨论记录的病历模版id为3，写死
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strDeathDiscussion.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strDeathDiscussion);
+            strDeathDiscussion.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strDeathDiscussion);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrDeathNoteFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrDeathNote;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrDeathNoteServiceImpl;
+import com.diagbot.vo.str.StrDeathNoteVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,32 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrDeathNoteFacade extends StrDeathNoteServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrDeathNoteVO> sendDeathNoteInfos(StrDeathNote strDeathNote) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strDeathNote.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 24)//死亡记录的病历模版id为24，写死
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strDeathNote.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strDeathNote);
+            strDeathNote.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strDeathNote);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrFirstRecordFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrFirstRecord;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrFirstRecordServiceImpl;
+import com.diagbot.vo.str.StrFirstRecordVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,36 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrFirstRecordFacade extends StrFirstRecordServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    /**
+     * 新增或修改首次病程录基本信息
+     * @param strFirstRecord
+     * @return
+     */
+    public RespDTO<StrFirstRecordVO> sendFirstRecordInfos(StrFirstRecord strFirstRecord){
+        try {
+            //根据病历id和病历模版id查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strFirstRecord.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 2)//首次病程录的病历模版id为2，写死
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strFirstRecord.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strFirstRecord);
+            strFirstRecord.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strFirstRecord);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrIllCriticallyFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrIllCritically;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrIllCriticallyServiceImpl;
+import com.diagbot.vo.str.StrIllCriticallyVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,34 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrIllCriticallyFacade extends StrIllCriticallyServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+
+    public RespDTO<StrIllCriticallyVO> sendIllCriticallyInfos(StrIllCritically strIllCritically) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strIllCritically.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 25)//病危通知书的病历模版id为25，写死
+                    .eq(MedicalRecord::getRecDate, strIllCritically.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strIllCritically.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strIllCritically);
+            strIllCritically.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strIllCritically);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrLeaveHospitalFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrLeaveHospital;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrLeaveHospitalServiceImpl;
+import com.diagbot.vo.str.StrLeaveHospitalVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,32 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrLeaveHospitalFacade extends StrLeaveHospitalServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrLeaveHospitalVO> sendLeaveHospitalInfos(StrLeaveHospital strLeaveHospital) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strLeaveHospital.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 5)//出院小结的病历模版id为5，写死
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strLeaveHospital.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strLeaveHospital);
+            strLeaveHospital.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strLeaveHospital);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrOperativeFirstRecordFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrOperativeFirstRecord;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrOperativeFirstRecordServiceImpl;
+import com.diagbot.vo.str.StrOperativeFirstRecordVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrOperativeFirstRecordFacade extends StrOperativeFirstRecordServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrOperativeFirstRecordVO> sendOperativeFirstRecordInfos(StrOperativeFirstRecord strOperativeFirstRecord) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strOperativeFirstRecord.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 18)//术后首程的病历模版id为18，写死
+                    .eq(MedicalRecord::getRecDate, strOperativeFirstRecord.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strOperativeFirstRecord.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strOperativeFirstRecord);
+            strOperativeFirstRecord.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strOperativeFirstRecord);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrOperativeNoteFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrOperativeNote;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrOperativeNoteServiceImpl;
+import com.diagbot.vo.str.StrOperativeNoteVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrOperativeNoteFacade extends StrOperativeNoteServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrOperativeNoteVO> sendOperativeNoteInfos(StrOperativeNote strOperativeNote) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strOperativeNote.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 17)//手术记录的病历模版id为17，写死
+                    .eq(MedicalRecord::getRecDate, strOperativeNote.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strOperativeNote.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strOperativeNote);
+            strOperativeNote.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strOperativeNote);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrPreoperativeDiscussionFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrPreoperativeDiscussion;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrPreoperativeDiscussionServiceImpl;
+import com.diagbot.vo.str.StrPreoperativeDiscussionVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrPreoperativeDiscussionFacade extends StrPreoperativeDiscussionServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrPreoperativeDiscussionVO> sendPreoperativeDiscussionInfos(StrPreoperativeDiscussion strPreoperativeDiscussion) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strPreoperativeDiscussion.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 11)//术前讨论小结的病历模版id为11，写死
+                    .eq(MedicalRecord::getRecDate, strPreoperativeDiscussion.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strPreoperativeDiscussion.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strPreoperativeDiscussion);
+            strPreoperativeDiscussion.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strPreoperativeDiscussion);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrRescueNoteFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrRescueNote;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrRescueNoteServiceImpl;
+import com.diagbot.vo.str.StrRescueNoteVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrRescueNoteFacade extends StrRescueNoteServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrRescueNoteVO> sendRescueNoteInfos(StrRescueNote strRescueNote) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strRescueNote.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 22)//抢救记录的病历模版id为22，写死
+                    .eq(MedicalRecord::getRecDate, strRescueNote.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strRescueNote.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strRescueNote);
+            strRescueNote.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strRescueNote);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrTransferInNoteFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrTransferInNote;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrTransferInNoteServiceImpl;
+import com.diagbot.vo.str.StrTransferInNoteVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,33 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrTransferInNoteFacade extends StrTransferInNoteServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrTransferInNoteVO> sendTransferInNoteInfos(StrTransferInNote strTransferInNote) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strTransferInNote.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 26)//转入记录的病历模版id为26，写死
+                    .eq(MedicalRecord::getRecDate, strTransferInNote.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strTransferInNote.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strTransferInNote);
+            strTransferInNote.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strTransferInNote);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/facade/StrTransferOutNoteFacade.java

@@ -1,7 +1,16 @@
 package com.diagbot.facade;
 
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrTransferOutNote;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrTransferOutNoteServiceImpl;
+import com.diagbot.vo.str.StrTransferOutNoteVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -11,4 +20,34 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrTransferOutNoteFacade extends StrTransferOutNoteServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrTransferOutNoteVO> sendTransferOutNoteInfos(StrTransferOutNote strTransferOutNote) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strTransferOutNote.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 27)//转出记录的病历模版id为27，写死
+                    .eq(MedicalRecord::getRecDate, strTransferOutNote.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strTransferOutNote.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strTransferOutNote);
+            strTransferOutNote.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strTransferOutNote);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+
+    }
 }

src/main/java/com/diagbot/facade/StrWardRecordFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrWardRecord;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrWardRecordServiceImpl;
+import com.diagbot.vo.str.StrWardRecordVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +19,32 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class StrWardRecordFacade extends StrWardRecordServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrWardRecordVO> sendWardRecordInfos(StrWardRecord strWardRecord) {
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strWardRecord.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 4)//查房记录的病历模版id为4，写死
+                    .eq(MedicalRecord::getRecDate, strWardRecord.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if(medicalRecord == null){
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strWardRecord.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strWardRecord);
+            strWardRecord.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strWardRecord);
+            return saveOrUpdate == true? RespDTO.onSuc("操作正常！") : RespDTO.onError("保存记录失败！");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

src/main/java/com/diagbot/vo/str/StrConsultationApplyVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,149 +13,110 @@ import lombok.Data;
  */
 @Data
 public class StrConsultationApplyVO {
-    /**
-     * 记录编号
-     */
+
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private String behospitalDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 申请科室
-     */
+    @ApiModelProperty(value = "申请科室")
     private String applyDept;
 
-    /**
-     * 申请医生
-     */
+    @ApiModelProperty(value = "申请医生")
     private String applyDoctor;
 
-    /**
-     * 申请日期
-     */
+    @ApiModelProperty(value = "申请日期")
     private String applyDate;
 
-    /**
-     * 会诊类别
-     */
+    @ApiModelProperty(value = "会诊类别")
     private String inviteType;
 
-    /**
-     * 会诊科室
-     */
+    @ApiModelProperty(value = "会诊科室")
     private String inviteDept;
 
-    /**
-     * 会诊医生
-     */
+    @ApiModelProperty(value = "会诊医生")
     private String inviteDoctor;
 
-    /**
-     * 简要病情
-     */
+    @ApiModelProperty(value = "简要病情")
     private String briefNote;
 
-    /**
-     * 当前诊断
-     */
+    @ApiModelProperty(value = "当前诊断")
     private String diagnosis;
 
-    /**
-     * 诊疗情况
-     */
+    @ApiModelProperty(value = "诊疗情况")
     private String treatmentSituation;
 
-    /**
-     * 会诊时间
-     */
+    @ApiModelProperty(value = "会诊时间")
     private String consultationDate;
 
-    /**
-     * 会诊目的
-     */
+    @ApiModelProperty(value = "会诊目的")
     private String consultationPurpose;
 
-    /**
-     * 会诊意见
-     */
+    @ApiModelProperty(value = "会诊意见")
     private String consultationOpinions;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "注意事项")
+    private String notes;
+
 }

src/main/java/com/diagbot/vo/str/StrConsultationResultVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,138 +13,104 @@ import lombok.Data;
  */
 @Data
 public class StrConsultationResultVO{
-    /**
-     * 记录编号
-     */
+
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private String behospitalDate;
 
-    /**
-     * 申请科室
-     */
+    @ApiModelProperty(value = "申请科室")
     private String applyDept;
 
-    /**
-     * 申请医生
-     */
+    @ApiModelProperty(value = "申请医生")
     private String applyDoctor;
 
-    /**
-     * 申请日期
-     */
+    @ApiModelProperty(value = "申请日期")
     private String applyDate;
 
-    /**
-     * 会诊类别
-     */
+    @ApiModelProperty(value = "会诊类别")
     private String inviteType;
 
-    /**
-     * 会诊科室
-     */
+    @ApiModelProperty(value = "会诊科室")
     private String inviteDept;
 
-    /**
-     * 会诊医生
-     */
+    @ApiModelProperty(value = "会诊医生")
     private String inviteDoctor;
 
-    /**
-     * 当前诊断
-     */
+    @ApiModelProperty(value = "当前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 会诊目的
-     */
+    @ApiModelProperty(value = "会诊目的")
     private String consultationPurpose;
 
-    /**
-     * 会诊意见
-     */
+    @ApiModelProperty(value = "会诊意见")
     private String consultationOpinions;
 
-    /**
-     * 会诊到达时间
-     */
+    @ApiModelProperty(value = "会诊到达时间")
     private String consultationArriveDate;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "注意事项")
+    private String note;
+
 }

src/main/java/com/diagbot/vo/str/StrCrisisNoteVO.java

@@ -1,7 +1,10 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * <p>
  * 危急值记录
@@ -12,98 +15,79 @@ import lombok.Data;
  */
 @Data
 public class StrCrisisNoteVO {
-    /**
-     * 记录编号
-     */
+
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 危急值报告
-     */
+    @ApiModelProperty(value = "危急值报告")
     private String crisisNote;
 
-    /**
-     * 病情分析及处理
-     */
+    @ApiModelProperty(value = "病情分析及处理（病因及处理意见）")
     private String briefNote;
 
-    /**
-     * 接收时间
-     */
+    @ApiModelProperty(value = "接收时间")
     private String recieveDate;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "入院日期")
+    private Date behospitalDate;
 }

src/main/java/com/diagbot/vo/str/StrDeathDiscussionVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,138 +14,102 @@ import lombok.Data;
 @Data
 public class StrDeathDiscussionVO{
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 死亡诊断
-     */
+    @ApiModelProperty(value = "死亡诊断")
     private String deathDiagnosis;
 
-    /**
-     * 死亡原因
-     */
+    @ApiModelProperty(value = "死亡原因")
     private String deathReason;
 
-    /**
-     * 死亡时间
-     */
+    @ApiModelProperty(value = "死亡时间")
     private String deathDate;
 
-    /**
-     * 讨论时间
-     */
+    @ApiModelProperty(value = "讨论时间")
     private String discussDate;
 
-    /**
-     * 讨论地点
-     */
+    @ApiModelProperty(value = "讨论地点")
     private String discussPlace;
 
-    /**
-     * 主持人
-     */
-    private String anchor;
+    @ApiModelProperty(value = "主持人姓名及专业技术职务")
+    private String anchorPosition;
 
-    /**
-     * 参加人员
-     */
+    @ApiModelProperty(value = "参加人员")
     private String participant;
 
-    /**
-     * 病史简介
-     */
+    @ApiModelProperty(value = "病史简介")
     private String briefHistory;
 
-    /**
-     * 讨论内容
-     */
+    @ApiModelProperty(value = "讨论内容（具体讨论意见）")
     private String discussionContent;
 
-    /**
-     * 主持人小结
-     */
+    @ApiModelProperty(value = "主持人小结")
     private String anchorConclusion;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "主持人签名")
+    private String anchor;
 }

src/main/java/com/diagbot/vo/str/StrDeathNoteVO.java

@@ -1,5 +1,8 @@
 package com.diagbot.vo.str;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,119 +16,88 @@ import lombok.Data;
 @Data
 public class StrDeathNoteVO{
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private String behospitalDate;
 
-    /**
-     * 死亡日期
-     */
+    @ApiModelProperty(value = "死亡日期")
     private String deathDate;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊疗经过
-     */
+    @ApiModelProperty(value = "诊疗经过")
     private String treatmentProcess;
 
-    /**
-     * 死亡原因
-     */
+    @ApiModelProperty(value = "死亡原因")
     private String deathReason;
 
-    /**
-     * 死亡诊断
-     */
+    @ApiModelProperty(value = "死亡诊断")
     private String deathDiagnosis;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
 }

src/main/java/com/diagbot/vo/str/StrFirstRecordVO.java

@@ -1,7 +1,12 @@
 package com.diagbot.vo.str;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * <p>
  * 首次病程录
@@ -12,133 +17,116 @@ import lombok.Data;
  */
 @Data
 public class StrFirstRecordVO  {
-    /**
-     * 记录编号
-     */
+
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 现病史
-     */
+    @ApiModelProperty(value = "现病史")
     private String present;
 
-    /**
-     * 既往史
-     */
+    @ApiModelProperty(value = "既往史")
     private String pastHistory;
 
-    /**
-     * 查体
-     */
+    @ApiModelProperty(value = "查体")
     private String vital;
 
-    /**
-     * 辅检
-     */
+    @ApiModelProperty(value = "辅检")
     private String assistantExam;
 
-    /**
-     * 病例特点
-     */
+    @ApiModelProperty(value = "病例特点")
     private String caseCharacter;
 
-    /**
-     * 初步诊断
-     */
+    @ApiModelProperty(value = "初步诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊断依据
-     */
+    @ApiModelProperty(value = "诊断依据")
     private String supplyDiagnosis;
 
-    /**
-     * 鉴别诊断
-     */
+    @ApiModelProperty(value = "鉴别诊断")
     private String revisedDiagnosis;
 
-    /**
-     * 诊疗计划(方案)
-     */
+    @ApiModelProperty(value = "诊疗计划(方案)")
     private String treatPlan;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "主诊医生")
+    private String chiefDoctor;
+
+    @ApiModelProperty(value = "发热")
+    private String fever;
+
+    @ApiModelProperty(value = "咳嗽等呼吸道症状")
+    private String coughSymptom;
+
+    @ApiModelProperty(value = "入院时使用的治疗性药物")
+    private String entryMedication;
+
+    @ApiModelProperty(value = "成瘾药物")
+    private String addiMedication;
+
+    @ApiModelProperty(value = "入院时间")
+    private Date behospitalDate;
 }

src/main/java/com/diagbot/vo/str/StrIllCriticallyVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,94 +13,76 @@ import lombok.Data;
  */
 @Data
 public class StrIllCriticallyVO {
-    /**
-     * 记录编号
-     */
+
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 当前诊断
-     */
+    @ApiModelProperty(value = "当前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 病情危重情况
-     */
+    @ApiModelProperty(value = "病情危重情况")
     private String criticalSituation;
 
-    /**
-     * 患者签名
-     */
+    @ApiModelProperty(value = "患者/家属签名")
     private String patientSign;
 
-    /**
-     * 患者签名时间
-     */
+    @ApiModelProperty(value = "患者/家属签名时间")
     private String patientSignDate;
 
-    /**
-     * 医生签名
-     */
+    @ApiModelProperty(value = "医生签名")
     private String doctorSign;
 
-    /**
-     * 医生签名时间
-     */
+    @ApiModelProperty(value = "医生签名时间")
     private String doctorSignDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "记录时间")
+    private String recDate;
 }

src/main/java/com/diagbot/vo/str/StrLeaveHospitalVO.java

@@ -1,5 +1,8 @@
 package com.diagbot.vo.str;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,133 +16,145 @@ import lombok.Data;
 @Data
 public class StrLeaveHospitalVO {
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private String behospitalDate;
 
-    /**
-     * 出院日期
-     */
+    @ApiModelProperty(value = "出院日期")
     private String leaveHospitalDate;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 出院诊断
-     */
+    @ApiModelProperty(value = "出院诊断")
     private String leaveDiagnosis;
 
-    /**
-     * 住院天数
-     */
+    @ApiModelProperty(value = "住院天数")
     private String behospitalDayNum;
 
-    /**
-     * 入院原因
-     */
+    @ApiModelProperty(value = "入院原因")
     private String behospitalReason;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 诊治经过
-     */
+    @ApiModelProperty(value = "诊治经过")
     private String treatmentProcess;
 
-    /**
-     * 出院情况
-     */
+    @ApiModelProperty(value = "出院情况")
     private String leaveHospitalSituation;
 
-    /**
-     * 出院医嘱
-     */
+    @ApiModelProperty(value = "出院医嘱")
     private String leaveHospitalDoctoradvice;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "主诊医生")
+    private String chiefDoctor;
+
+    @ApiModelProperty(value = "出院诊断（中医）")
+    private String leaveDiagnosisCh;
+
+    @ApiModelProperty(value = "出院状态")
+    private String leaveHospitalCondition;
+
+    @ApiModelProperty(value = "出院去向")
+    private String leaveHospitalDisposition;
+
+    @ApiModelProperty(value = "出院带药")
+    private String leaveHospitalMedication;
+
+    @ApiModelProperty(value = "食物药物相互作用指导")
+    private String foodMedicationAdvice;
+
+    @ApiModelProperty(value = "饮食指导")
+    private String foodAdvice;
+
+    @ApiModelProperty(value = "特殊饮食指导")
+    private String foodAdviceSpecial;
+
+    @ApiModelProperty(value = "植入物指导")
+    private String implantAdvice;
+
+    @ApiModelProperty(value = "其他指导")
+    private String otherAdvice;
+
+    @ApiModelProperty(value = "复诊时间")
+    private String followDateRecord;
+
+    @ApiModelProperty(value = "复诊地点")
+    private String followPlace;
+
+    @ApiModelProperty(value = "复诊目的")
+    private String followPurpose;
+
+    @ApiModelProperty(value = "复诊科室")
+    private String followDept;
+
+    @ApiModelProperty(value = "NRS2002评分")
+    private String followScore;
+
+    @ApiModelProperty(value = "复诊紧急就医")
+    private String followEmergency;
 }

src/main/java/com/diagbot/vo/str/StrOperativeFirstRecordVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,174 +14,127 @@ import lombok.Data;
 @Data
 public class StrOperativeFirstRecordVO {
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 手术日期
-     */
+    @ApiModelProperty(value = "手术日期")
     private String operationDate;
 
-    /**
-     * 开始时间
-     */
+    @ApiModelProperty(value = "开始时间")
     private String startTime;
 
-    /**
-     * 结束时间
-     */
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
 
-    /**
-     * 麻醉方式
-     */
+    @ApiModelProperty(value = "麻醉方式")
     private String narcosisType;
 
-    /**
-     * 麻醉医师
-     */
+    @ApiModelProperty(value = "麻醉医师")
     private String narcosisDoctor;
 
-    /**
-     * 术前诊断
-     */
+    @ApiModelProperty(value = "术前诊断")
     private String preoperationDiagnosis;
 
-    /**
-     * 术（中）后诊断
-     */
+    @ApiModelProperty(value = "术（中）后诊断")
     private String postoperativeDiagnosis;
 
-    /**
-     * 手术人员
-     */
+    @ApiModelProperty(value = "手术人员")
     private String operationMan;
 
-    /**
-     * 手术名称方式
-     */
+    @ApiModelProperty(value = "手术名称方式")
     private String operationName;
 
-    /**
-     * 手术简要经过
-     */
+    @ApiModelProperty(value = "手术简要经过")
     private String operationProcess;
 
-    /**
-     * 患者术后情况
-     */
+    @ApiModelProperty(value = "患者术后情况（病人出手术室时一般情况）")
     private String postoperativeSituation;
 
-    /**
-     * 术后处理措施
-     */
+    @ApiModelProperty(value = "术后处理措施")
     private String postoperativeTreatment;
 
-    /**
-     * 术后注意事项
-     */
+    @ApiModelProperty(value = "术后注意事项")
     private String postoperativeNotice;
 
-    /**
-     * 术后可能出现的并发症及预防措施
-     */
+    @ApiModelProperty(value = "术后可能出现的并发症及预防措施")
     private String postoperativeComplication;
 
-    /**
-     * 手术切除标本
-     */
+    @ApiModelProperty(value = "手术切除标本")
     private String operationSpecimen;
 
-    /**
-     * 术中出血量
-     */
+    @ApiModelProperty(value = "术中出血量")
     private String operationBleed;
 
-    /**
-     * 术中输血量
-     */
+    @ApiModelProperty(value = "术中输血量")
     private String operationBloodTransfusion;
 
-    /**
-     * 术中并发症
-     */
+    @ApiModelProperty(value = "术中并发症")
     private String operationComplication;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "主刀医生")
+    private String chiefDoctor;
+
+    @ApiModelProperty(value = "患者/家属签名")
+    private String patientSign;
+
 }

src/main/java/com/diagbot/vo/str/StrOperativeNoteVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,178 +14,147 @@ import lombok.Data;
 @Data
 public class StrOperativeNoteVO  {
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 手术日期
-     */
+    @ApiModelProperty(value = "手术日期")
     private String operationDate;
 
-    /**
-     * 开始时间
-     */
+    @ApiModelProperty(value = "开始时间")
     private String startTime;
 
-    /**
-     * 结束时间
-     */
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
 
-    /**
-     * 术前诊断
-     */
+    @ApiModelProperty(value = "术前诊断")
     private String preoperationDiagnosis;
 
-    /**
-     * 手术名称
-     */
+    @ApiModelProperty(value = "手术名称")
     private String operationName;
 
-    /**
-     * 术（中）后诊断
-     */
+    @ApiModelProperty(value = "术（中）后诊断")
     private String postoperativeDiagnosis;
 
-    /**
-     * 主刀医师
-     */
+    @ApiModelProperty(value = "主刀医师")
     private String operationSurgeon;
 
-    /**
-     * 一助
-     */
+    @ApiModelProperty(value = "一助")
     private String firstHelping;
 
-    /**
-     * 二助
-     */
+    @ApiModelProperty(value = "二助")
     private String secondHelping;
 
-    /**
-     * 麻醉医师
-     */
+    @ApiModelProperty(value = "麻醉医师")
     private String narcosisDoctor;
 
-    /**
-     * 麻醉方式
-     */
+    @ApiModelProperty(value = "麻醉方式")
     private String narcosisType;
 
-    /**
-     * 切口类别
-     */
+    @ApiModelProperty(value = "切口类别")
     private String cutType;
 
-    /**
-     * 病理诊断
-     */
+    @ApiModelProperty(value = "病理（冰冻）诊断")
     private String pathologicalDiagnosis;
 
-    /**
-     * 是否术中植入物
-     */
+    @ApiModelProperty(value = "是否术中植入物")
     private String isImplants;
 
-    /**
-     * 植入物名称
-     */
+    @ApiModelProperty(value = "植入物名称")
     private String implantsName;
 
-    /**
-     * 出血
-     */
+    @ApiModelProperty(value = "出血")
     private String bloodLoss;
 
-    /**
-     * 术中所见
-     */
+    @ApiModelProperty(value = "术中所见")
     private String intraoperativeView;
 
-    /**
-     * 术后注意事项
-     */
+    @ApiModelProperty(value = "术后注意事项")
     private String postoperativeNotice;
 
-    /**
-     * 手术经过及处理
-     */
+    @ApiModelProperty(value = "手术经过及处理")
     private String operationProcess;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "入院时间")
+    private String behospitalDate;
+
+    @ApiModelProperty(value = "手术时数")
+    private String operationTime;
+
+    @ApiModelProperty(value = "处理标本")
+    private String specimen;
+
+    @ApiModelProperty(value = "输血情况")
+    private String transfusion;
+
+    @ApiModelProperty(value = "红细胞")
+    private String redBlood;
+
+    @ApiModelProperty(value = "血小板")
+    private String platelet;
+
+    @ApiModelProperty(value = "血浆")
+    private String Plasma;
+
+    @ApiModelProperty(value = "全血")
+    private String wholeBlood;
 }

src/main/java/com/diagbot/vo/str/StrPreoperativeDiscussionVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,149 +14,112 @@ import lombok.Data;
 @Data
 public class StrPreoperativeDiscussionVO {
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 讨论时间
-     */
+    @ApiModelProperty(value = "讨论时间")
     private String discussTime;
 
-    /**
-     * 讨论方式
-     */
+    @ApiModelProperty(value = "讨论方式")
     private String discussType;
 
-    /**
-     * 参加人员
-     */
+    @ApiModelProperty(value = "参加人员")
     private String participant;
 
-    /**
-     * 简要病情
-     */
+    @ApiModelProperty(value = "简要病情")
     private String briefNote;
 
-    /**
-     * 术前诊断
-     */
+    @ApiModelProperty(value = "术前诊断")
     private String preoperationDiagnosis;
 
-    /**
-     * 手术指征与禁忌
-     */
+    @ApiModelProperty(value = "手术指征与禁忌")
     private String operationIndication;
 
-    /**
-     * 可替代的方案
-     */
+    @ApiModelProperty(value = "可替代的方案")
     private String replacePlan;
 
-    /**
-     * 拟施手术方式、名称及可能的变更与禁忌症
-     */
+    @ApiModelProperty(value = "拟施手术方式、名称及可能的变更与禁忌症")
     private String operationName;
 
-    /**
-     * 拟施麻醉方式
-     */
+    @ApiModelProperty(value = "拟施麻醉方式")
     private String anesthesiaType;
 
-    /**
-     * 术前准备
-     */
+    @ApiModelProperty(value = "术前准备")
     private String preoperationPrepare;
 
-    /**
-     * 主要术中、术后风险及防范措施
-     */
+    @ApiModelProperty(value = "主要术中、术后风险及防范措施")
     private String intraoperativeRisk;
 
-    /**
-     * 术中注意事项
-     */
+    @ApiModelProperty(value = "术中注意事项")
     private String intraoperativeNotice;
 
-    /**
-     * 术后注意事项
-     */
+    @ApiModelProperty(value = "术后注意事项")
     private String postoperativeNotice;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "入院时间")
+    private String behospitalDate;
+
+    @ApiModelProperty(value = "可能出现的问题和对策")
+    private String potentialIssues;
+
 }

src/main/java/com/diagbot/vo/str/StrRescueNoteVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,109 +14,82 @@ import lombok.Data;
 @Data
 public class StrRescueNoteVO {
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 开始时间
-     */
+    @ApiModelProperty(value = "开始时间")
     private String startTime;
 
-    /**
-     * 结束时间
-     */
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
 
-    /**
-     * 简要病情
-     */
+    @ApiModelProperty(value = "简要病情")
     private String briefNote;
 
-    /**
-     * 抢救措施
-     */
+    @ApiModelProperty(value = "抢救措施")
     private String resuscitation;
 
-    /**
-     * 参加抢救的医务人员姓名及专业技术职称
-     */
+    @ApiModelProperty(value = "参加抢救的医务人员姓名及专业技术职称")
     private String rescueMan;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
 }

src/main/java/com/diagbot/vo/str/StrTransferInNoteVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,134 +14,112 @@ import lombok.Data;
 @Data
 public class StrTransferInNoteVO {
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 转入日期
-     */
+    @ApiModelProperty(value = "转入日期")
     private String transferInDate;
 
-    /**
-     * 转出科室
-     */
+    @ApiModelProperty(value = "转出科室")
     private String transferOutDept;
 
-    /**
-     * 转入科室
-     */
+    @ApiModelProperty(value = "转入科室")
     private String transferInDept;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 目前病情
-     */
+    @ApiModelProperty(value = "目前病情")
     private String currentSituation;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊疗经过
-     */
+    @ApiModelProperty(value = "诊疗经过")
     private String treatmentProcess;
 
-    /**
-     * 目前诊断
-     */
+    @ApiModelProperty(value = "目前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 转入诊疗计划
-     */
+    @ApiModelProperty(value = "转入诊疗计划")
     private String treatPlan;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "入院日期")
+    private String behospitalDate;
+
+    @ApiModelProperty(value = "转科日期")
+    private String transferDate;
+
+    @ApiModelProperty(value = "接科情况")
+    private String transferInSituation;
+
+    @ApiModelProperty(value = "患者签字")
+    private String patientSign;
+
+    @ApiModelProperty(value = "患者签字时间")
+    private String patientTime;
+
 }

src/main/java/com/diagbot/vo/str/StrTransferOutNoteVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,134 +14,122 @@ import lombok.Data;
 @Data
 public class StrTransferOutNoteVO {
 
-    /**
-     * 记录编号
-     */
+    @ApiModelProperty(value = "记录编号")
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String recTitle;
 
-    /**
-     * 转入日期
-     */
+    @ApiModelProperty(value = "转入日期")
     private String transferInDate;
 
-    /**
-     * 转出科室
-     */
+    @ApiModelProperty(value = "转出科室")
     private String transferOutDept;
 
-    /**
-     * 转入科室
-     */
+    @ApiModelProperty(value = "转入科室")
     private String transferInDept;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 目前病情
-     */
+    @ApiModelProperty(value = "目前病情")
     private String currentSituation;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊疗经过
-     */
+    @ApiModelProperty(value = "诊疗经过")
     private String treatmentProcess;
 
-    /**
-     * 目前诊断
-     */
+    @ApiModelProperty(value = "目前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 转入诊疗计划
-     */
+    @ApiModelProperty(value = "转入诊疗计划")
     private String treatPlan;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
+    @ApiModelProperty(value = "入院时间")
+    private String behospitalDate;
+
+    @ApiModelProperty(value = "转科日期")
+    private String transferDate;
+
+    @ApiModelProperty(value = "用药和其它治疗")
+    private String medication;
+
+    @ApiModelProperty(value = "转科原因")
+    private String transferReason;
+
+    @ApiModelProperty(value = "注意事项")
+    private String note;
+
+    @ApiModelProperty(value = "转运前情况")
+    private String transferInSituation;
+
+    @ApiModelProperty(value = "患者签字")
+    private String patient;
+
+    @ApiModelProperty(value = "患者签字时间")
+    private String patientTime;
+
+
 }

src/main/java/com/diagbot/vo/str/StrWardRecordVO.java

@@ -1,5 +1,8 @@
 package com.diagbot.vo.str;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,119 +15,90 @@ import lombok.Data;
  */
 @Data
 public class StrWardRecordVO  {
-    /**
-     * 记录编号
-     */
+
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
-    /**
-     * 医院ID
-     */
+    @ApiModelProperty(value = "医院ID")
     private Long hospitalId;
 
-    /**
-     * 病历号
-     */
+    @ApiModelProperty(value = "病历号")
     private String behospitalCode;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty(value = "姓名")
     private String name;
 
-    /**
-     * 年龄
-     */
+    @ApiModelProperty(value = "年龄")
     private String age;
 
-    /**
-     * 床号
-     */
+    @ApiModelProperty(value = "床号")
     private String bedNo;
 
-    /**
-     * 科别
-     */
+    @ApiModelProperty(value = "科别")
     private String deptName;
 
-    /**
-     * 性别
-     */
+    @ApiModelProperty(value = "性别")
     private String sex;
 
-    /**
-     * 病历日期
-     */
+    @ApiModelProperty(value = "病历日期")
     private String recordDate;
 
-    /**
-     * 查房日期
-     */
+    @ApiModelProperty(value = "查房日期")
     private String wardDate;
 
-    /**
-     * 查房医生
-     */
+    @ApiModelProperty(value = "查房医生")
     private String wardDoctor;
 
-    /**
-     * 标题
-     */
+    @ApiModelProperty(value = "标题")
     private String wardTitle;
 
-    /**
-     * 病情记录
-     */
+    @ApiModelProperty(value = "病情记录")
     private String wardContent;
 
-    /**
-     * S
-     */
+    @ApiModelProperty(value = "S")
     private String wardS;
 
-    /**
-     * O
-     */
+    @ApiModelProperty(value = "O")
     private String wardO;
 
-    /**
-     * A
-     */
+    @ApiModelProperty(value = "A")
     private String wardA;
 
-    /**
-     * P
-     */
+    @ApiModelProperty(value = "P")
     private String wardP;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 结构化数据
-     */
+    @ApiModelProperty(value = "结构化数据")
     private String wholeData;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "是否删除")
+    private String isDeleted;
+
+    @ApiModelProperty(value = "记录创建时间")
+    private String gmtCreate;
+
+    @ApiModelProperty(value = "记录修改时间")
+    private String gmtModified;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "修改人")
+    private String modifier;
+
 }

src/main/java/com/diagbot/web/StrConsultationApplyController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrConsultationApply;
+import com.diagbot.facade.StrConsultationApplyFacade;
+import com.diagbot.vo.str.StrConsultationApplyVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strConsultationApply")
+@RestController
+@RequestMapping("/str/ConsultationApply")
+@Api(value = "会诊申请单相关API", tags = { "会诊申请单相关API" })
 public class StrConsultationApplyController {
 
+    @Autowired
+    private StrConsultationApplyFacade strConsultationApplyFacade;
+
+    @ApiOperation("新增或修改会诊申请单基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrConsultationApplyVO> sendConsultationApplyInfos(@RequestBody StrConsultationApply strConsultationApply){
+        return strConsultationApplyFacade.sendConsultationApplyInfos(strConsultationApply);
+    }
+
 }

src/main/java/com/diagbot/web/StrConsultationResultController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrConsultationResult;
+import com.diagbot.facade.StrConsultationResultFacade;
+import com.diagbot.vo.str.StrConsultationResultVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,18 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strConsultationResult")
+@RestController
+@RequestMapping("/str/ConsultationResult")
+@Api(value = "会诊结果单相关API", tags = { "会诊结果单相关API" })
 public class StrConsultationResultController {
 
+    @Autowired
+    private StrConsultationResultFacade strConsultationResultFacade;
+
+    @ApiOperation("新增或修改会诊结果单基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrConsultationResultVO> sendConsultationResultInfos(@RequestBody StrConsultationResult strConsultationResult){
+        return strConsultationResultFacade.sendConsultationResultInfos(strConsultationResult);
+    }
 }

src/main/java/com/diagbot/web/StrCrisisNoteController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrCrisisNote;
+import com.diagbot.facade.StrCrisisNoteFacade;
+import com.diagbot.vo.str.StrCrisisNoteVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strCrisisNote")
+@RestController
+@RequestMapping("/str/CrisisNote")
+@Api(value = "危急值记录相关API", tags = { "危急值记录相关API" })
 public class StrCrisisNoteController {
 
+    @Autowired
+    private StrCrisisNoteFacade strCrisisNoteFacade;
+
+    @ApiOperation("新增或修改危急值记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrCrisisNoteVO> sendCrisisNoteInfos(@RequestBody StrCrisisNote strCrisisNote){
+        return strCrisisNoteFacade.sendCrisisNoteInfos(strCrisisNote);
+    }
+
 }

src/main/java/com/diagbot/web/StrDeathDiscussionController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrDeathDiscussion;
+import com.diagbot.facade.StrDeathDiscussionFacade;
+import com.diagbot.vo.str.StrDeathDiscussionVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,18 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strDeathDiscussion")
+@RestController
+@RequestMapping("/str/DeathDiscussion")
+@Api(value = "死亡病历讨论记录相关API", tags = { "死亡病历讨论记录相关API" })
 public class StrDeathDiscussionController {
 
+    @Autowired
+    private StrDeathDiscussionFacade strDeathDiscussionFacade;
+
+    @ApiOperation("新增或修改死亡病历讨论记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrDeathDiscussionVO> sendDeathDiscussionInfos(@RequestBody StrDeathDiscussion strDeathDiscussion){
+        return strDeathDiscussionFacade.sendDeathDiscussionInfos(strDeathDiscussion);
+    }
 }

src/main/java/com/diagbot/web/StrDeathNoteController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrDeathNote;
+import com.diagbot.facade.StrDeathNoteFacade;
+import com.diagbot.vo.str.StrDeathNoteVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strDeathNote")
+@RestController
+@RequestMapping("/str/DeathNote")
+@Api(value = "死亡记录相关API", tags = { "死亡记录相关API" })
 public class StrDeathNoteController {
 
+    @Autowired
+    private StrDeathNoteFacade strDeathNoteFacade;
+
+    @ApiOperation("新增或修改死亡记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrDeathNoteVO> sendDeathNoteInfos(@RequestBody StrDeathNote strDeathNote){
+        return strDeathNoteFacade.sendDeathNoteInfos(strDeathNote);
+    }
+
 }

src/main/java/com/diagbot/web/StrFirstRecordController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrFirstRecord;
+import com.diagbot.facade.StrFirstRecordFacade;
+import com.diagbot.vo.str.StrFirstRecordVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,18 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strFirstRecord")
+@RestController
+@RequestMapping("/str/FirstRecord")
+@Api(value = "首次病程录相关API", tags = { "首次病程录相关API" })
 public class StrFirstRecordController {
 
+    @Autowired
+    StrFirstRecordFacade strFirstRecordFacade;
+
+    @ApiOperation("新增或修改首次病程录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrFirstRecordVO> sendFirstRecordInfos(@RequestBody StrFirstRecord strFirstRecord) {
+        return strFirstRecordFacade.sendFirstRecordInfos(strFirstRecord);
+    }
 }

src/main/java/com/diagbot/web/StrIllCriticallyController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrIllCritically;
+import com.diagbot.facade.StrIllCriticallyFacade;
+import com.diagbot.vo.str.StrIllCriticallyVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strIllCritically")
+@RestController
+@RequestMapping("/str/IllCritically")
+@Api(value = "病危通知书相关API", tags = { "病危通知书相关API" })
 public class StrIllCriticallyController {
 
+    @Autowired
+    private StrIllCriticallyFacade strIllCriticallyFacade;
+
+    @ApiOperation("新增或修改病危通知书基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrIllCriticallyVO> sendIllCriticallyInfos(@RequestBody StrIllCritically strIllCritically){
+        return strIllCriticallyFacade.sendIllCriticallyInfos(strIllCritically);
+    }
+
 }

src/main/java/com/diagbot/web/StrLeaveHospitalController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrLeaveHospital;
+import com.diagbot.facade.StrLeaveHospitalFacade;
+import com.diagbot.vo.str.StrLeaveHospitalVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strLeaveHospital")
+@RestController
+@RequestMapping("/str/LeaveHospital")
+@Api(value = "出院小结相关API", tags = { "出院小结相关API" })
 public class StrLeaveHospitalController {
 
+    @Autowired
+    private StrLeaveHospitalFacade strLeaveHospitalFacade;
+
+    @ApiOperation("新增或修改出院小结基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrLeaveHospitalVO> sendLeaveHospitalInfos(@RequestBody StrLeaveHospital strLeaveHospital){
+        return strLeaveHospitalFacade.sendLeaveHospitalInfos(strLeaveHospital);
+    }
+
 }

src/main/java/com/diagbot/web/StrOperativeFirstRecordController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrOperativeFirstRecord;
+import com.diagbot.facade.StrOperativeFirstRecordFacade;
+import com.diagbot.vo.str.StrOperativeFirstRecordVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,18 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strOperativeFirstRecord")
+@RestController
+@RequestMapping("/str/OperativeFirstRecord")
+@Api(value = "术后首程相关API", tags = { "术后首程相关API" })
 public class StrOperativeFirstRecordController {
 
+    @Autowired
+    private StrOperativeFirstRecordFacade strOperativeFirstRecordFacade;
+
+    @ApiOperation("新增或修改术后首程基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrOperativeFirstRecordVO> sendOperativeFirstRecordInfos(@RequestBody StrOperativeFirstRecord strOperativeFirstRecord){
+        return strOperativeFirstRecordFacade.sendOperativeFirstRecordInfos(strOperativeFirstRecord);
+    }
 }

src/main/java/com/diagbot/web/StrOperativeNoteController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrOperativeNote;
+import com.diagbot.facade.StrOperativeNoteFacade;
+import com.diagbot.vo.str.StrOperativeNoteVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,18 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strOperativeNote")
+@RestController
+@RequestMapping("/str/OperativeNote")
+@Api(value = "手术记录相关API", tags = { "手术记录相关API" })
 public class StrOperativeNoteController {
 
+    @Autowired
+    private StrOperativeNoteFacade strOperativeNoteFacade;
+
+    @ApiOperation("新增或修改手术记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrOperativeNoteVO> sendOperativeNoteInfos(@RequestBody StrOperativeNote strOperativeNote){
+        return strOperativeNoteFacade.sendOperativeNoteInfos(strOperativeNote);
+    }
 }

src/main/java/com/diagbot/web/StrPreoperativeDiscussionController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrPreoperativeDiscussion;
+import com.diagbot.facade.StrPreoperativeDiscussionFacade;
+import com.diagbot.vo.str.StrPreoperativeDiscussionVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strPreoperativeDiscussion")
+@RestController
+@RequestMapping("/str/PreoperativeDiscussion")
+@Api(value = "术前讨论小结相关API", tags = { "术前讨论小结首程相关API" })
 public class StrPreoperativeDiscussionController {
 
+    @Autowired
+    private StrPreoperativeDiscussionFacade strPreoperativeDiscussionFacade;
+
+    @ApiOperation("新增或修改术前讨论小结基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrPreoperativeDiscussionVO> sendPreoperativeDiscussionInfos(@RequestBody StrPreoperativeDiscussion strPreoperativeDiscussion){
+        return strPreoperativeDiscussionFacade.sendPreoperativeDiscussionInfos(strPreoperativeDiscussion);
+    }
+
 }

src/main/java/com/diagbot/web/StrRescueNoteController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrRescueNote;
+import com.diagbot.facade.StrRescueNoteFacade;
+import com.diagbot.vo.str.StrRescueNoteVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strRescueNote")
+@RestController
+@RequestMapping("/str/RescueNote")
+@Api(value = "抢救记录相关API", tags = { "抢救记录相关API" })
 public class StrRescueNoteController {
 
+    @Autowired
+    private StrRescueNoteFacade strRescueNoteFacade;
+
+    @ApiOperation("新增或修改抢救记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrRescueNoteVO> sendRescueNoteInfos(@RequestBody StrRescueNote strRescueNote){
+        return strRescueNoteFacade.sendRescueNoteInfos(strRescueNote);
+    }
+
 }

src/main/java/com/diagbot/web/StrTransferInNoteController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrTransferInNote;
+import com.diagbot.facade.StrTransferInNoteFacade;
+import com.diagbot.vo.str.StrTransferInNoteVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strTransferInNote")
+@RestController
+@RequestMapping("/str/TransferInNote")
+@Api(value = "转入记录相关API", tags = { "转入记录相关API" })
 public class StrTransferInNoteController {
 
+    @Autowired
+    private StrTransferInNoteFacade strTransferInNoteFacade;
+
+    @ApiOperation("新增或修改转入记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrTransferInNoteVO> sendTransferInNoteInfos(@RequestBody StrTransferInNote strTransferInNote){
+        return strTransferInNoteFacade.sendTransferInNoteInfos(strTransferInNote);
+    }
+
 }

src/main/java/com/diagbot/web/StrTransferOutNoteController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrTransferOutNote;
+import com.diagbot.facade.StrTransferOutNoteFacade;
+import com.diagbot.vo.str.StrTransferOutNoteVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strTransferOutNote")
+@RestController
+@RequestMapping("/str/TransferOutNote")
+@Api(value = "转出记录相关API", tags = { "转出记录相关API" })
 public class StrTransferOutNoteController {
 
+    @Autowired
+    private StrTransferOutNoteFacade strTransferOutNoteFacade;
+
+    @ApiOperation("新增或修改转出记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrTransferOutNoteVO> sendTransferOutNoteInfos(@RequestBody StrTransferOutNote strTransferOutNote){
+        return strTransferOutNoteFacade.sendTransferOutNoteInfos(strTransferOutNote);
+    }
+
 }

src/main/java/com/diagbot/web/StrWardRecordController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrWardRecord;
+import com.diagbot.facade.StrWardRecordFacade;
+import com.diagbot.vo.str.StrWardRecordVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -13,8 +22,19 @@ import org.springframework.stereotype.Controller;
  * @author cy
  * @since 2020-09-22
  */
-@Controller
-@RequestMapping("/strWardRecord")
+@RestController
+@RequestMapping("/str/WardRecord")
+@Api(value = "查房记录相关API", tags = { "查房记录相关API" })
 public class StrWardRecordController {
 
+    @Autowired
+    private StrWardRecordFacade strWardRecordFacade;
+
+    @ApiOperation("新增或修改查房记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrWardRecordVO> sendWardRecordInfos(@RequestBody StrWardRecord strWardRecord){
+        return strWardRecordFacade.sendWardRecordInfos(strWardRecord);
+    }
+
 }