Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/CommonFacade.java

@@ -335,8 +335,9 @@ public class CommonFacade {
             if (ListUtil.isNotEmpty(chiefLabel.getClinicals())) {
                 List<Symptom> cjiefClinicals = chiefLabel.getClinicals().stream().filter(x -> x.getNegative() == null).map(z ->
                 {
+                    String name_sy = z.getBodyPart() == null? z.getStandName() : z.getBodyPart().getName()+z.getStandName();
                     Symptom symptom = new Symptom();
-                    symptom.setName(z.getStandName());
+                    symptom.setName(name_sy);
                     return symptom;
                 }).collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(cjiefClinicals)) {
@@ -366,8 +367,9 @@ public class CommonFacade {
                 List<Symptom> presentClinicals = presentLabel.getClinicals().stream()
                         .filter(x -> x.getNegative() == null).map(z ->
                         {
+                            String name_sy = z.getBodyPart() == null? z.getStandName() : z.getBodyPart().getName()+z.getStandName();
                             Symptom symptom = new Symptom();
-                            symptom.setName(z.getStandName());
+                            symptom.setName(name_sy);
                             return symptom;
                         }).collect(Collectors.toList());
                 presentPushVo.setSymptoms(presentClinicals);