Parcourir la source

可编辑后端剩余接口

xiewei il y a 8 mois
Parent
commit
870000c209
31 fichiers modifiés avec 1636 ajouts et 2324 suppressions
  1. 6 1
      src/main/java/com/diagbot/config/ResourceServerConfigurer.java
  2. 6 1
      src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java
  3. 222 668
      src/main/java/com/diagbot/entity/StrAdmissionNote.java
  4. 56 294
      src/main/java/com/diagbot/entity/StrBloodTransfusion.java
  5. 68 327
      src/main/java/com/diagbot/entity/StrDifficultCase.java
  6. 40 260
      src/main/java/com/diagbot/entity/StrIllSeriousl.java
  7. 157 0
      src/main/java/com/diagbot/entity/StrInvasiveOperativeNote.java
  8. 50 327
      src/main/java/com/diagbot/entity/StrPeriodConclusion.java
  9. 37 0
      src/main/java/com/diagbot/facade/StrAdmissionNoteFacade.java
  10. 38 0
      src/main/java/com/diagbot/facade/StrBloodResultFacade.java
  11. 38 0
      src/main/java/com/diagbot/facade/StrDifficultCaseFacade.java
  12. 37 0
      src/main/java/com/diagbot/facade/StrIllSeriouslFacade.java
  13. 51 0
      src/main/java/com/diagbot/facade/StrInvasiveOperativeNoteFacade.java
  14. 38 0
      src/main/java/com/diagbot/facade/StrPeriodConclusionFacade.java
  15. 16 0
      src/main/java/com/diagbot/mapper/StrInvasiveOperativeNoteMapper.java
  16. 16 0
      src/main/java/com/diagbot/service/IStrDifficultCaseService.java
  17. 16 0
      src/main/java/com/diagbot/service/IStrInvasiveOperativeNoteService.java
  18. 20 0
      src/main/java/com/diagbot/service/impl/StrInvasiveOperativeNoteServiceImpl.java
  19. 215 165
      src/main/java/com/diagbot/vo/str/StrAdmissionNoteVO.java
  20. 49 63
      src/main/java/com/diagbot/vo/str/StrBloodTransfusionVO.java
  21. 62 72
      src/main/java/com/diagbot/vo/str/StrDifficultCaseVO.java
  22. 34 54
      src/main/java/com/diagbot/vo/str/StrIllSeriouslVO.java
  23. 153 0
      src/main/java/com/diagbot/vo/str/StrInvasiveOperativeNoteVO.java
  24. 46 72
      src/main/java/com/diagbot/vo/str/StrPeriodConclusionVO.java
  25. 24 4
      src/main/java/com/diagbot/web/StrAdmissionNoteController.java
  26. 24 4
      src/main/java/com/diagbot/web/StrBloodResultController.java
  27. 24 4
      src/main/java/com/diagbot/web/StrDifficultCaseController.java
  28. 24 4
      src/main/java/com/diagbot/web/StrIllSeriouslController.java
  29. 40 0
      src/main/java/com/diagbot/web/StrInvasiveOperativeNoteController.java
  30. 24 4
      src/main/java/com/diagbot/web/StrPeriodConclusionController.java
  31. 5 0
      src/main/resources/mapper/StrInvasiveOperativeNoteMapper.xml

+ 6 - 1
src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -289,7 +289,7 @@ 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/FirstRecord/infos").permitAll()
                 .antMatchers("/str/WardRecord/infos").permitAll()
                 .antMatchers("/str/ConsultationApply/infos").permitAll()
                 .antMatchers("/str/ConsultationResult/infos").permitAll()
@@ -304,6 +304,11 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/str/RescueNote/infos").permitAll()
                 .antMatchers("/str/TransferOutNote/infos").permitAll()
                 .antMatchers("/str/TransferInNote/infos").permitAll()
+                .antMatchers("/str/AdmissionNote/infos").permitAll()
+                .antMatchers("/str/DifficultCase/infos").permitAll()
+                .antMatchers("/str/BloodResult/infos").permitAll()
+                .antMatchers("/str/PeriodConclusion/infos").permitAll()
+//                .antMatchers("/str/IllSeriousl/infos").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

+ 6 - 1
src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -387,7 +387,7 @@ 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/FirstRecord/infos", request)
                 || matchers("/str/WardRecord/infos", request)
                 || matchers("/str/ConsultationApply/infos", request)
                 || matchers("/str/ConsultationResult/infos", request)
@@ -402,6 +402,11 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/str/RescueNote/infos", request)
                 || matchers("/str/TransferOutNote/infos", request)
                 || matchers("/str/TransferInNote/infos", request)
+                || matchers("/str/AdmissionNote/infos", request)
+                || matchers("/str/DifficultCase/infos", request)
+                || matchers("/str/BloodResult/infos", request)
+                || matchers("/str/PeriodConclusion/infos", request)
+//                || matchers("/str/IllSeriousl/infos", request)
                 || matchers("/", request)) {
             return true;
         }

Fichier diff supprimé car celui-ci est trop grand
+ 222 - 668
src/main/java/com/diagbot/entity/StrAdmissionNote.java


