Merge branch 'dev/20220105_2.2.0_通用版_申诉驳回' into debug

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -50,6 +51,12 @@ public class AppealExamineInfo implements Serializable {
     @TableField("example_operation")
     private String exampleOperation;
 
+    /**
+     * 审核分值
+     */
+    @TableField("value")
+    private BigDecimal value;
+
     /**
      * 处理结果
      */
@@ -62,6 +69,12 @@ public class AppealExamineInfo implements Serializable {
     @TableField("reject_reason")
     private String rejectReason;
 
+    /**
+     * 提示信息
+     */
+    @TableField("msg")
+    private String msg;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

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

@@ -144,14 +144,14 @@ public class MedAppealExamineInfoManagementFacade {
      * @param getComplaintDetailMsgVO
      * @return
      */
-    public String getComplaintDetailMsg(GetComplaintDetailMsgVO getComplaintDetailMsgVO) {
+    public QcresultDetail getComplaintDetailMsg(GetComplaintDetailMsgVO getComplaintDetailMsgVO) {
         QcresultDetail qcresultDetail = qcresultDetailFacade2.getOne(new QueryWrapper<QcresultDetail>()
                 .eq("behospital_code", getComplaintDetailMsgVO.getBehospitalCode())
                 .eq("id", getComplaintDetailMsgVO.getId())
                 .eq("cases_entry_id", getComplaintDetailMsgVO.getCasesEntryId())
                 .eq("hospital_id", getComplaintDetailMsgVO.getHospitalId())
         );
-        return qcresultDetail.getMsg();
+        return qcresultDetail;
     }
 
 }

report-service/src/main/java/com/lantone/report/web/MedAppealExamineInfoManagementController.java

@@ -7,6 +7,7 @@ import com.lantone.common.api.CommonResult;
 import com.lantone.report.dto.GetAppealInfoDTO;
 import com.lantone.report.dto.GetAppealReviewDTO;
 import com.lantone.report.dto.GetComplaintRecordDTO;
+import com.lantone.report.entity.QcresultDetail;
 import com.lantone.report.facade.MedAppealExamineInfoManagementFacade;
 import com.lantone.report.vo.GetAppealInfoVO;
 import com.lantone.report.vo.GetAppealReviewVO;
@@ -80,7 +81,7 @@ public class MedAppealExamineInfoManagementController {
     @ApiOperation(value = "获取该申诉记录最新缺陷详情[by:zhanghang]",
             notes = "获取该申诉记录最新缺陷详情")
     @PostMapping("/getComplaintDetailMsg")
-    public CommonResult<String> getComplaintDetailMsg(@RequestBody GetComplaintDetailMsgVO getComplaintDetailMsgVO) {
+    public CommonResult<QcresultDetail> getComplaintDetailMsg(@RequestBody GetComplaintDetailMsgVO getComplaintDetailMsgVO) {
         return CommonResult.success(medAppealExamineInfoManagementFacade.getComplaintDetailMsg(getComplaintDetailMsgVO));
     }
 }

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

@@ -64,8 +64,8 @@
             mae.reject_reason rejectReason,
             mae.remark exampleRemark,
             mae.gmt_create appealExamineDate,
-            mqd.msg,
-            mqd.score,
+            mae.msg,
+            mae.`value` score,
             u.linkman claimantName,
             u2.linkman checkName
         FROM
@@ -73,10 +73,6 @@
         LEFT JOIN med_appeal_examine_info mae ON mai.id = mae.appeal_info_id
         LEFT JOIN qc_cases_entry qce ON mai.cases_entry_id = qce.id
         AND qce.is_deleted = "N"
-        LEFT JOIN med_qcresult_detail mqd ON mai.cases_entry_id = mqd.cases_entry_id
-        AND mai.behospital_code = mqd.behospital_code
-        AND mai.hospital_id = mqd.hospital_id
-        AND mqd.is_deleted = "N"
         LEFT JOIN sys_user u ON mai.claimant_id = u.id
         LEFT JOIN sys_user u2 ON mai.check_id = u2.id
         WHERE

report-service/src/main/resources/mapper/base/BaseAppealExamineInfoMapper.xml

@@ -9,8 +9,10 @@
         <result column="check_id" property="checkId"/>
         <result column="example_status" property="exampleStatus"/>
         <result column="example_operation" property="exampleOperation"/>
+        <result column="value" property="value"/>
         <result column="process_result" property="processResult"/>
         <result column="reject_reason" property="rejectReason"/>
+        <result column="msg" property="msg"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>