Browse Source

增加申诉条目的判断,增加申诉理由

wangsy 1 month ago
parent
commit
4f2f40c894

+ 5 - 0
src/main/java/com/diagbot/dto/MsgApiDTO.java

@@ -69,6 +69,10 @@ public class MsgApiDTO {
     private String remark;
     // 条目id对应页面数据的key值
     private List<Long> pageKeyList = new ArrayList<>();
+    //是否申诉条目
+    private String isAppealEntry = "0";
+    // 申诉理由
+    private String appealExplain;
 
     @ApiModelProperty("申诉条目id")
     private Long appealInfoId = 0L;
@@ -84,4 +88,5 @@ public class MsgApiDTO {
 
     @ApiModelProperty(value = "审核时间")
     private Date exampleDate;
+
 }

+ 36 - 0
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -77,6 +77,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     MedRejectedInfoFacade medRejectedInfoFacade;
     @Autowired
+    MedAppealInfoFacade medAppealInfoFacade;
+    @Autowired
     StrConsultationApplyFacade strConsultationApplyFacade;
     @Autowired
     StrConsultationResultFacade strConsultationResultFacade;
@@ -280,6 +282,23 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     msgApiDTO.setCasesEntryStatus(2); //已通过条目
                 });
 //                msgApiDTOStatusAlreadyPassedList = BeanUtil.listCopyTo(msgApiDTOList, MsgApiDTO.class);
+            } else if ("5".equals(behospitalInfo.getStatus())) { // 已申诉
+                List<MedAppealInfo> medAppealInfos = medAppealInfoFacade.list(new QueryWrapper<MedAppealInfo>()
+                .eq("hospital_id", hospitalId)
+                .eq("behospital_code", behospitalInfo.getBehospitalCode())
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByDesc("gmt_create"));
+                if (ListUtil.isNotEmpty(medAppealInfos)) {
+                    msgApiDTOList.forEach(msgApiDTO -> {
+                        for (MedAppealInfo medAppealInfo : medAppealInfos) {
+                            if (msgApiDTO.getCasesEntryId().equals(medAppealInfo.getCasesEntryId())) {
+                                msgApiDTO.setIsAppealEntry("1");//申诉条目
+                                msgApiDTO.setAppealExplain(medAppealInfo.getAppealExplain());
+                                msgApiDTO.setCasesEntryStatus(5);
+                            }
+                        }
+                    });
+                }
             }
 
 //            res.put("Rejected", msgApiDTOStatusRejectedList);
@@ -1705,6 +1724,23 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     }
                 });
             }
+        } else if ("5".equals(behospitalInfo.getStatus())) { // 已申诉
+            List<MedAppealInfo> medAppealInfos = medAppealInfoFacade.list(new QueryWrapper<MedAppealInfo>()
+                    .eq("hospital_id", hospitalId)
+                    .eq("behospital_code", behospitalInfo.getBehospitalCode())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .orderByDesc("gmt_create"));
+            if (ListUtil.isNotEmpty(medAppealInfos)) {
+                msgApiDTOList.forEach(msgApiDTO -> {
+                    for (MedAppealInfo medAppealInfo : medAppealInfos) {
+                        if (msgApiDTO.getCasesEntryId().equals(medAppealInfo.getCasesEntryId())) {
+                            msgApiDTO.setIsAppealEntry("1");//申诉条目
+                            msgApiDTO.setAppealExplain(medAppealInfo.getAppealExplain());
+                            msgApiDTO.setCasesEntryStatus(5);
+                        }
+                    }
+                });
+            }
         }
 
         Map<String, List<MsgApiDTO>> newMsgMap = msgApiDTOList.stream()