Merge remote-tracking branch 'origin/dev/20220105_2.2.0_通用版_申诉驳回' into dev/20220105_2.2.0_通用版_申诉驳回

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

@@ -66,10 +66,10 @@ public class GetAppealInfoDTO implements Serializable {
     private BigDecimal value;
 
     @ApiModelProperty(value = "申诉模块id")
-    private Long modeId;
+    private Long casesId;
 
     @ApiModelProperty(value = "模块名称")
-    private String modeName;
+    private String casesName;
 
     @ApiModelProperty(value = "病历内容")
     private String defectContent;

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

@@ -44,7 +44,7 @@ public class GetAuditDTO {
     private Date leaveHospitalDate;
 
     @ApiModelProperty(value = "申诉模块")
-    private String modeName;
+    private String casesName;
 
     @ApiModelProperty(value = "质控缺陷ID")
     private Long qcresultDetailId;

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

@@ -38,7 +38,7 @@ public class GetAppealReviewVO extends Page implements Serializable {
     private String deptName;
 
     @ApiModelProperty(value = "申述模块")
-    private String module;
+    private String casesName;
 
     @ApiModelProperty(value = "申诉人")
     private String name;

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

@@ -41,7 +41,7 @@ public class GetComplaintRecordVO extends Page implements Serializable {
     private String deptName;
 
     @ApiModelProperty(value = "申述模块")
-    private String module;
+    private String casesName;
 
     @ApiModelProperty(value = "审核人")
     private String name;

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

@@ -43,8 +43,8 @@
         <if test="getComplaintRecordVO.deptName != null and getComplaintRecordVO.deptName != '' ">
             <![CDATA[ AND b.beh_dept_name = #{getComplaintRecordVO.deptName}]]>
         </if>
-        <if test="getComplaintRecordVO.module != null and getComplaintRecordVO.module != '' ">
-            <![CDATA[ AND a.cases_name = #{getComplaintRecordVO.module}]]>
+        <if test="getComplaintRecordVO.casesName != null and getComplaintRecordVO.casesName != '' ">
+            <![CDATA[ AND a.cases_name = #{getComplaintRecordVO.casesName}]]>
         </if>
         <if test="getComplaintRecordVO.operationType != null and getComplaintRecordVO.operationType != '' ">
             <![CDATA[ AND a.appeal_operation_type = #{getComplaintRecordVO.operationType}]]>
@@ -106,8 +106,8 @@
         <if test="getAppealReviewVO.deptName != null and getAppealReviewVO.deptName != '' ">
             <![CDATA[ AND b.beh_dept_name = #{getAppealReviewVO.deptName}]]>
         </if>
-        <if test="getAppealReviewVO.module != null and getAppealReviewVO.module != '' ">
-            <![CDATA[ AND a.cases_name = #{getAppealReviewVO.module}]]>
+        <if test="getAppealReviewVO.casesName != null and getAppealReviewVO.casesName != '' ">
+            <![CDATA[ AND a.cases_name = #{getAppealReviewVO.casesName}]]>
         </if>
         <if test="getAppealReviewVO.operationType != null and getAppealReviewVO.operationType != '' ">
             <![CDATA[ AND a.appeal_operation_type = #{getAppealReviewVO.operationType}]]>

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

@@ -23,8 +23,8 @@
             mai.cases_entry_name casesEntryName,
             mai.cases_entry_msg casesEntryMsg,
             mai.`value`,
-            mai.mode_id modeId,
-            mai.mode_name modeName,
+            mai.cases_id casesId,
+            mai.cases_name casesName,
             mai.defect_content defectContent,
             mai.claimant_id claimantId,
             mai.appeal_type appealType,