|
@@ -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()
|