+ 56 - 294
src/main/java/com/diagbot/entity/StrBloodTransfusion.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,108 @@ import java.util.Date;
  * 输血记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-30
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_blood_transfusion")
+@ApiModel(value="StrBloodTransfusion对象", description="输血记录")
 public class StrBloodTransfusion 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 transfusionReason;
 
-    /**
-     * 输注种类、血型、数量
-     */
+    @ApiModelProperty(value = "输注种类、血型、数量")
     private String transfusionType;
 
-    /**
-     * 输注过程
-     */
+    @ApiModelProperty(value = "输注过程")
     private String transfusionProcess;
 
-    /**
-     * 记录医生
-     */
+    @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 getTransfusionReason() {
-        return transfusionReason;
-    }
-
-    public void setTransfusionReason(String transfusionReason) {
-        this.transfusionReason = transfusionReason;
-    }
-    public String getTransfusionType() {
-        return transfusionType;
-    }
-
-    public void setTransfusionType(String transfusionType) {
-        this.transfusionType = transfusionType;
-    }
-    public String getTransfusionProcess() {
-        return transfusionProcess;
-    }
-
-    public void setTransfusionProcess(String transfusionProcess) {
-        this.transfusionProcess = transfusionProcess;
-    }
-    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 "StrBloodTransfusion{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", startTime=" + startTime +
-            ", endTime=" + endTime +
-            ", transfusionReason=" + transfusionReason +
-            ", transfusionType=" + transfusionType +
-            ", transfusionProcess=" + transfusionProcess +
-            ", 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 preventiveMeasures;
+
+    @ApiModelProperty(value = "输血后生命体征变化")
+    private String vitalSigns;
+
+    @ApiModelProperty(value = "输注后效果评价")
+    private String transfusionEffectiveness;
+
+    @ApiModelProperty(value = "输血疗效")
+    private String transfusionEfficacy;
+
+
 }

+ 68 - 327
src/main/java/com/diagbot/entity/StrDifficultCase.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,394 +17,126 @@ import java.util.Date;
  * 疑难病例讨论记录
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-30
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_difficult_case")
+@ApiModel(value="StrDifficultCase对象", description="疑难病例讨论记录")
 public class StrDifficultCase 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 discussDate;
 
-    /**
-     * 讨论地点
-     */
+    @ApiModelProperty(value = "讨论地点")
     private String discussPlace;
 
-    /**
-     * 主持人姓名及专业技术职务
-     */
+    @ApiModelProperty(value = "主持人姓名及专业技术职务")
     private String anchorMan;
 
-    /**
-     * 参加人员的姓名及专业技术职务
-     */
+    @ApiModelProperty(value = "参加人员的姓名及专业技术职务")
     private String participant;
 
-    /**
-     * 病史简介
-     */
+    @ApiModelProperty(value = "病史简介(简要病情)")
     private String briefHistory;
 
-    /**
-     * 讨论目的
-     */
+    @ApiModelProperty(value = "讨论目的")
     private String discussAim;
 
-    /**
-     * 具体讨论意见
-     */
+    @ApiModelProperty(value = "具体讨论意见(讨论内容)")
     private String discussionOpinions;
 
-    /**
-     * 主持人小结
-     */
+    @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 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 getAnchorMan() {
-        return anchorMan;
-    }
-
-    public void setAnchorMan(String anchorMan) {
-        this.anchorMan = anchorMan;
-    }
-    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 getDiscussAim() {
-        return discussAim;
-    }
-
-    public void setDiscussAim(String discussAim) {
-        this.discussAim = discussAim;
-    }
-    public String getDiscussionOpinions() {
-        return discussionOpinions;
-    }
-
-    public void setDiscussionOpinions(String discussionOpinions) {
-        this.discussionOpinions = discussionOpinions;
-    }
-    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 "StrDifficultCase{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", discussDate=" + discussDate +
-            ", discussPlace=" + discussPlace +
-            ", anchorMan=" + anchorMan +
-            ", participant=" + participant +
-            ", briefHistory=" + briefHistory +
-            ", discussAim=" + discussAim +
-            ", discussionOpinions=" + discussionOpinions +
-            ", 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 currentDiagnosis;
+
+    @ApiModelProperty(value = "术前诊断")
+    private String preoperativeDiagnosis;
+
+    @ApiModelProperty(value = "手术名称")
+    private String operationName;
+
+    @ApiModelProperty(value = "手术方案")
+    private String operationPlan;
+
+    @ApiModelProperty(value = "麻醉方式")
+    private String anesthesia;
+
+    @ApiModelProperty(value = "意外及防范方式")
+    private String accident;
+
+    @ApiModelProperty(value = "主持人签名")
+    private String anchorSign;
+
+
 }

+ 40 - 260
src/main/java/com/diagbot/entity/StrIllSeriousl.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,87 @@ import java.util.Date;
  * 病重通知单
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-30
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_ill_seriousl")
+@ApiModel(value="StrIllSeriousl对象", description="病重通知单")
 public class StrIllSeriousl 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;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
 
-    @Override
-    public String toString() {
-        return "StrIllSeriousl{" +
-            "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 +
-        "}";
-    }
 }

