Merge remote-tracking branch 'origin/master'

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

@@ -435,12 +435,17 @@ public class CommonFacade {
                     pacsResList.add(itemPart);
                 }
 
-                // 描述 + 修饰循环放入
+                // 描述 + 修饰、 修饰 + 描述 循环放入
                 for (Modification modification : pacs.getModification()) {
                     Item itemModification = new Item();
                     itemModification.setName(pacs.getName() + modification.getName());
                     itemModification.setUniqueName(pacs.getStandName() + modification.getStandName());
                     pacsResList.add(itemModification);
+
+                    Item itemModificationRe = new Item();
+                    itemModificationRe.setName(modification.getName() + pacs.getName());
+                    itemModificationRe.setUniqueName(modification.getStandName() + pacs.getStandName());
+                    pacsResList.add(itemModificationRe);
                 }
             }
         }

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

@@ -791,7 +791,7 @@ public class TestFacade {
             indicationPushVO.setPacs(pacs);
             //诊断"腹部CT"
             String disease = bean.getDisease();
-            String[] physiquedisease = pacsAll.split("，");
+            String[] physiquedisease = disease.split("，");
             List<Item> diag = new ArrayList<>();
             for (String diseaseStr : physiquedisease) {
                 Item item = new Item();