申诉审核v2.2.0审核通过细节修改

src/main/java/com/diagbot/facade/MedAppealExamineInfoManagementFacade.java

@@ -48,18 +48,19 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
         QcresultVO qcresultVO = new QcresultVO();
         qcresultVO.setBehospitalCode(approvedVo.getBehospitalCode());
         qcresultVO.setHospitalId(approvedVo.getHospitalId());
-        QcResultAlgVO optResultAlgVO = approvedVo.getOptResultAlgVO();
-        optResultAlgVO.setCasesId(approvedVo.getCasesId());
-        optResultAlgVO.setScore(approvedVo.getValue());
-        optResultAlgVO.setMsg(approvedVo.getCasesEntryMsg());
-        optResultAlgVO.setExplainInfo(approvedVo.getRemark());
+        QcResultAlgVO qcResultAlgVO = approvedVo.getQcResultAlgVO();
+        qcresultVO.setOptResultAlgVO(qcResultAlgVO);
+//        optResultAlgVO.setCasesId(approvedVo.getCasesId());
+//        optResultAlgVO.setScore(approvedVo.getValue());
+//        optResultAlgVO.setMsg(approvedVo.getCasesEntryMsg());
+//        optResultAlgVO.setExplainInfo(approvedVo.getRemark());
         //获取处理方式
         String handling = approvedVo.getExampleOperation();
         if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.UP_OR_DEL.getKey())){
             //调用删除接口
-            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
-            qcresultVO.setOptResultAlgVO(optResultAlgVO);
-            qcresultVO.setDelStatus(1);
+            //optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
+//            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+            qcresultVO.setDelStatus(0);
             qcresultVO.setType(4);
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
             if(analyzeDTORespDTO.getIsSuccess()){
@@ -67,7 +68,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
                 medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.UP_OR_DEL.getKey());
                 medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
-                medAppealExamineInfo.setRemark(approvedVo.getRemark());
+                medAppealExamineInfo.setRemark(qcResultAlgVO.getExplainInfo());
                 boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("appeal_info_id", approvedVo.getId())
@@ -84,8 +85,8 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
         }
         if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.UP_OR_UP.getKey())){
             //调用修改接口
-            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
-            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+//            qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
+//            qcresultVO.setOptResultAlgVO(optResultAlgVO);
             qcresultVO.setType(3);
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
             if(analyzeDTORespDTO.getIsSuccess()){
@@ -93,7 +94,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
                 medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.UP_OR_UP.getKey());
                 medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
-                medAppealExamineInfo.setRemark(approvedVo.getRemark());
+                medAppealExamineInfo.setRemark(qcResultAlgVO.getExplainInfo());
                 boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("appeal_info_id", approvedVo.getId())
@@ -109,14 +110,14 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
             }
         }
         if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.ADD_EXIST.getKey())){
-            optResultAlgVO.setCasesEntryId(approvedVo.getCasesEntryId());
-            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+            //optResultAlgVO.setCasesEntryId(approvedVo.getCasesEntryId());
+//            qcresultVO.setOptResultAlgVO(optResultAlgVO);
             //判断是否已存在该条目
             QcresultDetail qcresultDetail = qcresultDetailFacade.getOne(new QueryWrapper<QcresultDetail>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("hospital_id", approvedVo.getHospitalId())
                     .eq("behospital_code", approvedVo.getBehospitalCode())
-                    .eq("cases_entry_id", approvedVo.getCasesEntryId())
+                    .eq("cases_entry_id", qcResultAlgVO.getCasesEntryId())
             );
             if(qcresultDetail!=null){
                 throw new CommonException(CommonErrorCode.IS_EXISTS, "该条目已存在!");
@@ -127,10 +128,10 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
             if(analyzeDTORespDTO.getIsSuccess()){
                 MedAppealInfo medAppealInfo = new MedAppealInfo();
-                medAppealInfo.setCasesEntryId(approvedVo.getCasesEntryId());
-                medAppealInfo.setCasesEntryMsg(approvedVo.getCasesEntryMsg());
+                medAppealInfo.setCasesEntryId(qcResultAlgVO.getCasesEntryId());
+                medAppealInfo.setCasesEntryMsg(qcResultAlgVO.getMsg());
                 medAppealInfo.setCasesEntryName(approvedVo.getCasesEntryName());
-                medAppealInfo.setValue(approvedVo.getValue());
+                medAppealInfo.setValue(qcResultAlgVO.getScore());
                 boolean update = medAppealInfoManagementFacade.update(medAppealInfo, new UpdateWrapper<MedAppealInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("hospital_id", approvedVo.getHospitalId())
@@ -140,7 +141,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
                 medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.ADD_EXIST.getKey());
                 medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
-                medAppealExamineInfo.setRemark(approvedVo.getRemark());
+                medAppealExamineInfo.setRemark(qcResultAlgVO.getExplainInfo());
                 boolean update1 = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("appeal_info_id", approvedVo.getId())
@@ -156,10 +157,10 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
             }
         }
         if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.RECOVER.getKey())){
-            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
-            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+//            qcResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
+//            qcresultVO.setOptResultAlgVO(qcResultAlgVO);
             qcresultVO.setType(4);
-            qcresultVO.setDelStatus(0);
+            qcresultVO.setDelStatus(1);
             //调用删除接口
             AnalyzeDTO analyzeDTORespDTO = qcresultInfoFacade.changeQcResult(qcresultVO);
             if(analyzeDTORespDTO.getIsSuccess()){
@@ -167,7 +168,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
                 medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.RECOVER.getKey());
                 medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
-                medAppealExamineInfo.setRemark(approvedVo.getRemark());
+                medAppealExamineInfo.setRemark(qcResultAlgVO.getExplainInfo());
                 boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                         .eq("appeal_info_id", approvedVo.getId())
@@ -183,9 +184,9 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
             }
         }
         if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.ADD_NO_EXIST.getKey())){
-            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
-            qcresultVO.setOptResultAlgVO(optResultAlgVO);
-            qcresultVO.setDelStatus(0);
+//            optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
+//            qcresultVO.setOptResultAlgVO(optResultAlgVO);
+//            qcresultVO.setDelStatus(1);
             Boolean appealInfo = updateAppealInfo(approvedVo);
             MedAppealExamineInfo medAppealExamineInfo= new MedAppealExamineInfo();
             medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.ADD_NO_EXIST.getKey());

