Browse Source

病案首页质控满足前端样例

“wangdsYun 1 tháng trước cách đây
mục cha
commit
f12252ba10

+ 30 - 0
src/main/java/com/diagbot/dto/MsgApiDTO.java

@@ -1,10 +1,13 @@
 package com.diagbot.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description:
@@ -38,10 +41,37 @@ public class MsgApiDTO {
     private Integer casesEntryStatus = 0;
     // 逻辑删除标志位
     private String isDeleted;
+    //模块名称
+    private String modelName;
+    //模块id
+    private String modelId;
+    //模块ID
+    private Long casesId;
+    //模块分数
+    private BigDecimal casesScore;
     // 记录修改时间,如果时间是1970年则表示纪录未修改
     private Date gmtModified;
     // 记录修改人id
     private String modifier;
     // 记录修改人姓名
     private String linkman;
+    // 缺陷说明
+    private String remark;
+    // 条目id对应页面数据的key值
+    private List<Long> pageKeyList = new ArrayList<>();
+
+    @ApiModelProperty("申诉条目id")
+    private Long appealInfoId = 0L;
+
+    @ApiModelProperty("审核状态 0:待审核|1:驳回|2:通过")
+    private String exampleStatus = "0";
+
+    @ApiModelProperty(value = "操作类型")
+    private String appealOperationType = "0";
+
+    @ApiModelProperty(value = "审核人")
+    private String reviewer ="-1";
+
+    @ApiModelProperty(value = "审核时间")
+    private Date exampleDate;
 }

+ 18 - 0
src/main/java/com/diagbot/dto/MsgDTO.java

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -62,4 +63,21 @@ public class MsgDTO {
     private String isDeleted;
     // 缺陷说明
     private String remark;
+    // 条目id对应页面数据的key值
+    private List<Long> pageKeyList = new ArrayList<>();
+
+    @ApiModelProperty("申诉条目id")
+    private Long appealInfoId = 0L;
+
+    @ApiModelProperty("审核状态 0:待审核|1:驳回|2:通过")
+    private String exampleStatus = "0";
+
+    @ApiModelProperty(value = "操作类型")
+    private String appealOperationType = "0";
+
+    @ApiModelProperty(value = "审核人")
+    private String reviewer ="-1";
+
+    @ApiModelProperty(value = "审核时间")
+    private Date exampleDate;
 }

+ 5 - 5
src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -304,21 +304,21 @@
         SELECT a.*, u.linkman
         FROM
         (
-        SELECT DISTINCT c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,c.info,
+        SELECT DISTINCT b.`name` model_name, b.id model_id, c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,c.info,
         a.name standard_msg, c.opt_type, c.grade_type,
         c.gmt_create, c.gmt_modified, c.modifier,c.is_deleted,c.explain_info as explainInfo,
         a.type, a.drgs, a.rule_type
         FROM
-        `qc_cases_entry` a, med_qcresult_detail c, qc_cases_hospital d
-        where a.is_deleted = 'N' and d.is_deleted = 'N'
-        and a.id = c.cases_entry_id
+        `qc_cases_entry` a, qc_mode b, med_qcresult_detail c, qc_cases_hospital d
+        where a.is_deleted = 'N' and b.is_deleted = 'N' and d.is_deleted = 'N'
+        and a.id = c.cases_entry_id and a.mode_id = b.id
         and c.hospital_id = d.hospital_id
         and c.hospital_id = #{hospitalId}
         <if test="qcresultInfoId != null">
             AND c.qcresult_info_id = #{qcresultInfoId}
         </if>
         and c.behospital_code = #{behospitalCode} and c.opt_type != 4
-        order by c.grade_type desc, a.order_no) a
+        order by b.order_no, c.grade_type desc, a.order_no) a
         LEFT JOIN sys_user u on u.id = a.modifier and u.is_deleted = 'N'
     </select>