Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

config-server/src/main/resources/shared/aipt-service-dev.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/med-s?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/med-s?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息

config-server/src/main/resources/shared/aipt-service-test.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/med-s?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息

icss-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -110,8 +110,11 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         }
 
         Map<String, String> detailMap = new LinkedHashMap<>();
-        for (String detail : details) {
-            detailMap.put(detail, lisWithItemNamMap.get(project).get(detail));
+        Map<String, String> projectDetailMap = lisWithItemNamMap.get(project);
+        if (projectDetailMap != null) {
+            for (String detail : details) {
+                detailMap.put(detail, projectDetailMap.get(detail));
+            }
         }
         retMap.put("details", detailMap);
         return retMap;
@@ -142,8 +145,11 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         }
 
         Map<String, String> detailMap = new LinkedHashMap<>();
-        for (String detail : details) {
-            detailMap.put(detail, lisWithItemNamMap.get(project).get(detail));
+        Map<String, String> projectDetailMap = lisWithItemNamMap.get(project);
+        if (projectDetailMap != null) {
+            for (String detail : details) {
+                detailMap.put(detail, projectDetailMap.get(detail));
+            }
         }
         retMap.put("details", detailMap);
         return retMap;