Merge remote-tracking branch 'origin/develop' into test

aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -171,12 +171,10 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
                 Map<Long, List<ConceptDetail>> conceptDetailMap
                         = EntityUtil.makeEntityListMap(conceptDetailList, "conceptId");
                 for (Concept concept : conceptList) {
+                    retSubMap = new LinkedHashMap<>();
                     if (retMap.containsKey(concept.getLibName())) {
                         retSubMap = retMap.get(concept.getLibName());
                     }
-                    if (retSubMap == null) {
-                        retSubMap = new LinkedHashMap<>();
-                    }
                     if (conceptDetailMap.containsKey(concept.getId())
                             && ListUtil.isNotEmpty(conceptDetailMap.get(concept.getId()))) {
                         retSubMap.put(concept.getLibType(), conceptDetailMap.get(concept.getId()));

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

@@ -107,4 +107,4 @@ nlp:
 
 aineo:
   server:
-    address: http://192.168.3.150:8888
+    address: http://192.168.2.234:8888

tran-service/src/main/java/com/diagbot/service/impl/MrServiceImpl.java

@@ -54,7 +54,7 @@ public class MrServiceImpl implements MrService {
     @Override
     public String createMr(PushJoinVO pushJoinVO) {
         Date now = DateUtil.now();
-        final Date expireDate = DateUtil.addMinutes(now, 3);
+        final Date expireDate = DateUtil.addMinutes(now, 15);
         pushJoinVO.setCreateTime(now);
         pushJoinVO.setExpireTime(expireDate);
         pushJoinVO.setExpireTimeStr(DateUtil.format(expireDate, "yyyy-MM-dd HH:mm:ss"));