Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/aggregate/AssembleAggregate.java

@@ -487,20 +487,20 @@ public class AssembleAggregate {
                     || StringUtil.isNotBlank(drugRecord.getUniqueName())) {
                 convertDrug.add(drugRecord);
             } else {
-                Map<String, Long> uniqueNameMap = new HashMap<>();
-                if (StringUtil.isBlank(drugRecord.getForm())) {
-                    drugRecord.setForm("");
-                }
-                if (configMap.get(drugRecord.getName()) != null
-                        && configMap.get(drugRecord.getName()).get(drugRecord.getForm()) != null) {
-                    uniqueNameMap = configMap.get(drugRecord.getName()).get(drugRecord.getForm());
+                Map<String, Map<String, Long>> uniqueNameMap = new HashMap<>();
+                if (configMap.get(drugRecord.getName()) != null) {
+                    uniqueNameMap = configMap.get(drugRecord.getName());
                 }
                 if (uniqueNameMap != null && uniqueNameMap.size() > 0) {
-                    for (String uniqueName : uniqueNameMap.keySet()) {
-                        Drug convertDrugRecord = new Drug();
-                        BeanUtil.copyProperties(drugRecord, convertDrugRecord);
-                        convertDrugRecord.setUniqueName(uniqueName);
-                        convertDrug.add(convertDrugRecord);
+                    for (String form : uniqueNameMap.keySet()) {
+                        Map<String, Long> s = uniqueNameMap.get(form);
+                        for (String uniqueName: s.keySet()){
+                            Drug convertDrugRecord = new Drug();
+                            BeanUtil.copyProperties(drugRecord, convertDrugRecord);
+                            convertDrugRecord.setUniqueName(uniqueName);
+                            convertDrugRecord.setForm(form);
+                            convertDrug.add(convertDrugRecord);
+                        }
                     }
                 } else {
                     convertDrug.add(drugRecord);

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

@@ -300,7 +300,7 @@ public class DrugConfigFacade {
         for (int i = 0; i < drugConfigList.size(); i++) {
             if (StringUtil.isBlank(drugConfigList.get(i).getHisName())
                     || StringUtil.isBlank(drugConfigList.get(i).getUniqueName())) {
-                emptyNumList.add(String.valueOf(i + 2));
+                emptyNumList.add(String.valueOf(i + 3));
             }
             if (StringUtil.isNotBlank(drugConfigList.get(i).getHisName())) {
                 drugConfigList.get(i).setHisName(drugConfigList.get(i).getHisName().trim());
@@ -310,7 +310,7 @@ public class DrugConfigFacade {
             }
             if (StringUtil.isNotBlank(drugConfigList.get(i).getForm())) {
                 if (!formList.contains(drugConfigList.get(i).getForm())) {
-                    formErrNumList.add(String.valueOf(i + 2));
+                    formErrNumList.add(String.valueOf(i + 3));
                 } else {
                     drugConfigList.get(i).setForm(drugConfigList.get(i).getForm().trim());
                 }