+ 157 - 0
src/main/java/com/diagbot/entity/StrInvasiveOperativeNote.java

@@ -0,0 +1,157 @@
+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;
+
+/**
+ * <p>
+ * 有创操作记录
+ * </p>
+ *
+ * @author wanghn
+ * @since 2024-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_invasive_operative_note")
+@ApiModel(value="StrInvasiveOperativeNote对象", description="有创操作记录")
+public class StrInvasiveOperativeNote implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "记录编号")
+    @TableId(value = "rec_id", type = IdType.INPUT)
+    private String recId;
+
+    @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 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;
+
+    @ApiModelProperty(value = "患者一般情况")
+    private String patientSituation;
+
+    @ApiModelProperty(value = "注意事项")
+    private String note;
+
+
+}

+ 50 - 327
src/main/java/com/diagbot/entity/StrPeriodConclusion.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,394 +17,108 @@ import java.util.Date;
  * 阶段小结
  * </p>
  *
- * @author cy
- * @since 2020-10-09
+ * @author wanghn
+ * @since 2024-09-30
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_period_conclusion")
+@ApiModel(value="StrPeriodConclusion对象", description="阶段小结")
 public class StrPeriodConclusion 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 participant;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊治经过
-     */
+    @ApiModelProperty(value = "诊治经过")
     private String treatmentProcess;
 
-    /**
-     * 目前诊断
-     */
+    @ApiModelProperty(value = "当前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 目前情况
-     */
+    @ApiModelProperty(value = "目前情况")
     private String presentSituation;
 
-    /**
-     * 诊疗计划
-     */
+    @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 getParticipant() {
-        return participant;
-    }
-
-    public void setParticipant(String participant) {
-        this.participant = participant;
-    }
-    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 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 getPresentSituation() {
-        return presentSituation;
-    }
-
-    public void setPresentSituation(String presentSituation) {
-        this.presentSituation = presentSituation;
-    }
-    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 "StrPeriodConclusion{" +
-            "recId=" + recId +
-            ", hospitalId=" + hospitalId +
-            ", behospitalCode=" + behospitalCode +
-            ", name=" + name +
-            ", sex=" + sex +
-            ", age=" + age +
-            ", bedNo=" + bedNo +
-            ", deptName=" + deptName +
-            ", recordDate=" + recordDate +
-            ", recTitle=" + recTitle +
-            ", participant=" + participant +
-            ", chief=" + chief +
-            ", behospitalSituation=" + behospitalSituation +
-            ", tentativeDiagnosis=" + tentativeDiagnosis +
-            ", treatmentProcess=" + treatmentProcess +
-            ", currentDiagnosis=" + currentDiagnosis +
-            ", presentSituation=" + presentSituation +
-            ", 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;
+
+
 }

+ 37 - 0
src/main/java/com/diagbot/facade/StrAdmissionNoteFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrAdmissionNote;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrAdmissionNoteServiceImpl;
+import com.diagbot.vo.str.StrAdmissionNoteVO;
+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 StrAdmissionNoteFacade extends StrAdmissionNoteServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrAdmissionNoteVO> sendAdmissionNoteNoteInfos(StrAdmissionNote strAdmissionNote) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strAdmissionNote.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 1)//入院记录的病历模版id为1,写死
+                    .one();
+            //病历id合法性校验
+            if (medicalRecord == null) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strAdmissionNote.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strAdmissionNote);
+            strAdmissionNote.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strAdmissionNote);
+            return saveOrUpdate == true ? RespDTO.onSuc("操作正常!") : RespDTO.onError("保存记录失败!");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

+ 38 - 0
src/main/java/com/diagbot/facade/StrBloodResultFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrBloodResult;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrBloodResultServiceImpl;
+import com.diagbot.vo.str.StrBloodResultVO;
+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 StrBloodResultFacade extends StrBloodResultServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrBloodResultVO> sendBloodResultInfos(StrBloodResult strBloodResult) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strBloodResult.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 10)//输血记录的病历模版id为10,写死
+                    .eq(MedicalRecord::getRecDate, strBloodResult.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if (medicalRecord == null) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strBloodResult.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strBloodResult);
+            strBloodResult.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strBloodResult);
+            return saveOrUpdate == true ? RespDTO.onSuc("操作正常!") : RespDTO.onError("保存记录失败!");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

+ 38 - 0
src/main/java/com/diagbot/facade/StrDifficultCaseFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrDifficultCase;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrDifficultCaseServiceImpl;
+import com.diagbot.vo.str.StrDifficultCaseVO;
+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 StrDifficultCaseFacade extends StrDifficultCaseServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrDifficultCaseVO> sendDifficultCaseInfos(StrDifficultCase strDifficultCase) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strDifficultCase.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 19)//疑难病例讨论记录的病历模版id为19,写死
+                    .eq(MedicalRecord::getRecDate, strDifficultCase.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if (medicalRecord == null) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strDifficultCase.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strDifficultCase);
+            strDifficultCase.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strDifficultCase);
+            return saveOrUpdate == true ? RespDTO.onSuc("操作正常!") : RespDTO.onError("保存记录失败!");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

