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

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

@@ -177,7 +177,12 @@ public class PushFacade {
                 for (String name : nameList) {
                     QuestionPushDTO questionPushDTO = new QuestionPushDTO();
                     QuestionDTO questionDTO = questionDTOMap.get(name);
-                    BeanUtil.copyProperties(questionDTO, questionPushDTO);
+                    if (questionDTO != null) {
+                        BeanUtil.copyProperties(questionDTO, questionPushDTO);
+                    } else {
+                        questionPushDTO.setName(name);
+                        questionPushDTO.setType(ConceptTypeEnum.Lis.getKey());
+                    }
                     questionPushDTO.setLibType(12);
                     if (lisMap.containsKey(name) && lisMap.get(name) != null) {
                         questionPushDTO.setConceptId(lisMap.get(name));

knowledgeman-service/src/main/java/com/diagbot/dto/GetAllInformationDTO.java

@@ -51,7 +51,7 @@ public class GetAllInformationDTO {
     /**
      * 操作时间
      */
-	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value="操作时间")
     private Date operTime;
     

knowledgeman-service/src/main/java/com/diagbot/dto/GetConceptDetailListDTO.java

@@ -19,7 +19,7 @@ public class GetConceptDetailListDTO {
     /**
      * 操作时间
      */
-    @JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+    @JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value="操作时间")
     private Date gmtModified;
 

knowledgeman-service/src/main/java/com/diagbot/dto/GetLexiconListDTO.java

@@ -20,7 +20,7 @@ public class GetLexiconListDTO {
     /**
      * 操作时间
      */
-	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value="操作时间")
     private Date gmtModified;
 	

knowledgeman-service/src/main/java/com/diagbot/dto/GetMedicalInfoListDTO.java

@@ -56,7 +56,7 @@ public class GetMedicalInfoListDTO {
     /**
      * 操作时间
      */
-	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value="操作时间")
     private Date operTime;
     

knowledgeman-service/src/main/java/com/diagbot/dto/GetRelationInfoListDTO.java

@@ -80,7 +80,7 @@ public class GetRelationInfoListDTO {
     /**
      * 操作时间
      */
-	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value="操作时间")
     private Date operTime;
     

knowledgeman-service/src/main/java/com/diagbot/dto/LisSonContactListDTO.java

@@ -55,7 +55,7 @@ public class LisSonContactListDTO {
     /**
      * 操作时间
      */
-	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value="操作时间")
     private Date operTime;
     

knowledgeman-service/src/main/java/com/diagbot/dto/MultContactListDTO.java

@@ -60,7 +60,7 @@ public class MultContactListDTO {
     /**
      * 操作时间
      */
-	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value="操作时间")
     private Date operTime;
     

knowledgeman-service/src/main/java/com/diagbot/dto/RelationContactListDTO.java

@@ -55,7 +55,7 @@ public class RelationContactListDTO {
     /**
      * 操作时间
      */
-	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone="GMT+8",pattern ="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value="操作时间")
     private Date operTime;
     

knowledgeman-service/src/main/java/com/diagbot/facade/RelationFacade.java

@@ -282,7 +282,7 @@ public class RelationFacade extends RelationServiceImpl {
         StringBuffer sbf = new StringBuffer();
         InputStream inputStream = null;
         Workbook wb = null;
-        String title_1="",title_2="",title_3="",title_4="",title_5="";
+        String title_1="",title_2="",title_3="",title_4="";
         try {
             if (!file.isEmpty()) {
                 inputStream = file.getInputStream();
@@ -301,7 +301,7 @@ public class RelationFacade extends RelationServiceImpl {
                             
                             Sheet sheet = wb.getSheetAt(0);
                             int count = 0;
-                            String startName, startType, endName, endType, relationName;
+                            String startName, startType, endName, endType;
                             for (Row row : sheet) {
                                 count++;
                                 if(row == null){
@@ -312,27 +312,23 @@ public class RelationFacade extends RelationServiceImpl {
                                 	title_2 = getValue(row.getCell(1)).trim().replace(" ", "");
                                 	title_3 = getValue(row.getCell(2)).trim().replace(" ", "");
                                 	title_4 = getValue(row.getCell(3)).trim().replace(" ", "");
-                                	title_5 = getValue(row.getCell(4)).trim().replace(" ", "");
                                     continue;
                                 }
                                 startName = getValue(row.getCell(0)).trim().replace(" ", "");
                                 startType = getValue(row.getCell(1)).trim().replace(" ", "");
                                 endName = getValue(row.getCell(2)).trim().replace(" ", "");
                                 endType = getValue(row.getCell(3)).trim().replace(" ", "");
-                                relationName = getValue(row.getCell(4)).trim().replace(" ", "");
                                 if(StringUtil.isEmpty(startName) && StringUtil.isEmpty(startType)
-                                        && StringUtil.isEmpty(endName) && StringUtil.isEmpty(endType)
-                                        && StringUtil.isEmpty(relationName)){
+                                        && StringUtil.isEmpty(endName) && StringUtil.isEmpty(endType)){
                                 	continue;
                                 }
                                 if (StringUtil.isEmpty(startName) || StringUtil.isEmpty(startType)
-                                        || StringUtil.isEmpty(endName) || StringUtil.isEmpty(endType)
-                                        || StringUtil.isEmpty(relationName)) {
+                                        || StringUtil.isEmpty(endName) || StringUtil.isEmpty(endType)) {
                                     sbf.append("第" + count + "行数据不完整；").append("<br/>");
                                     continue;
                                 }
                                 
-                                addRelationInfoVOList.add(new AddRelationInfoVO(startName,startType,endName,endType,relationName,count));
+                                addRelationInfoVOList.add(new AddRelationInfoVO(startName,startType,endName,endType,"包含于",count));
                             }
                         } else {
                             sbf.append("非excel文件无法解析！").append("<br/>");
@@ -367,8 +363,7 @@ public class RelationFacade extends RelationServiceImpl {
         if(title_1.indexOf("关系起点术语名称")==-1
         		||title_2.indexOf("关系起点术语类型")==-1
         		||title_3.indexOf("关系终点术语名称")==-1
-        		||title_4.indexOf("关系终点术语类型")==-1
-        		||title_5.indexOf("关系类型名称")==-1){
+        		||title_4.indexOf("关系终点术语类型")==-1){
         	throw new CommonException(CommonErrorCode.RPC_ERROR,"导入数据不正确，请选择正确数据导入！");
         }