src/main/java/com/diagbot/vo/ApprovedVo.java

@@ -40,26 +40,26 @@ public class ApprovedVo {
     @ApiModelProperty(value = "处理结果",required = true)
     private String processResult;
 
-    @ApiModelProperty(value = "申诉模块",required = true)
-    private Long casesId;
-
-    @ApiModelProperty(value = "质控缺陷ID")
-    private Long qcresultDetailId;
-
-    @ApiModelProperty(value = "条目ID")
-    private Long casesEntryId;
-
+//    @ApiModelProperty(value = "申诉模块",required = true)
+//    private Long casesId;
+//
+//    @ApiModelProperty(value = "质控缺陷ID")
+//    private Long qcresultDetailId;
+//
+//    @ApiModelProperty(value = "条目ID")
+//    private Long casesEntryId;
+//
     @ApiModelProperty(value = "质控条目")
     private String casesEntryName;
-
-    @ApiModelProperty(value = "提示信息")
-    private String casesEntryMsg;
-
-    @ApiModelProperty(value = "分值")
-    private BigDecimal value;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
+//
+//    @ApiModelProperty(value = "提示信息")
+//    private String casesEntryMsg;
+//
+//    @ApiModelProperty(value = "分值")
+//    private BigDecimal value;
+//
+//    @ApiModelProperty(value = "备注")
+//    private String remark;
 
     @ApiModelProperty(hidden = true)
     private Integer type;
@@ -68,5 +68,5 @@ public class ApprovedVo {
     private Integer delStatus;
 
     @ApiModelProperty(value = "操作条目")
-    private QcResultAlgVO optResultAlgVO;
+    private QcResultAlgVO qcResultAlgVO;
 }