+ 37 - 0
src/main/java/com/diagbot/facade/StrIllSeriouslFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrIllSeriousl;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrIllSeriouslServiceImpl;
+import com.diagbot.vo.str.StrIllSeriouslVO;
+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 StrIllSeriouslFacade extends StrIllSeriouslServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrIllSeriouslVO> sendIllSeriouslInfos(StrIllSeriousl strIllSeriousl) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strIllSeriousl.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 29)//病重通知单的病历模版id为29,写死
+                    .one();
+            //病历id合法性校验
+            if (medicalRecord == null) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strIllSeriousl.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strIllSeriousl);
+            strIllSeriousl.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strIllSeriousl);
+            return saveOrUpdate == true ? RespDTO.onSuc("操作正常!") : RespDTO.onError("保存记录失败!");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

+ 51 - 0
src/main/java/com/diagbot/facade/StrInvasiveOperativeNoteFacade.java

@@ -0,0 +1,51 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrInvasiveOperativeNote;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.impl.StrInvasiveOperativeNoteServiceImpl;
+import com.diagbot.vo.str.StrInvasiveOperativeNoteVO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @author: cy
+ * @time: 2020/9/23 11:39
+ */
+@Component
+public class StrInvasiveOperativeNoteFacade extends StrInvasiveOperativeNoteServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrInvasiveOperativeNoteVO> sendInvasiveOperativeNoteInfos(StrInvasiveOperativeNote strInvasiveOperativeNote) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strInvasiveOperativeNote.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 59)//有创操作的病历模版id为59,写死
+                    .eq(MedicalRecord::getRecDate, strInvasiveOperativeNote.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if (medicalRecord == null) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strInvasiveOperativeNote.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strInvasiveOperativeNote);
+            strInvasiveOperativeNote.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strInvasiveOperativeNote);
+            return saveOrUpdate == true ? RespDTO.onSuc("操作正常!") : RespDTO.onError("保存记录失败!");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
+}

+ 38 - 0
src/main/java/com/diagbot/facade/StrPeriodConclusionFacade.java

@@ -1,6 +1,15 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.MedicalRecord;
+import com.diagbot.entity.StrPeriodConclusion;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.StrPeriodConclusionServiceImpl;
+import com.diagbot.vo.str.StrPeriodConclusionVO;
+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 StrPeriodConclusionFacade extends StrPeriodConclusionServiceImpl {
+
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
+    public RespDTO<StrPeriodConclusionVO> sendPeriodConclusionInfos(StrPeriodConclusion strPeriodConclusion) {
+
+        try {
+            //根据病历id、病历模版id和记录时间查询文书记录id
+            MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                    .like(MedicalRecord::getBehospitalCode, strPeriodConclusion.getBehospitalCode())
+                    .eq(MedicalRecord::getModeId, 28)//阶段小结的病历模版id为28,写死
+                    .eq(MedicalRecord::getRecDate, strPeriodConclusion.getRecDate())
+                    .one();
+            //病历id合法性校验
+            if (medicalRecord == null) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS);
+            }
+            strPeriodConclusion.setRecId(medicalRecord.getRecId());
+            //将实体类字段转json
+            ObjectMapper objectWriter = new ObjectMapper();
+            String strResult = objectWriter.writeValueAsString(strPeriodConclusion);
+            strPeriodConclusion.setWholeData(strResult);
+            //修改或更新表中记录
+            boolean saveOrUpdate = this.saveOrUpdate(strPeriodConclusion);
+            return saveOrUpdate == true ? RespDTO.onSuc("操作正常!") : RespDTO.onError("保存记录失败!");
+        } catch (JsonProcessingException e) {
+            throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
+        }
+    }
 }

+ 16 - 0
src/main/java/com/diagbot/mapper/StrInvasiveOperativeNoteMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.StrInvasiveOperativeNote;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 有创操作记录 Mapper 接口
+ * </p>
+ *
+ * @author wanghn
+ * @since 2024-09-29
+ */
+public interface StrInvasiveOperativeNoteMapper extends BaseMapper<StrInvasiveOperativeNote> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/service/IStrDifficultCaseService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.StrDifficultCase;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 疑难病例讨论记录 服务类
+ * </p>
+ *
+ * @author wanghn
+ * @since 2024-09-29
+ */
+public interface IStrDifficultCaseService extends IService<StrDifficultCase> {
+
+}

+ 16 - 0
src/main/java/com/diagbot/service/IStrInvasiveOperativeNoteService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.StrInvasiveOperativeNote;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 有创操作记录 服务类
+ * </p>
+ *
+ * @author wanghn
+ * @since 2024-09-29
+ */
+public interface IStrInvasiveOperativeNoteService extends IService<StrInvasiveOperativeNote> {
+
+}

+ 20 - 0
src/main/java/com/diagbot/service/impl/StrInvasiveOperativeNoteServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.StrInvasiveOperativeNote;
+import com.diagbot.mapper.StrInvasiveOperativeNoteMapper;
+import com.diagbot.service.IStrInvasiveOperativeNoteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 有创操作记录 服务实现类
+ * </p>
+ *
+ * @author wanghn
+ * @since 2024-09-29
+ */
+@Service
+public class StrInvasiveOperativeNoteServiceImpl extends ServiceImpl<StrInvasiveOperativeNoteMapper, StrInvasiveOperativeNote> implements IStrInvasiveOperativeNoteService {
+
+}

