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

aipt-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -141,16 +141,4 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="门诊号")
 	private String recordId;
 	
-    /**
-     * 模式分类
-     */
-	@ApiModelProperty(value="模式分类")
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-	@ApiModelProperty(value="模式值")
-    private Integer modeValue;
-	
 }

icss-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -141,16 +141,4 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="门诊号")
 	private String recordId;
 	
-    /**
-     * 模式分类
-     */
-	@ApiModelProperty(value="模式分类")
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-	@ApiModelProperty(value="模式值")
-    private Integer modeValue;
-	
 }

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

@@ -51,18 +51,7 @@ public class PatientInfoFacade {
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         RespDTO<GetTopPatientInfoDTO> respDTO = aiptServiceClient.getTopPatientInfo(getTopPatientInfoVO);
         RespDTOUtil.respNGDealCover(respDTO, "获取页面顶部病人医生科室信息失败");
-
-        GetTopPatientInfoDTO getTopPatientInfoDTO = respDTO.data;
-
-        QueryWrapper<DoctorPageMode> doctorPageModeQe = new QueryWrapper<>();
-        doctorPageModeQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        doctorPageModeQe.eq("doctor_id", getTopPatientInfoDTO.getDoctorId());
-        DoctorPageMode doctorPageMode = doctorPageModeFacade.getOne(doctorPageModeQe, false);
-        if (doctorPageMode != null) {
-            getTopPatientInfoDTO.setModeClassify(doctorPageMode.getModeClassify());
-            getTopPatientInfoDTO.setModeValue(doctorPageMode.getModeValue());
-        }
-        return getTopPatientInfoDTO;
+        return respDTO.data;
     }
 
 }

icss-service/src/main/java/com/diagbot/vo/SaveInquiryToHisVO.java

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import com.diagbot.dto.ConceptIntroduceDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -68,6 +69,10 @@ public class SaveInquiryToHisVO {
 	 * 问诊明细
 	 */
     private List<SaveInquiryToHisDetailVO> detailList;
-    
+
+    /**
+     * 一般治疗
+     */
+    private List<ConceptIntroduceDTO> conceptIntroduceDTO;
    
 }

icss-service/src/main/java/com/diagbot/vo/SaveInquiryVO.java

@@ -7,6 +7,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
+import com.diagbot.dto.ConceptIntroduceDTO;
 import org.hibernate.validator.constraints.Range;
 
 import io.swagger.annotations.ApiModel;
@@ -122,5 +123,11 @@ public class SaveInquiryVO {
     @Valid
     @ApiModelProperty(value="指标值明细")
     private List<IndexDataVO> IndexData;
+
+    /**
+     * 一般治疗
+     */
+    @ApiModelProperty(value="治疗方案")
+    private List<ConceptIntroduceDTO> conceptIntroduceDTO;
    
 }

prec-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -140,17 +140,5 @@ public class GetTopPatientInfoDTO {
      */
 	@ApiModelProperty(value="门诊号")
 	private String recordId;
-	
-//    /**
-//     * 模式分类
-//     */
-//	@ApiModelProperty(value="模式分类")
-//    private Integer modeClassify;
-//
-//    /**
-//     * 模式值
-//     */
-//	@ApiModelProperty(value="模式值")
-//    private Integer modeValue;
-	
+
 }

tran-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -0,0 +1,38 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:提示信息明细
+ * @Author:zhaops
+ * @time: 2019/5/6 16:33
+ */
+@Getter
+@Setter
+public class ConceptDetailDTO {
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+    /**
+     * 是否诊断依据（1-是，0-否）
+     */
+    private Integer isReason;
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

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

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:提示信息返回
+ * @Author:zhaops
+ * @time: 2019/5/6 16:32
+ */
+@Getter
+@Setter
+public class ConceptIntroduceDTO {
+    private Long conceptId;
+    private String name;
+    private List<ConceptDetailDTO> details;
+}

tran-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -143,16 +143,4 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="门诊号")
 	private String recordId;
 	
-    /**
-     * 模式分类
-     */
-	@ApiModelProperty(value="模式分类")
-    private Integer modeClassify;
-
-    /**
-     * 模式值
-     */
-	@ApiModelProperty(value="模式值")
-    private Integer modeValue;
-	
 }

tran-service/src/main/java/com/diagbot/vo/SaveInquiryToHisVO.java

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import java.util.List;
 
+import com.diagbot.dto.ConceptIntroduceDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -68,6 +69,10 @@ public class SaveInquiryToHisVO {
 	 * 问诊明细
 	 */
     private List<SaveInquiryToHisDetailVO> detailList;
-    
-   
+
+    /**
+     * 一般治疗
+     */
+    private List<ConceptIntroduceDTO> conceptIntroduceDTO;
+
 }