|
@@ -41,10 +41,14 @@ public class FIRC0087 extends QCCatalogue {
|
|
if (differentialDiagLabel != null) {
|
|
if (differentialDiagLabel != null) {
|
|
Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
|
|
Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
|
|
String diffDiagStruct = structureMap.get("鉴别诊断");
|
|
String diffDiagStruct = structureMap.get("鉴别诊断");
|
|
- if (StringUtil.isNotBlank(diffDiagStruct) && (diffDiagStruct.contains("诊断明确") || diffDiagStruct.contains("无需鉴别")
|
|
|
|
- || diffDiagStruct.contains("明确诊断"))) {
|
|
|
|
|
|
+ if(StringUtils.isNotEmpty(diffDiagStruct)){
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+ /*if (StringUtil.isNotBlank(diffDiagStruct) && (diffDiagStruct.contains("诊断明确") || diffDiagStruct.contains("无需鉴别")
|
|
|
|
+ || diffDiagStruct.contains("明确诊断"))) {
|
|
|
|
+ return;
|
|
|
|
+ }*/
|
|
|
|
+
|
|
//List<Diag> diags = differentialDiagLabel.getDiags();
|
|
//List<Diag> diags = differentialDiagLabel.getDiags();
|
|
String diag = initDiagLabel.getDiags().get(0).getHospitalDiagName();
|
|
String diag = initDiagLabel.getDiags().get(0).getHospitalDiagName();
|
|
String casechar = casecharLabel.getText();
|
|
String casechar = casecharLabel.getText();
|