|
|
@@ -71,7 +71,6 @@ public class CommonFacade {
|
|
|
|
|
|
//组装好的label
|
|
|
public WordCrfDTO crf_process(SearchData searchData) {
|
|
|
-
|
|
|
AIAnalyze aiAnalyze = new AIAnalyze(crfServiceClient);
|
|
|
WordCrfDTO wordCrfDTO = new WordCrfDTO();
|
|
|
wordCrfDTO.setHospitalId(searchData.getHospitalId());
|
|
|
@@ -259,8 +258,8 @@ public class CommonFacade {
|
|
|
VitalLabel vitalLabel = wordCrfDTO.getVitalLabel();
|
|
|
|
|
|
// 【症状回填】
|
|
|
-// CoreUtil.setPropertyList(chiefLabel.getClinicals(), map.get(StandConvertEnum.symptom.toString()));
|
|
|
-// CoreUtil.setPropertyList(presentLabel.getClinicals(), map.get(StandConvertEnum.symptom.toString()));
|
|
|
+ CoreUtil.setPropertyList(chiefLabel.getClinicals(), map.get(StandConvertEnum.symptom.toString()));
|
|
|
+ CoreUtil.setPropertyList(presentLabel.getClinicals(), map.get(StandConvertEnum.symptom.toString()));
|
|
|
|
|
|
// 【诊断回填】
|
|
|
// 1、主诉诊断
|
|
|
@@ -361,7 +360,7 @@ public class CommonFacade {
|
|
|
chiefSymptom = chiefLabel.getClinicals().stream().filter(x -> x.getNegative() == null).map(z -> z.getStandName()).collect(Collectors.toList());
|
|
|
List<Symptom> cjiefClinicals = chiefLabel.getClinicals().stream().filter(x -> x.getNegative() == null).map(z ->
|
|
|
{
|
|
|
- String name_sy = z.getBodyPart() == null? z.getStandName() : z.getBodyPart().getName()+z.getStandName();
|
|
|
+ String name_sy = z.getBodyPart() == null ? z.getStandName() : z.getBodyPart().getName() + z.getStandName();
|
|
|
Symptom symptom = new Symptom();
|
|
|
symptom.setName(name_sy);
|
|
|
return symptom;
|
|
|
@@ -394,7 +393,7 @@ public class CommonFacade {
|
|
|
List<Symptom> presentClinicals = presentLabel.getClinicals().stream()
|
|
|
.filter(x -> x.getNegative() == null).map(z ->
|
|
|
{
|
|
|
- String name_sy = z.getBodyPart() == null? z.getStandName() : z.getBodyPart().getName()+z.getStandName();
|
|
|
+ String name_sy = z.getBodyPart() == null ? z.getStandName() : z.getBodyPart().getName() + z.getStandName();
|
|
|
Symptom symptom = new Symptom();
|
|
|
symptom.setName(name_sy);
|
|
|
return symptom;
|
zhoutg