|
|
@@ -431,7 +431,7 @@ public class ReportCollectService {
|
|
|
|
|
|
JsonNode sr = opencodeSection(pdfText, fileName,
|
|
|
"只提取 summary 和 diseaseRisks 两部分,其余字段不返回",
|
|
|
- "{\"summary\":{\"overallScore\":0,\"gutHealthScore\":0,\"chronicDiseaseScore\":0,\"nutritionScore\":0,\"balanceScore\":0,\"diversityScore\":0,\"beneficialScore\":0,\"harmfulScore\":0,\"coreGenusScore\":0,\"gutAge\":\"\",\"gutType\":\"\",\"shannonIndex\":\"\",\"reportNumber\":\"\",\"reportDate\":\"yyyy-MM-dd\",\"personName\":\"\",\"gender\":\"\",\"age\":0,\"birthday\":\"\"},\"diseaseRisks\":[{\"diseaseName\":\"\",\"riskValue\":\"\",\"riskLevel\":\"\"}]}");
|
|
|
+ "{\"summary\":{\"overallScore\":0,\"gutHealthScore\":0,\"chronicDiseaseScore\":0,\"nutritionScore\":0,\"balanceScore\":0,\"diversityScore\":0,\"beneficialScore\":0,\"harmfulScore\":0,\"coreGenusScore\":0,\"gutAge\":\"\",\"gutType\":\"\",\"gutStatusLevel\":\"\",\"shannonIndex\":\"\",\"reportNumber\":\"\",\"reportDate\":\"yyyy-MM-dd\",\"personName\":\"\",\"gender\":\"\",\"age\":0,\"birthday\":\"\"},\"diseaseRisks\":[{\"diseaseName\":\"\",\"riskValue\":\"\",\"riskLevel\":\"\",\"relatedBacteria\":[{\"bacteria\":\"\",\"correlation\":\"\",\"value\":\"\",\"status\":\"\"}]}]}");
|
|
|
if (sr != null) {
|
|
|
if (sr.has("summary") && !sr.get("summary").isNull()) {
|
|
|
payload.setSummary(objectMapper.convertValue(sr.get("summary"), ParsedReportPayload.Summary.class));
|
|
|
@@ -701,6 +701,7 @@ public class ReportCollectService {
|
|
|
report.setCoreGenusScore(s.getCoreGenusScore());
|
|
|
report.setGutAge(s.getGutAge());
|
|
|
report.setGutType(s.getGutType());
|
|
|
+ report.setGutStatusLevel(s.getGutStatusLevel());
|
|
|
report.setShannonIndex(s.getShannonIndex());
|
|
|
report.setReportNumber(s.getReportNumber());
|
|
|
report.setPersonName(s.getPersonName());
|
|
|
@@ -816,6 +817,13 @@ public class ReportCollectService {
|
|
|
dr.setDiseaseName(pr.getDiseaseName());
|
|
|
dr.setRiskValue(pr.getRiskValue());
|
|
|
dr.setRiskLevel(pr.getRiskLevel());
|
|
|
+ if (pr.getRelatedBacteria() != null && !pr.getRelatedBacteria().isEmpty()) {
|
|
|
+ try {
|
|
|
+ dr.setRelatedBacteria(objectMapper.writeValueAsString(pr.getRelatedBacteria()));
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("序列化相关菌失败: {}", e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
risks.add(dr);
|
|
|
}
|
|
|
return risks;
|