Merge branch 'main' of http://114.55.171.231:3000/lxd/inspect-backend

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java

@@ -79,4 +79,10 @@ public class InspectPatientPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] auditorTime;
 
+    @Schema(description = "审核状态")
+    private Integer auditStatus;
+
+    @Schema(description = "总检意见")
+    private String inspectionOpinion;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientRespVO.java

@@ -98,4 +98,12 @@ public class InspectPatientRespVO {
     @ExcelProperty("审核时间")
     private LocalDateTime auditorTime;
 
+    @Schema(description = "审核状态")
+    @ExcelProperty("审核状态")
+    private Integer auditStatus;
+
+    @Schema(description = "总检意见")
+    @ExcelProperty("总检意见")
+    private String inspectionOpinion;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientSaveReqVO.java

@@ -75,4 +75,10 @@ public class InspectPatientSaveReqVO {
     @Schema(description = "审核时间")
     private LocalDateTime auditorTime;
 
+    @Schema(description = "审核状态")
+    private Integer auditStatus;
+
+    @Schema(description = "总检意见")
+    private String inspectionOpinion;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsPageReqVO.java

@@ -58,4 +58,7 @@ public class InspectPatientitemsPageReqVO extends PageParam {
     @Schema(description = "是否阳性  1：阳性")
     private String positive;
 
+    @Schema(description = "根据检查结论分析")
+    private String analyse;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsRespVO.java

@@ -71,4 +71,8 @@ public class InspectPatientitemsRespVO {
     @ExcelProperty("是否阳性  1：阳性")
     private String positive;
 
+    @Schema(description = "根据检查结论分析")
+    @ExcelProperty("根据检查结论分析")
+    private String analyse;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatientitems/vo/InspectPatientitemsSaveReqVO.java

@@ -59,4 +59,7 @@ public class InspectPatientitemsSaveReqVO {
     @Schema(description = "是否阳性  1：阳性")
     private String positive;
 
+    @Schema(description = "根据检查结论分析")
+    private String analyse;
+
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatient/InspectPatientDO.java

@@ -124,5 +124,15 @@ public class InspectPatientDO  {
      */
     @TableField("auditorTime")
     private LocalDateTime auditorTime;
+    /**
+     * 审核状态
+     */
+    @TableField("auditStatus")
+    private Integer auditStatus;
+    /**
+     * 总检意见
+     */
+    @TableField("inspectionOpinion")
+    private String inspectionOpinion;
 
 }

yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/dataobject/inspectpatientitems/InspectPatientitemsDO.java

@@ -98,5 +98,10 @@ public class InspectPatientitemsDO  {
      */
     @TableField("positive")
     private String positive;
+    /**
+     * 根据检查结论分析
+     */
+    @TableField("analyse")
+    private String analyse;
 
 }