|
@@ -46,12 +46,12 @@ public class FirstCourseRecordAI extends ModelAI {
|
|
|
//putContent(crfContent, medicalTextType.get(0), firstCourseRecordDoc.getCaseCharacteristicLabel().getText(), Content.case_feature);
|
|
|
//初步诊断
|
|
|
if (StringUtils.isNotEmpty(structureMap.get(Content.initial_diag))) {
|
|
|
- //String initial_diag = CatalogueUtil.removeBetweenWordSpace(structureMap.get(Content.initial_diag));
|
|
|
- String initial_diag = structureMap.get(Content.initial_diag);
|
|
|
+ String initial_diag = CatalogueUtil.removeBetweenWordSpace(structureMap.get(Content.initial_diag));
|
|
|
+ //String initial_diag = structureMap.get(Content.initial_diag);
|
|
|
putContent(crfContent, medicalTextType.get(1), initial_diag, Content.initial_diag);
|
|
|
} else if (firstCourseRecordDoc.getInitialDiagLabel() != null && StringUtil.isNotBlank(firstCourseRecordDoc.getInitialDiagLabel().getText())) {
|
|
|
- //String initial_diag = CatalogueUtil.removeBetweenWordSpace(firstCourseRecordDoc.getInitialDiagLabel().getText());
|
|
|
- String initial_diag = firstCourseRecordDoc.getInitialDiagLabel().getText();
|
|
|
+ String initial_diag = CatalogueUtil.removeBetweenWordSpace(firstCourseRecordDoc.getInitialDiagLabel().getText());
|
|
|
+ //String initial_diag = firstCourseRecordDoc.getInitialDiagLabel().getText();
|
|
|
putContent(crfContent, medicalTextType.get(1), initial_diag, Content.initial_diag);
|
|
|
}
|
|
|
|
|
@@ -59,12 +59,12 @@ public class FirstCourseRecordAI extends ModelAI {
|
|
|
//putContent(crfContent, medicalTextType.get(0), firstCourseRecordDoc.getDiagnosisLabel().getText(), Content.diag_basis);
|
|
|
//鉴别诊断
|
|
|
if (StringUtils.isNotEmpty(structureMap.get("鉴别诊断"))) {
|
|
|
- //String diffDiag = CatalogueUtil.removeBetweenWordSpace(structureMap.get("鉴别诊断"));
|
|
|
- String diffDiag = structureMap.get("鉴别诊断");
|
|
|
+ String diffDiag = CatalogueUtil.removeBetweenWordSpace(structureMap.get("鉴别诊断"));
|
|
|
+ //String diffDiag = structureMap.get("鉴别诊断");
|
|
|
putContent(crfContent, medicalTextType.get(1), diffDiag, "鉴别诊断");
|
|
|
} else if (firstCourseRecordDoc.getDifferentialDiagLabel() != null && StringUtil.isNotBlank(firstCourseRecordDoc.getDifferentialDiagLabel().getText())) {
|
|
|
- //String diffDiag = CatalogueUtil.removeBetweenWordSpace(firstCourseRecordDoc.getDifferentialDiagLabel().getText());
|
|
|
- String diffDiag = firstCourseRecordDoc.getDifferentialDiagLabel().getText();
|
|
|
+ String diffDiag = CatalogueUtil.removeBetweenWordSpace(firstCourseRecordDoc.getDifferentialDiagLabel().getText());
|
|
|
+ //String diffDiag = firstCourseRecordDoc.getDifferentialDiagLabel().getText();
|
|
|
putContent(crfContent, medicalTextType.get(1), diffDiag, "鉴别诊断");
|
|
|
}
|
|
|
//诊疗计划
|