修改casesId,casesName为modeId,和modeName

report-service/src/main/java/com/lantone/report/dto/AppealExamineRecordDTO.java

@@ -21,7 +21,7 @@ public class AppealExamineRecordDTO implements Serializable {
     @ApiModelProperty(value = "条目ID")
     private Long casesEntryId;
 
-    @ApiModelProperty(value = "质控条目(新增已有操作才有值)")
+    @ApiModelProperty(value = "质控条目")
     private String casesEntryName;
 
     @ApiModelProperty(value = "申诉-提示信息(新增已有操作才有值)")

report-service/src/main/java/com/lantone/report/dto/GetAppealInfoDTO.java

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

report-service/src/main/java/com/lantone/report/dto/GetAppealReviewDTO.java

@@ -46,7 +46,7 @@ public class GetAppealReviewDTO {
     private String name;
 
     @ApiModelProperty(value = "申述模块")
-    private String casesName;
+    private String modeName;
 
     @ApiModelProperty(value = "缺陷详情")
     private String qcresultDetailMsg;

report-service/src/main/java/com/lantone/report/dto/GetComplaintRecordDTO.java

@@ -53,7 +53,7 @@ public class GetComplaintRecordDTO {
     private String name;
 
     @ApiModelProperty(value = "申述模块")
-    private String casesName;
+    private String modeName;
 
     @ApiModelProperty(value = "缺陷详情")
     private String qcresultDetailMsg;
@@ -80,6 +80,6 @@ public class GetComplaintRecordDTO {
     @ApiModelProperty(value = "单项否决（1-单项否决 0-非）")
     private Integer isReject;
 
-    @ApiModelProperty(value = "模块数据标准id")
-    private Integer casesId;
+    @ApiModelProperty(value = "模块id")
+    private Long modeId;
 }

report-service/src/main/java/com/lantone/report/entity/AppealInfo.java

@@ -94,16 +94,16 @@ public class AppealInfo implements Serializable {
     private BigDecimal value;
 
     /**
-     * 模块数据标准id
+     * 模块id
      */
-    @TableField("cases_id")
-    private Long casesId;
+    @TableField("mode_id")
+    private Long modeId;
 
     /**
      * 模块名称
      */
-    @TableField("cases_name")
-    private String casesName;
+    @TableField("mode_name")
+    private String modeName;
 
     /**
      * 病历内容

report-service/src/main/java/com/lantone/report/facade/MedAppealInfoManagementFacade.java

@@ -57,10 +57,10 @@ public class MedAppealInfoManagementFacade {
 
     public Boolean addAppealInfo(AddAppealInfoVO addAppealInfoVO) {
 
-        if (addAppealInfoVO.getCasesId() != null) {
+        if (addAppealInfoVO.getModeId() != null) {
             //获取模块名称
-            String casesName = appealInfoFacade.getBaseMapper().getCasesName(addAppealInfoVO.getCasesId());
-            addAppealInfoVO.setCasesName(casesName);
+            String modeName = appealInfoFacade.getBaseMapper().getModeName(addAppealInfoVO.getModeId());
+            addAppealInfoVO.setModeName(modeName);
         }
         switch (addAppealInfoVO.getAppealOperationType()) {
             //删改
@@ -121,11 +121,11 @@ public class MedAppealInfoManagementFacade {
             //新增缺失
             case "2":
                 //补全缺失模块信息
-                if (StringUtil.isNotBlank(addAppealInfoVO.getCasesName())) {
+                if (StringUtil.isNotBlank(addAppealInfoVO.getModeName())) {
                     //获取模块名称
-                    Long casesId = appealInfoFacade.getBaseMapper().getCasesIdByName(addAppealInfoVO.getCasesName());
-                    if (casesId != null) {
-                        addAppealInfoVO.setCasesId(casesId);
+                    Long modeId = appealInfoFacade.getBaseMapper().getModeIdByName(addAppealInfoVO.getModeName());
+                    if (modeId != null) {
+                        addAppealInfoVO.setModeId(modeId);
                     }
                 }
                 //新增申诉记录+审核记录

report-service/src/main/java/com/lantone/report/mapper/AppealInfoMapper.java

@@ -20,6 +20,6 @@ public interface AppealInfoMapper extends BaseMapper<AppealInfo> {
 
     List<AppealExamineRecordDTO> getAppealExamineRecords(@Param("getAppealInfoVO") GetAppealInfoVO getAppealInfoVO);
 
-    String getCasesName(@Param("id") Long id);
-    Long getCasesIdByName(@Param("name") String name);
+    String getModeName(@Param("id") Long id);
+    Long getModeIdByName(@Param("name") String name);
 }

report-service/src/main/java/com/lantone/report/vo/AddAppealInfoVO.java

@@ -49,11 +49,11 @@ public class AddAppealInfoVO {
     @ApiModelProperty(value = "分值(新增已有操作才有值)")
     private BigDecimal value;
 
-    @ApiModelProperty(value = "模块数据标准id")
-    private Long casesId;
+    @ApiModelProperty(value = "模块id")
+    private Long modeId;
 
     @ApiModelProperty(value = "模块名称", hidden = true)
-    private String casesName;
+    private String modeName;
 
 
     @ApiModelProperty(value = "病历内容")

report-service/src/main/java/com/lantone/report/vo/GetAppealReviewVO.java

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

report-service/src/main/java/com/lantone/report/vo/GetComplaintRecordVO.java

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

report-service/src/main/resources/mapper/AppealExamineInfoMapper.xml

@@ -21,7 +21,7 @@
         a.qcresult_detail_id,
         a.cases_entry_id,
         a.qcresult_detail_msg,
-        a.cases_name,
+        a.mode_name,
         a.defect_content,
         a.claimant_id,
         a.check_id,
@@ -32,7 +32,7 @@
         a.qcresult_detai_value qcresultDetaiValue,
         a.cases_score,
         a.is_reject,
-        a.cases_id
+        a.mode_id
         FROM
         `med_appeal_info` a
         LEFT JOIN med_behospital_info b ON a.behospital_code = b.behospital_code
@@ -47,8 +47,8 @@
         <if test="getComplaintRecordVO.complaintDateEnd != null ">
             <![CDATA[ AND a.gmt_create <= #{getComplaintRecordVO.complaintDateEnd}]]>
         </if>
-        <if test="getComplaintRecordVO.casesName != null and getComplaintRecordVO.casesName != '' ">
-            <![CDATA[ AND a.cases_name = #{getComplaintRecordVO.casesName}]]>
+        <if test="getComplaintRecordVO.modeName != null and getComplaintRecordVO.modeName != '' ">
+            <![CDATA[ AND a.mode_name = #{getComplaintRecordVO.modeName}]]>
         </if>
         <if test="getComplaintRecordVO.operationType != null and getComplaintRecordVO.operationType != '' ">
             <![CDATA[ AND a.appeal_operation_type = #{getComplaintRecordVO.operationType}]]>
@@ -94,7 +94,7 @@
         a.qcresult_detail_id,
         a.cases_entry_id,
         a.qcresult_detail_msg,
-        a.cases_name,
+        a.mode_name,
         a.defect_content,
         a.claimant_id,
         a.check_id,
@@ -122,8 +122,8 @@
         <if test="getAppealReviewVO.deptName != null and getAppealReviewVO.deptName != '' ">
             <![CDATA[ AND b.beh_dept_name = #{getAppealReviewVO.deptName}]]>
         </if>
-        <if test="getAppealReviewVO.casesName != null and getAppealReviewVO.casesName != '' ">
-            <![CDATA[ AND a.cases_name = #{getAppealReviewVO.casesName}]]>
+        <if test="getAppealReviewVO.modeName != null and getAppealReviewVO.modeName != '' ">
+            <![CDATA[ AND a.mode_name = #{getAppealReviewVO.modeName}]]>
         </if>
         <if test="getAppealReviewVO.operationType != null and getAppealReviewVO.operationType != '' ">
             <![CDATA[ AND a.appeal_operation_type = #{getAppealReviewVO.operationType}]]>

report-service/src/main/resources/mapper/AppealInfoMapper.xml

@@ -17,8 +17,8 @@
             mbi.leave_hospital_date leaveHospitalDate,
             mbi.doctor_id doctorId,
             mbi.doctor_name doctorName,
-            mai.cases_id casesId,
-            mai.cases_name casesName,
+            mai.mode_id modeId,
+            mai.mode_name modeName,
             mai.defect_content defectContent,
             mai.qcresult_detail_id qcresultDetailId,
             mai.qcresult_detail_msg qcresultDetailMsg,
@@ -33,11 +33,11 @@
             1 = 1
         AND mai.id = #{getAppealInfoVO.id}
     </select>
-    <select id="getCasesName" resultType="java.lang.String">
+    <select id="getModeName" resultType="java.lang.String">
         SELECT
             `name`
         FROM
-            qc_cases
+            qc_mode
         WHERE
             id = #{id}
         AND is_deleted = 'N'
@@ -46,7 +46,7 @@
         SELECT
             mai.id,
             mai.cases_entry_id casesEntryId,
-            mai.cases_entry_name casesEntryName,
+            qce.`name` casesEntryName,
             mai.cases_entry_msg casesEntryMsg,
             mai.`value`,
             mai.claimant_id claimantId,
@@ -96,11 +96,11 @@
         ORDER BY
         mai.gmt_create
     </select>
-    <select id="getCasesIdByName" resultType="java.lang.Long">
+    <select id="getModeIdByName" resultType="java.lang.Long">
         SELECT
             `id`
         FROM
-            qc_cases
+            qc_mode
         WHERE
             name = #{name}
         AND is_deleted = 'N'