+ 215 - 165
src/main/java/com/diagbot/vo/str/StrAdmissionNoteVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,279 +14,328 @@ import lombok.Data;
 @Data
 public class StrAdmissionNoteVO {
 
-    /**
-     * 记录编号
-     */
+    @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 birthday;
 
-    /**
-     * 婚姻状况
-     */
+    @ApiModelProperty(value = "婚姻状况")
     private String marriage;
 
-    /**
-     * 职业
-     */
+    @ApiModelProperty(value = "职业")
     private String jobType;
 
-    /**
-     * 民族
-     */
+    @ApiModelProperty(value = "民族")
     private String nation;
 
-    /**
-     * 联系电话
-     */
+    @ApiModelProperty(value = "联系电话")
     private String phone;
 
-    /**
-     * 工作单位
-     */
+    @ApiModelProperty(value = "工作单位")
     private String workplace;
 
-    /**
-     * 户口地址
-     */
+    @ApiModelProperty(value = "户口地址")
     private String registerAddress;
 
-    /**
-     * 出生地
-     */
+    @ApiModelProperty(value = "出生地")
     private String bornAddress;
 
-    /**
-     * 预产期
-     */
+    @ApiModelProperty(value = "预产期")
     private String expectDate;
 
-    /**
-     * 末次月经
-     */
+    @ApiModelProperty(value = "末次月经")
     private String lastMenstrual;
 
-    /**
-     * 孕/产次
-     */
+    @ApiModelProperty(value = "孕/产次")
     private String pregnantNum;
 
-    /**
-     * 入院日期
-     */
+    @ApiModelProperty(value = "入院日期")
     private String behospitalDate;
 
-    /**
-     * 病史陈述者
-     */
+    @ApiModelProperty(value = "病史陈述者")
     private String historyTeller;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 现病史
-     */
+    @ApiModelProperty(value = "现病史")
     private String present;
 
-    /**
-     * 既往史
-     */
+    @ApiModelProperty(value = "既往史(过去史)")
     private String pastHistory;
 
-    /**
-     * 个人史
-     */
+    @ApiModelProperty(value = "个人史")
     private String personalHistory;
 
-    /**
-     * 婚育史
-     */
+    @ApiModelProperty(value = "婚育史(婚姻史)")
     private String maritalHistory;
 
-    /**
-     * 月经史
-     */
+    @ApiModelProperty(value = "月经史")
     private String menstrualHistory;
 
-    /**
-     * 家族史
-     */
+    @ApiModelProperty(value = "家族史")
     private String familyHistory;
 
-    /**
-     * 喂养史
-     */
+    @ApiModelProperty(value = "喂养史")
     private String feedingHistory;
 
-    /**
-     * 手术外伤史
-     */
+    @ApiModelProperty(value = "手术外伤史")
     private String operationHistory;
 
-    /**
-     * 输血史
-     */
+    @ApiModelProperty(value = "输血史")
     private String bloodHistory;
 
-    /**
-     * 传染病史
-     */
+    @ApiModelProperty(value = "传染病史")
     private String infectionHistory;
 
-    /**
-     * 专科检查
-     */
+    @ApiModelProperty(value = "专科检查")
     private String specialVital;
 
-    /**
-     * 辅助检查
-     */
+    @ApiModelProperty(value = "辅助检查")
     private String assistantExam;
 
-    /**
-     * 实验室检查
-     */
+    @ApiModelProperty(value = "实验室检查")
     private String lisExam;
 
-    /**
-     * 影像学检查
-     */
+    @ApiModelProperty(value = "影像学检查")
     private String pacsExam;
 
-    /**
-     * 初步诊断
-     */
+    @ApiModelProperty(value = "初步诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 补充诊断
-     */
+    @ApiModelProperty(value = "补充诊断")
     private String supplyDiagnosis;
 
-    /**
-     * 修正诊断
-     */
+    @ApiModelProperty(value = "修正诊断")
     private String revisedDiagnosis;
 
-    /**
-     * 记录医生
-     */
+    @ApiModelProperty(value = "记录医生")
     private String recDoctor;
 
-    /**
-     * 记录时间
-     */
+    @ApiModelProperty(value = "记录时间")
     private String recDate;
 
-    /**
-     * 审核医生
-     */
+    @ApiModelProperty(value = "审核医生")
     private String auditDoctor;
 
-    /**
-     * 审核时间
-     */
+    @ApiModelProperty(value = "审核时间")
     private String auditDate;
 
-    /**
-     * 体温
-     */
+    @ApiModelProperty(value = "体温")
     private String temperature;
 
-    /**
-     * 脉搏
-     */
+    @ApiModelProperty(value = "脉搏")
     private String pulse;
 
-    /**
-     * 呼吸
-     */
+    @ApiModelProperty(value = "呼吸")
     private String breathe;
 
-    /**
-     * 血压
-     */
+    @ApiModelProperty(value = "血压")
     private String bloodPressure;
 
-    /**
-     * 疼痛
-     */
+    @ApiModelProperty(value = "疼痛")
     private String pain;
 
-    /**
-     * 体重
-     */
+    @ApiModelProperty(value = "体重")
     private String weight;
 
-    /**
-     * 身高
-     */
+    @ApiModelProperty(value = "身高")
     private String height;
 
-    /**
-     * BMI
-     */
+    @ApiModelProperty(value = "BMI")
     private String bmi;
 
-    /**
-     * 结构化数据
-     */
+    @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 fever;
+
+    @ApiModelProperty(value = "咳嗽等呼吸道症状")
+    private String coughSymptom;
+
+    @ApiModelProperty(value = "一般健康状态")
+    private String healthStatus;
+
+    @ApiModelProperty(value = "内科疾病史")
+    private String internalHistory;
+
+    @ApiModelProperty(value = "药物、食物中毒史")
+    private String poisoningHistory;
+
+    @ApiModelProperty(value = "长期用药")
+    private String chronicMedication;
+
+    @ApiModelProperty(value = "预防接种史")
+    private String vaccinationHistory;
+
+    @ApiModelProperty(value = "个人习惯史")
+    private String habitHistory;
+
+    @ApiModelProperty(value = "生命体征")
+    private String vitalSigns;
+
+    @ApiModelProperty(value = "一般情况")
+    private String generalCondition;
+
+    @ApiModelProperty(value = "皮肤")
+    private String skin;
+
+    @ApiModelProperty(value = "浅表淋巴结")
+    private String lymphNodes;
+
+    @ApiModelProperty(value = "头部")
+    private String head;
+
+    @ApiModelProperty(value = "眼")
+    private String eyes;
+
+    @ApiModelProperty(value = "瞳孔")
+    private String pupil;
+
+    @ApiModelProperty(value = "耳")
+    private String ear;
+
+    @ApiModelProperty(value = "鼻")
+    private String nose;
+
+    @ApiModelProperty(value = "口腔")
+    private String oralCavity;
+
+    @ApiModelProperty(value = "颈部")
+    private String neck;
+
+    @ApiModelProperty(value = "甲状腺检查")
+    private String thyroid;
+
+    @ApiModelProperty(value = "胸部视诊")
+    private String chestInspection;
+
+    @ApiModelProperty(value = "胸部触诊")
+    private String chestPalpation;
+
+    @ApiModelProperty(value = "胸部叩诊")
+    private String chestPercussion;
+
+    @ApiModelProperty(value = "胸部听诊")
+    private String chestAuscultation;
+
+    @ApiModelProperty(value = "乳房")
+    private String breast;
+
+    @ApiModelProperty(value = "心脏视诊")
+    private String cardiacInspection;
+
+    @ApiModelProperty(value = "心脏触诊")
+    private String cardiacPalpation;
+
+    @ApiModelProperty(value = "心脏叩诊")
+    private String cardiacPercussion;
+
+    @ApiModelProperty(value = "心脏听诊")
+    private String cardiacAuscultation;
+
+    @ApiModelProperty(value = "周围血管")
+    private String peripheralVessels;
+
+    @ApiModelProperty(value = "腹部视诊")
+    private String abdominalInspection;
+
+    @ApiModelProperty(value = "腹部触诊")
+    private String abdominalPalpation;
+
+    @ApiModelProperty(value = "肝触诊")
+    private String liverPalpation;
+
+    @ApiModelProperty(value = "胆囊触诊")
+    private String gallbladderPalpation;
+
+    @ApiModelProperty(value = "脾触诊")
+    private String spleenPalpation;
+
+    @ApiModelProperty(value = "肾触诊")
+    private String kidneyPalpation;
+
+    @ApiModelProperty(value = "腹部叩诊")
+    private String abdominalPercussion;
+
+    @ApiModelProperty(value = "腹部听诊")
+    private String abdominalAuscultation;
+
+    @ApiModelProperty(value = "脊柱")
+    private String spine;
+
+    @ApiModelProperty(value = "四肢")
+    private String theFourLimbs;
+
+    @ApiModelProperty(value = "颅神经")
+    private String cranialNerve;
+
+    @ApiModelProperty(value = "感觉")
+    private String feeling;
+
+    @ApiModelProperty(value = "运动")
+    private String sports;
+
+    @ApiModelProperty(value = "病理征")
+    private String pathologicalSign;
+
+    @ApiModelProperty(value = "脑膜刺激征")
+    private String meningealSign;
+
+    @ApiModelProperty(value = "颅神经其它")
+    private String nerveOthers;
+
+    @ApiModelProperty(value = "修正医生")
+    private String revisedDoctor;
+
+    @ApiModelProperty(value = "修正日期")
+    private String revisedTime;
+
 }

+ 49 - 63
src/main/java/com/diagbot/vo/str/StrBloodTransfusionVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,109 +14,94 @@ import lombok.Data;
 @Data
 public class StrBloodTransfusionVO{
 
-    /**
-     * 记录编号
-     */
+    @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 transfusionReason;
 
-    /**
-     * 输注种类、血型、数量
-     */
+    @ApiModelProperty(value = "输注种类、血型、数量")
     private String transfusionType;
 
-    /**
-     * 输注过程
-     */
+    @ApiModelProperty(value = "输注过程")
     private String transfusionProcess;
 
-    /**
-     * 记录医生
-     */
+    @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 preventiveMeasures;
+
+    @ApiModelProperty(value = "输血后生命体征变化")
+    private String vitalSigns;
+
+    @ApiModelProperty(value = "输注后效果评价")
+    private String transfusionEffectiveness;
+
+    @ApiModelProperty(value = "输血疗效")
+    private String transfusionEfficacy;
+
 }

+ 62 - 72
src/main/java/com/diagbot/vo/str/StrDifficultCaseVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,124 +14,113 @@ import lombok.Data;
 @Data
 public class StrDifficultCaseVO {
 
-    /**
-     * 记录编号
-     */
+    @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 discussDate;
 
-    /**
-     * 讨论地点
-     */
+    @ApiModelProperty(value = "讨论地点")
     private String discussPlace;
 
-    /**
-     * 主持人姓名及专业技术职务
-     */
+    @ApiModelProperty(value = "主持人姓名及专业技术职务")
     private String anchorMan;
 
-    /**
-     * 参加人员的姓名及专业技术职务
-     */
+    @ApiModelProperty(value = "参加人员的姓名及专业技术职务")
     private String participant;
 
-    /**
-     * 病史简介
-     */
+    @ApiModelProperty(value = "病史简介(简要病情)")
     private String briefHistory;
 
-    /**
-     * 讨论目的
-     */
+    @ApiModelProperty(value = "讨论目的")
     private String discussAim;
 
-    /**
-     * 具体讨论意见
-     */
+    @ApiModelProperty(value = "具体讨论意见(讨论内容)")
     private String discussionOpinions;
 
-    /**
-     * 主持人小结
-     */
+    @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 currentDiagnosis;
+
+    @ApiModelProperty(value = "术前诊断")
+    private String preoperativeDiagnosis;
+
+    @ApiModelProperty(value = "手术名称")
+    private String operationName;
+
+    @ApiModelProperty(value = "手术方案")
+    private String operationPlan;
+
+    @ApiModelProperty(value = "麻醉方式")
+    private String anesthesia;
+
+    @ApiModelProperty(value = "意外及防范方式")
+    private String accident;
+
+    @ApiModelProperty(value = "主持人签名")
+    private String anchorSign;
+
+
 }

+ 34 - 54
src/main/java/com/diagbot/vo/str/StrIllSeriouslVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo.str;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -13,94 +14,73 @@ import lombok.Data;
 @Data
 public class StrIllSeriouslVO  {
 
-    /**
-     * 记录编号
-     */
+    @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;
+
 }

+ 153 - 0
src/main/java/com/diagbot/vo/str/StrInvasiveOperativeNoteVO.java

@@ -0,0 +1,153 @@
+package com.diagbot.vo.str;
+
+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;
+
+/**
+ * <p>
+ * 有创操作记录
+ * </p>
+ *
+ * @author wanghn
+ * @since 2024-09-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("str_invasive_operative_note")
+@ApiModel(value="StrInvasiveOperativeNote对象", description="有创操作记录")
+public class StrInvasiveOperativeNoteVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "记录编号")
+    private String recId;
+
+    @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 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 patientSituation;
+
+    @ApiModelProperty(value = "注意事项")
+    private String note;
+
+
+}

+ 46 - 72
src/main/java/com/diagbot/vo/str/StrPeriodConclusionVO.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,124 +16,95 @@ import lombok.Data;
 @Data
 public class StrPeriodConclusionVO {
 
-    /**
-     * 记录编号
-     */
+    @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 participant;
 
-    /**
-     * 主诉
-     */
+    @ApiModelProperty(value = "主诉")
     private String chief;
 
-    /**
-     * 入院情况
-     */
+    @ApiModelProperty(value = "入院情况")
     private String behospitalSituation;
 
-    /**
-     * 入院诊断
-     */
+    @ApiModelProperty(value = "入院诊断")
     private String tentativeDiagnosis;
 
-    /**
-     * 诊治经过
-     */
+    @ApiModelProperty(value = "诊治经过")
     private String treatmentProcess;
 
-    /**
-     * 目前诊断
-     */
+    @ApiModelProperty(value = "当前诊断")
     private String currentDiagnosis;
 
-    /**
-     * 目前情况
-     */
+    @ApiModelProperty(value = "目前情况")
     private String presentSituation;
 
-    /**
-     * 诊疗计划
-     */
+    @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;
+
 }

