申诉接口、申诉记录查看接口添加单项否决、模块总分字段

common/src/main/java/com/lantone/common/dto/appeal/GetAppealInfoDTO.java

@@ -32,6 +32,12 @@ public class GetAppealInfoDTO implements Serializable {
     @ApiModelProperty(value = "住院科室名称")
     private String deptName;
 
+    @ApiModelProperty(value = "主管医生ID")
+    private String doctorId;
+
+    @ApiModelProperty(value = "主管医生ID")
+    private String doctorName;
+
     @ApiModelProperty(value = "入院时间")
     private Date behospitalDate;
 
@@ -59,10 +65,10 @@ public class GetAppealInfoDTO implements Serializable {
     @ApiModelProperty(value = "质控条目(新增已有操作才有值)")
     private String casesEntryName;
 
-    @ApiModelProperty(value = "提示信息(新增已有操作才有值)")
+    @ApiModelProperty(value = "申诉-提示信息(新增已有操作才有值)")
     private String casesEntryMsg;
 
-    @ApiModelProperty(value = "分值(新增已有操作才有值)")
+    @ApiModelProperty(value = "申诉-分值(新增已有操作才有值)")
     private BigDecimal value;
 
     @ApiModelProperty(value = "申诉模块id")
@@ -112,4 +118,16 @@ public class GetAppealInfoDTO implements Serializable {
 
     @ApiModelProperty(value = "审核人姓名")
     private String checkName;
+
+    @ApiModelProperty(value = "申诉时间")
+    private Date appealCreateDate;
+
+    @ApiModelProperty(value = "审核时间")
+    private Date appealExamineDate;
+
+    @ApiModelProperty(value = "审核-提示信息")
+    private String msg;
+
+    @ApiModelProperty(value = "审核-分值")
+    private BigDecimal score;
 }

common/src/main/java/com/lantone/common/vo/appeal/AddAppealInfoVO.java

@@ -34,6 +34,12 @@ public class AddAppealInfoVO {
     @ApiModelProperty(value = "条目ID")
     private Long casesEntryId;
 
+    @ApiModelProperty(value = "模块总分")
+    private BigDecimal casesScore;
+
+    @ApiModelProperty(value = "单项否决（1-单项否决 0-非）")
+    private Integer isReject;
+
     @ApiModelProperty(value = "质控条目(新增已有操作才有值)")
     private String casesEntryName;
 
@@ -72,8 +78,7 @@ public class AddAppealInfoVO {
     @NotNull(message = "审核人id不能为空")
     private Long checkId;
 
-    @ApiModelProperty(value = "当前工作流节点id 1:申诉|2:撤回|3:审核", hidden = true)
-    @NotNull(message = "当前工作流节点id不能为空")
+    @ApiModelProperty(value = "当前工作流节点id", hidden = true)
     private Long workFlowNodeId;
 
     @ApiModelProperty(value = "备注")

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/AppealInfo.java

@@ -59,6 +59,18 @@ public class AppealInfo implements Serializable {
     @TableField("qcresult_detai_value")
     private BigDecimal qcresultDetaiValue;
 
+    /**
+     * 模块总分
+     */
+    @TableField("cases_score")
+    private BigDecimal casesScore;
+
+    /**
+     * 单项否决（1-单项否决 0-非）
+     */
+    @TableField("is_reject")
+    private Integer isReject;
+
     /**
      * 条目ID
      */

dblayer-mbg/src/main/resources/mapperdb2/AppealInfoMapper.xml

@@ -14,6 +14,8 @@
             mbi.doctor_name doctorName,
             mbi.behospital_date behospitalDate,
             mbi.leave_hospital_date leaveHospitalDate,
+            mbi.doctor_id doctorId,
+            mbi.doctor_name doctorName,
             mai.id,
             mai.hospital_id hospitalId,
             mai.qcresult_detail_id qcresultDetailId,
@@ -32,11 +34,15 @@
             mai.appeal_explain appealExplain,
             mai.check_id checkId,
             mai.remark appealRemark,
+            mai.gmt_create appealCreateDate,
             mae.example_status exampleStatus,
             mae.example_operation exampleOperation,
             mae.process_result processResult,
             mae.reject_reason rejectReason,
             mae.remark exampleRemark,
+            mae.gmt_create appealExamineDate,
+            mqd.msg,
+            mqd.score,
             u.linkman claimantName,
             u2.linkman checkName
         FROM
@@ -46,6 +52,7 @@
         LEFT JOIN med_home_page mhp ON mbi.behospital_code = mhp.behospital_code
         AND mhp.hospital_id = mbi.hospital_id
         LEFT JOIN med_appeal_examine_info mae ON mai.id = mae.appeal_info_id
+        LEFT JOIN med_qcresult_detail mqd ON mai.qcresult_detail_id = mqd.id
         LEFT JOIN sys_user u ON mai.claimant_id = u.id
         LEFT JOIN sys_user u2 ON mai.check_id = u2.id
         WHERE 1=1

dblayer-mbg/src/main/resources/mapperdb2/base/BaseAppealInfoMapper.xml

@@ -10,6 +10,8 @@
         <result column="qcresult_detail_id" property="qcresultDetailId"/>
         <result column="qcresult_detail_msg" property="qcresultDetailMsg"/>
         <result column="qcresult_detai_value" property="qcresultDetaiValue"/>
+        <result column="cases_score" property="casesScore"/>
+        <result column="is_reject" property="isReject"/>
         <result column="cases_entry_id" property="casesEntryId"/>
         <result column="cases_entry_name" property="casesEntryName"/>
         <result column="cases_entry_msg" property="casesEntryMsg"/>