|
@@ -38,13 +38,14 @@ public class FIRP0178 extends QCCatalogue {
|
|
|
if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getLeaveHospitalDoc() != null) {
|
|
|
Map<String, Object> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();
|
|
|
List<Map<String, String>> dischargeDiag = (List) firstpageStructureMap.get(Content.dischargeDiag);
|
|
|
+ String opcNum = (String) firstpageStructureMap.get("门急诊诊断编码");
|
|
|
if (ListUtil.isEmpty(dischargeDiag)) {
|
|
|
return;
|
|
|
}
|
|
|
/* 病案首页出院小结诊断 除去主诊断*/
|
|
|
- List<String> firstpageLeaveDiags = getFirstPageDiag(dischargeDiag);
|
|
|
+ List<String> firstpageLeaveDiags = getFirstPageDiag(dischargeDiag, opcNum);
|
|
|
if (ListUtil.isEmpty(firstpageLeaveDiags)) {
|
|
|
- return ;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
DiagLabel leaveDiagLabel = inputInfo.getLeaveHospitalDoc().getLeaveDiagLabel();
|
|
@@ -78,10 +79,13 @@ public class FIRP0178 extends QCCatalogue {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private List<String> getFirstPageDiag(List<Map<String, String>> dischargeDiag) {
|
|
|
+ private List<String> getFirstPageDiag(List<Map<String, String>> dischargeDiag, String opcNum) {
|
|
|
List<String> firstpageDiag = new ArrayList<>();
|
|
|
for (int i = 0; i < dischargeDiag.size(); i++) {
|
|
|
- if ("门诊诊断".equals(dischargeDiag.get(i).get("诊断类别"))) {
|
|
|
+ if ("门急诊诊断".equals(dischargeDiag.get(i).get("诊断类别"))) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (StringUtil.isNotBlank(opcNum) && opcNum.equals(dischargeDiag.get(i).get("诊断编码"))) {
|
|
|
continue;
|
|
|
}
|
|
|
String diagnoseName = dischargeDiag.get(i).get(Content.diagnoseName);
|