+ 24 - 4
src/main/java/com/diagbot/web/StrAdmissionNoteController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrAdmissionNote;
+import com.diagbot.facade.StrAdmissionNoteFacade;
+import com.diagbot.vo.str.StrAdmissionNoteVO;
+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("/strAdmissionNote")
+@RestController
+@RequestMapping("/str/AdmissionNote")
+@Api(value = "入院记录相关API", tags = { "入院记录相关API" })
 public class StrAdmissionNoteController {
 
+    @Autowired
+    private StrAdmissionNoteFacade strAdmissionNoteFacade;
+
+    @ApiOperation("新增或修改入院记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrAdmissionNoteVO> sendAdmissionNoteNoteInfos(@RequestBody StrAdmissionNote strAdmissionNote){
+        return strAdmissionNoteFacade.sendAdmissionNoteNoteInfos(strAdmissionNote);
+    }
+
 }

+ 24 - 4
src/main/java/com/diagbot/web/StrBloodResultController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrBloodResult;
+import com.diagbot.facade.StrBloodResultFacade;
+import com.diagbot.vo.str.StrBloodResultVO;
+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("/strBloodResult")
+@RestController
+@RequestMapping("/str/BloodResult")
+@Api(value = "输血记录相关API", tags = { "输血记录相关API" })
 public class StrBloodResultController {
 
+    @Autowired
+    private StrBloodResultFacade strBloodResultFacade;
+
+    @ApiOperation("新增或修改输血记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrBloodResultVO> sendBloodResultInfos(@RequestBody StrBloodResult strBloodResult){
+        return strBloodResultFacade.sendBloodResultInfos(strBloodResult);
+    }
+
 }

