|
@@ -5,11 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.diagbot.dto.*;
|
|
|
-import com.diagbot.entity.KlConcept;
|
|
|
-import com.diagbot.entity.KlConceptDetail;
|
|
|
-import com.diagbot.entity.KlConceptScale;
|
|
|
-import com.diagbot.entity.KlConceptStatic;
|
|
|
-import com.diagbot.entity.KlRelation;
|
|
|
+import com.diagbot.entity.*;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.enums.LexiconEnum;
|
|
|
import com.diagbot.enums.StatusEnum;
|
|
@@ -65,6 +61,10 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
private KlDictionaryInfoFacade klDictionaryInfoFacade;
|
|
|
@Autowired
|
|
|
private KlScaleFacade klScaleFacade;
|
|
|
+ @Autowired
|
|
|
+ private KlClassicCaseFacade klClassicCaseFacade;
|
|
|
+ @Autowired
|
|
|
+ private KlCaseDetailFacade klCaseDetailFacade;
|
|
|
|
|
|
@Autowired
|
|
|
@Qualifier("klConceptDetailServiceImpl")
|
|
@@ -794,7 +794,15 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("status", 1)
|
|
|
.in("concept_id", conceptIds));
|
|
|
-
|
|
|
+ List<KlClassicCase> caseList = klClassicCaseFacade.list(new QueryWrapper<KlClassicCase>()
|
|
|
+ .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .eq("status", 1)
|
|
|
+ .in("concept_id", conceptIds));
|
|
|
+ for (KlClassicCase record : caseList) {
|
|
|
+ KlConceptStatic klConceptStatic = new KlConceptStatic();
|
|
|
+ BeanUtil.copyProperties(record,klConceptStatic);
|
|
|
+ staticList.add(klConceptStatic);
|
|
|
+ }
|
|
|
if (ListUtil.isEmpty(staticList)) {
|
|
|
return retMap;
|
|
|
}
|
|
@@ -813,6 +821,16 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
|
|
|
});
|
|
|
}
|
|
|
List<KlConceptDetail> conceptDetailList = klConceptDetailFacade.list(conceptDetailQueryWrapper);
|
|
|
+
|
|
|
+ QueryWrapper<KlCaseDetail> caseDetailQueryWrapper = new QueryWrapper<>();
|
|
|
+ caseDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
+ .in("concept_id", conceptIds);
|
|
|
+ List<KlCaseDetail> caseDetailList = klCaseDetailFacade.list(caseDetailQueryWrapper);
|
|
|
+ for (KlCaseDetail caseDetail : caseDetailList) {
|
|
|
+ KlConceptDetail klConceptDetail = new KlConceptDetail();
|
|
|
+ BeanUtil.copyProperties(caseDetail,klConceptDetail);
|
|
|
+ conceptDetailList.add(klConceptDetail);
|
|
|
+ }
|
|
|
Map<Long, List<KlConceptDetail>> detailMap
|
|
|
= EntityUtil.makeEntityListMap(conceptDetailList, "conceptId");
|
|
|
|