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

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

@@ -1,58 +1,59 @@
 package com.diagbot.vo;
 
-import java.util.Date;
-
-import javax.validation.constraints.NotNull;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
+import com.diagbot.enums.SysTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
 
 /**
  * @Description:
  * @author: rengb
  * @time: 2018/11/19 18:58
  */
-@ApiModel(value="急诊-历史病历列表接口传参")
+@ApiModel(value = "急诊-历史病历列表接口传参")
 @SuppressWarnings({ "rawtypes", "serial" })
 @Getter
 @Setter
 public class HisInquirysForJzVO extends Page {
-	
-	/**
+
+    /**
      * 医院id
      */
-	@ApiModelProperty(value="医院id",required=true)
-	@NotNull(message="医院id必传")
+    @ApiModelProperty(value = "医院id", required = true)
+    @NotNull(message = "医院id必传")
     private Long hospitalId;
 
     /**
      * 科室id
      */
-	@ApiModelProperty(value="科室id",required=true)
-	@NotNull(message="科室id必传")
+    @ApiModelProperty(value = "科室id", required = true)
+    @NotNull(message = "科室id必传")
     private Long hospitalDeptId;
-    
-	/**
-	 * 开始时间
-	 */
-	@ApiModelProperty(value="开始时间，格式为：2018-11-28 17:25:30")
-	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
-	private Date startDate;
-	
-	/**
-	 * 结束时间
-	 */
-	@ApiModelProperty(value="结束时间，格式为：2018-11-28 17:25:30")
-	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
-	private Date endDate;
-	
-	@ApiModelProperty(value="是否有二次诊断,0-没有，1-有")
-	private Integer isHasSecond; 
-	   
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(value = "开始时间，格式为：2018-11-28 17:25:30")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间，格式为：2018-11-28 17:25:30")
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date endDate;
+
+    @ApiModelProperty(value = "是否有二次诊断,0-没有，1-有")
+    private Integer isHasSecond;
+
+    @ApiModelProperty(hidden = true)
+    private Integer sysType = SysTypeEnum.ICSS_SERVICE.getKey();
+
 }

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

@@ -617,7 +617,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                                 addConceptInfoVO.setName(libName);
                                 addConceptInfoVO.setType(libType);
                                 addConceptInfoVO.setMinAge(StringUtil.isEmpty(minAge)?0:Integer.parseInt(minAge));
-                                addConceptInfoVO.setMaxAge(StringUtil.isEmpty(minAge)?0:Integer.parseInt(maxAge));
+                                addConceptInfoVO.setMaxAge(StringUtil.isEmpty(minAge)?200:Integer.parseInt(maxAge));
                                 if (sexType.equals("男")) {
                                     addConceptInfoVO.setSexType(1);
                                 } else if (sexType.equals("女")) {

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

@@ -322,7 +322,9 @@ public class RelationContactFacade extends RelationServiceImpl {
 			return;
 		}
 		
-		if(!remove(relationQe)){
+		QueryWrapper<RelationOrder> relationOrderQe = new QueryWrapper<>();
+		relationOrderQe.in("t_relation_id", relationList.stream().map(i->i.getId()).collect(Collectors.toList()));
+		if(!remove(relationQe)||!relationOrderFacade.remove(relationOrderQe)){
 			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
 		}
 		

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

@@ -41,5 +41,10 @@ public class HisInquirysForJzVO extends Page {
 	 * 是否有二次诊断,0-没有，1-有
 	 */
 	private Integer isHasSecond; 
+	
+    /**
+     * 访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+     */
+    private Integer sysType;
 	   
 }

tran-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -55,6 +55,9 @@
 		WHERE 1=1
 		AND a.hospital_id=#{hospitalId}
 		AND a.hospital_dept_id=#{hospitalDeptId}
+		<if test="sysType!=null">
+			AND a.sys_type=#{sysType}
+		</if>
 		<if test="startDate!=null">
 			AND a.gmt_modified>=#{startDate}
 		</if>