+ 24 - 4
src/main/java/com/diagbot/web/StrDifficultCaseController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrDifficultCase;
+import com.diagbot.facade.StrDifficultCaseFacade;
+import com.diagbot.vo.str.StrDifficultCaseVO;
+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("/strDifficultCase")
+@RestController
+@RequestMapping("/str/DifficultCase")
+@Api(value = "疑难病例讨论记录相关API", tags = { "疑难病例讨论记录相关API" })
 public class StrDifficultCaseController {
 
+    @Autowired
+    private StrDifficultCaseFacade strDifficultCaseFacade;
+
+    @ApiOperation("新增或修改疑难病例讨论记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrDifficultCaseVO> sendDifficultCaseInfos(@RequestBody StrDifficultCase strDifficultCase){
+        return strDifficultCaseFacade.sendDifficultCaseInfos(strDifficultCase);
+    }
+
 }

+ 24 - 4
src/main/java/com/diagbot/web/StrIllSeriouslController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrIllSeriousl;
+import com.diagbot.facade.StrIllSeriouslFacade;
+import com.diagbot.vo.str.StrIllSeriouslVO;
+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("/strIllSeriousl")
+@RestController
+@RequestMapping("/str/IllSeriousl")
+@Api(value = "病重通知单相关API", tags = { "病重通知单相关API" })
 public class StrIllSeriouslController {
 
+    @Autowired
+    private StrIllSeriouslFacade strIllSeriouslFacade;
+
+    @ApiOperation("新增或修改病重通知单基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrIllSeriouslVO> sendIllSeriouslInfos(@RequestBody StrIllSeriousl strIllSeriousl){
+        return strIllSeriouslFacade.sendIllSeriouslInfos(strIllSeriousl);
+    }
+
 }

