数据引擎提示信息

ltapi-service/src/main/java/com/diagbot/dto/ConceptIntroduceDTO.java

@@ -12,6 +12,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class ConceptIntroduceDTO extends ConceptBaseDTO {
+public class ConceptIntroduceDTO {
+    private String clientName; //外部名称
+    private String name;       //概念名称
     private List<ConceptDetailDTO> details;
 }

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

@@ -4,7 +4,9 @@ import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.enums.SysTypeEnum;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ConceptIntroduceVO;
 import com.diagbot.vo.ConnectIntroduceVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +40,17 @@ public class ConceptDetailFacade {
         connectIntroduceVO.setSysType(SysTypeEnum.LTAPI_SERVICE.getKey());
         RespDTO<List<ConceptIntroduceDTO>> respDTO = aiptServiceClient.getConnectConceptDetails(connectIntroduceVO);
         RespDTOUtil.respNGDeal(respDTO, "获取提示信息失败");
-        return respDTO.data;
+        List<ConceptIntroduceDTO> data = respDTO.data;
+        if (ListUtil.isNotEmpty(data)) {
+            for (ConceptIntroduceDTO conceptIntroduceDTO : data) {
+                String clientName
+                        = connectIntroduceVO.getName()
+                        + (StringUtil.isNotBlank(connectIntroduceVO.getDetailName()) == true
+                        ? "(" + connectIntroduceVO.getDetailName() + ")"
+                        : "");
+                conceptIntroduceDTO.setClientName(clientName);
+            }
+        }
+        return data;
     }
 }

ltapi-service/src/main/java/com/diagbot/vo/ConnectIntroduceVO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -14,11 +16,19 @@ import java.util.List;
 @Getter
 @Setter
 public class ConnectIntroduceVO {
+    @NotBlank(message = "请输入医院编码")
+    @ApiModelProperty(value = "医院编码", required = true)
+    private String hosCode;
+    @NotBlank(message = "请输入术语名称")
+    @ApiModelProperty(value = "术语名称", required = true)
     private String name;
+    @ApiModelProperty(value = "化验明细名称")
     private String detailName;
+    @NotNull(message = "请输入术语类型")
+    @ApiModelProperty(value = "术语类型", required = true)
+    private Integer type;
     @ApiModelProperty(hidden = true)
     private String uniqueName;
-    private String hosCode;
     @ApiModelProperty(hidden = true)
     private Integer position;
     @ApiModelProperty(hidden = true)