@@ -41,7 +41,7 @@ public class BEH0026 extends QCCatalogue {
String pastText = pastLabel.getText();
if (pastText.contains("食物过敏史") || pastText.contains("食物、药物过敏") || pastText.contains("详见") ||
pastText.contains("见旧病历") || pastText.contains("见既往病历") || pastText.contains("食物药物过敏史")
- || pastText.contains("食物及药物过敏史")) {
+ || pastText.contains("食物及药物过敏史") || pastText.contains("食物、药物及其他过敏")) {
status.set("0");
return;
}
@@ -37,7 +37,7 @@ public class BEH0034 extends QCCatalogue {
.filter(i ->
i != null && StringUtil.isNotBlank(i.getName()) && i.getNegative() == null
&& !"手术史".equals(i.getName()) && !"手术".equals(i.getName()) && !"手术治疗".equals(i.getName())
- && !"手术无手术史".equals(i.getName())
+ && !"手术无手术史".equals(i.getName())&& !"手术处理".equals(i.getName())&& !"其他手术史".equals(i.getName())
)
.map(i -> i.getName())
.distinct()
@@ -32,7 +32,8 @@ public class BEH0036 extends QCCatalogue {
if (operation == null || StringUtil.isBlank(operation.getName())) {
continue;
- if ("手术史".equals(operation.getName()) || "手术".equals(operation.getName()) || "手术治疗".equals(operation.getName()) || "手术无手术史".equals(operation.getName())) {
+ if ("手术史".equals(operation.getName()) || "其他手术史".equals(operation.getName()) || "手术".equals(operation.getName())
+ || "手术治疗".equals(operation.getName()) || "手术无手术史".equals(operation.getName()) || "手术处理".equals(operation.getName())) {
if ((operation.getNegative() == null || StringUtil.isBlank(operation.getNegative().getName()))
@@ -80,7 +80,7 @@ public class BEH0058 extends QCCatalogue {
if (StringUtil.isNotBlank(maritalText)) {
List<String> words = Lists.newArrayList("未婚", "未育", "未婚育", "未生育", "未生", "0子0女"
- , "0-0-0-0", "详见", "0-0-0-0");
+ , "0-0-0-0", "详见", "0-0-0-0","无子女");
for (String word : words) {
if (maritalText.contains(word)) {
- && !"手术无手术史".equals(i.getName()) && !"手术处理".equals(i.getName())
+ && !"手术无手术史".equals(i.getName()) && !"手术处理".equals(i.getName()) && !"其他手术史".equals(i.getName())
@@ -44,7 +44,8 @@ public class XyCrisisValueReportHtmlAnalysis implements XyHtmlAnalysis {
if (bigDivElement.selectFirst("hr") != null) {
bigDivElement.selectFirst("hr").previousElementSiblings().remove();
- String text = XyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+ String text = XyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true)
+ .replace("956", "μ");
XyCommonAnalysisUtil.extractWardInfo(recTitle,text, map);
String bqjlText = "病情记录" + map.get("病情记录");
List<String> titles = Lists.newArrayList(