申诉审核v2.2.0审核相关功能细节调整

src/main/java/com/diagbot/enums/AppealOperationTypeEnum.java

@@ -12,7 +12,7 @@ public enum AppealOperationTypeEnum {
 
     UP_OR_DEL("0", "删改"),
     ADD_EXIST("1", "新增已有"),
-    ADD_NO_EXIST("2", "新增未有"),
+    ADD_NO_EXIST("2", "新增缺失"),
     RECOVER("3", "恢复");
 
     @Getter

src/main/java/com/diagbot/enums/ExampleOperationEnum.java

@@ -0,0 +1,44 @@
+package com.diagbot.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 审核状态
+ * @author: gaodm
+ * @time: 2018/9/3 16:01
+ */
+public enum ExampleOperationEnum {
+    UP_OR_UP("1", "修改"),
+    UP_OR_DEL("2", "删除"),
+    ADD_EXIST("3", "新增已有"),
+    ADD_NO_EXIST("4", "新增缺失"),
+    RECOVER("5", "恢复");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    ExampleOperationEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ExampleOperationEnum getEnum(String key) {
+        for (ExampleOperationEnum item : ExampleOperationEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        ExampleOperationEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

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

@@ -9,6 +9,8 @@ import com.diagbot.entity.MedAppealExamineInfo;
 import com.diagbot.entity.MedAppealInfo;
 
 import com.diagbot.entity.QcresultDetail;
+import com.diagbot.enums.ExampleOperationEnum;
+import com.diagbot.enums.ExampleStatusEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -53,7 +55,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
         optResultAlgVO.setExplainInfo(approvedVo.getRemark());
         //获取处理方式
         String handling = approvedVo.getExampleOperation();
-        if(StringUtil.isNotEmpty(handling) && handling.equals("删除")){
+        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.UP_OR_DEL.getName())){
             //调用删除接口
             optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
             qcresultVO.setOptResultAlgVO(optResultAlgVO);
@@ -63,8 +65,8 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
             if(analyzeDTORespDTO.getIsSuccess()){
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
-                medAppealExamineInfo.setExampleOperation("2");
-                medAppealExamineInfo.setExampleStatus("2");
+                medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.UP_OR_DEL.getKey());
+                medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
                 medAppealExamineInfo.setRemark(approvedVo.getRemark());
                 boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -80,7 +82,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "删除失败!");
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals("修改")){
+        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.UP_OR_UP.getName())){
             //调用修改接口
             optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
             qcresultVO.setOptResultAlgVO(optResultAlgVO);
@@ -89,8 +91,8 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
             if(analyzeDTORespDTO.getIsSuccess()){
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
-                medAppealExamineInfo.setExampleOperation("1");
-                medAppealExamineInfo.setExampleStatus("2");
+                medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.UP_OR_UP.getKey());
+                medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
                 medAppealExamineInfo.setRemark(approvedVo.getRemark());
                 boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -106,7 +108,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "修改失败!");
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals("新增已有")){
+        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.ADD_EXIST.getName())){
             optResultAlgVO.setCasesEntryId(approvedVo.getCasesEntryId());
             qcresultVO.setOptResultAlgVO(optResultAlgVO);
             //判断是否已存在该条目
@@ -136,8 +138,8 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                         .eq("check_id", approvedVo.getAppealId())
                 );
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
-                medAppealExamineInfo.setExampleOperation("3");
-                medAppealExamineInfo.setExampleStatus("2");
+                medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.ADD_EXIST.getKey());
+                medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
                 medAppealExamineInfo.setRemark(approvedVo.getRemark());
                 boolean update1 = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -153,7 +155,7 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "新增失败!");
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals("恢复")){
+        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.RECOVER.getName())){
             optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
             qcresultVO.setOptResultAlgVO(optResultAlgVO);
             qcresultVO.setType(4);
@@ -163,8 +165,8 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
             if(analyzeDTORespDTO.getIsSuccess()){
                 Boolean appealInfo = updateAppealInfo(approvedVo);
                 MedAppealExamineInfo medAppealExamineInfo = new MedAppealExamineInfo();
-                medAppealExamineInfo.setExampleOperation("5");
-                medAppealExamineInfo.setExampleStatus("2");
+                medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.RECOVER.getKey());
+                medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
                 medAppealExamineInfo.setRemark(approvedVo.getRemark());
                 boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -180,14 +182,14 @@ public class MedAppealExamineInfoManagementFacade extends MedAppealExamineInfoSe
                 throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED, "恢复失败!");
             }
         }
-        if(StringUtil.isNotEmpty(handling) && handling.equals("新增缺失")){
+        if(StringUtil.isNotEmpty(handling) && handling.equals(ExampleOperationEnum.ADD_NO_EXIST.getName())){
             optResultAlgVO.setCasesEntryId(approvedVo.getQcresultDetailId());
             qcresultVO.setOptResultAlgVO(optResultAlgVO);
             qcresultVO.setDelStatus(0);
             Boolean appealInfo = updateAppealInfo(approvedVo);
             MedAppealExamineInfo medAppealExamineInfo= new MedAppealExamineInfo();
-            medAppealExamineInfo.setExampleOperation("4");
-            medAppealExamineInfo.setExampleStatus("2");
+            medAppealExamineInfo.setExampleOperation(ExampleOperationEnum.ADD_NO_EXIST.getKey());
+            medAppealExamineInfo.setExampleStatus(ExampleStatusEnum.ADOPT_EXAMPLE.getKey());
             medAppealExamineInfo.setProcessResult(approvedVo.getProcessResult());
             boolean update = this.update(medAppealExamineInfo, new UpdateWrapper<MedAppealExamineInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())