web : 修改诊断详情功能：初步诊断结果，正式诊断结果，鉴别依据展示病历中配置的数据并对学生选中的诊断数据进行标识(原本展示学生选中的诊断数据，并对正确的诊断数据进行标识)

virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java

@@ -221,7 +221,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
                 r.getRecordId(), functionCorrect.apply(r));
 
         // 这里的recordId只为了展示用diseasePhysical.getId()代替。只是为展示使用correct的值固定为不正确
-        Function<DiseasePhysicalResVo,BasisDiagnosisNodeResVO> t2 = diseasePhysical -> new BasisDiagnosisNodeResVO(1, diseasePhysical.getToolName(),
+        Function<DiseasePhysicalResVo,BasisDiagnosisNodeResVO> t2 = diseasePhysical -> new BasisDiagnosisNodeResVO(1,
+                diseasePhysical.getToolName() + (StrUtil.isEmpty(diseasePhysical.getLocationName())? "" : "|"+ diseasePhysical.getLocationName()),
                 diseasePhysical.getId(), 0);
 
         return mergeListsBasedOnCondition(physicalRecordList, diseasePhysicalResVos,biFunction, t1, t2);
@@ -320,13 +321,17 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
 
         // 根据定义的条件合并列表
         for (M m : poolList) {
+            boolean find = false;
             for (T t : simpleList) {
                 if (biFunction.apply(t, m)) {
                     rs.add(t1.apply(t));
+                    find = true;
                     break;
                 }
             }
-            rs.add(t2.apply(m));
+            if (!find){
+                rs.add(t2.apply(m));
+            }
         }
 
         return rs;