+ 40 - 0
src/main/java/com/diagbot/web/StrInvasiveOperativeNoteController.java

@@ -0,0 +1,40 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrInvasiveOperativeNote;
+import com.diagbot.facade.StrInvasiveOperativeNoteFacade;
+import com.diagbot.vo.str.StrInvasiveOperativeNoteVO;
+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.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 有创操作记录 前端控制器
+ * </p>
+ *
+ * @author wanghn
+ * @since 2024-09-29
+ */
+@RestController
+@RequestMapping("/str/InvasiveOperativeNote")
+@Api(value = "有创操作记录相关API", tags = { "有创操作记录相关API" })
+public class StrInvasiveOperativeNoteController {
+
+    @Autowired
+    private StrInvasiveOperativeNoteFacade strInvasiveOperativeNoteFacade;
+
+    @ApiOperation("新增或修改有创操作记录基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrInvasiveOperativeNoteVO> sendInvasiveOperativeNoteInfos(@RequestBody StrInvasiveOperativeNote strInvasiveOperativeNote){
+        return strInvasiveOperativeNoteFacade.sendInvasiveOperativeNoteInfos(strInvasiveOperativeNote);
+    }
+
+}

+ 24 - 4
src/main/java/com/diagbot/web/StrPeriodConclusionController.java

@@ -1,9 +1,18 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.StrPeriodConclusion;
+import com.diagbot.facade.StrPeriodConclusionFacade;
+import com.diagbot.vo.str.StrPeriodConclusionVO;
+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("/strPeriodConclusion")
+@RestController
+@RequestMapping("/str/PeriodConclusion")
+@Api(value = "阶段小结相关API", tags = { "阶段小结相关API" })
 public class StrPeriodConclusionController {
 
+    @Autowired
+    private StrPeriodConclusionFacade strPeriodConclusionFacade;
+
+    @ApiOperation("新增或修改阶段小结基本信息")
+    @PostMapping("/infos")
+    @SysLogger("infos")
+    public RespDTO<StrPeriodConclusionVO> sendPeriodConclusionInfos(@RequestBody StrPeriodConclusion strPeriodConclusion){
+        return strPeriodConclusionFacade.sendPeriodConclusionInfos(strPeriodConclusion);
+    }
+
 }

+ 5 - 0
src/main/resources/mapper/StrInvasiveOperativeNoteMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.StrInvasiveOperativeNoteMapper">
+
+</mapper>