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

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

@@ -8,17 +8,15 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import com.diagbot.vo.IndexDataSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetEvaluationScalesDTO;
 import com.diagbot.dto.GetEvaluationsDTO;
-import com.diagbot.client.TranServiceClient;
-import com.diagbot.dto.EMRIntroduceDetailDTO;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetLastOtherDTO;
 import com.diagbot.dto.HisInquiryDTO;
@@ -51,6 +49,7 @@ import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysForDjVO;
 import com.diagbot.vo.HisInquirysVO;
+import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryDetailVO;
@@ -307,6 +306,16 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         } else if (hisInquirysVO.getOrderType() == 2) {
             queryWrapper.orderByAsc("gmt_modified");
         }
+        
+        if(hisInquirysVO.getDisType()==1){
+        	Date nowDate = DateUtil.now();
+        	Date lastDate = DateUtil.addMonth(nowDate,-6);
+        	queryWrapper.ge("gmt_create", lastDate);
+        	queryWrapper.le("gmt_create", nowDate);
+        	queryWrapper.likeRight("diagnose", hisInquirysVO.getDisName());
+        }
+        
+        
         List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
         if (inquiryInfoList.size() == 0) {
             return null;
@@ -345,7 +354,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         return hisInquiryDTOList;
     }
-
+    
     /**
      * 对接-历史病历列表
      *

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

@@ -2,8 +2,10 @@ package com.diagbot.vo;
 
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.hibernate.validator.constraints.Range;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import io.swagger.annotations.ApiModel;
@@ -80,5 +82,20 @@ public class HisInquirysVO {
 	 */
 	@ApiModelProperty(value="排序类型：1、时间降序；2、时间升序；")
 	private Integer orderType=1;
+	
+	/**
+	 * 诊断类型：1：慢病，2：急诊
+	 */
+	@NotNull(message="诊断类型必填")
+	@ApiModelProperty(value="诊断类型：0：通用，1：慢病，2：急诊")
+	@Range(min=0,max=2,message="诊断类型必须是0-2")
+	private Integer disType;
+	
+	/**
+	 * 诊断名称
+	 */
+	@NotBlank(message="诊断名称必填")
+	@ApiModelProperty(value="诊断名称",required=true)
+	private String disName;
 	   
 }

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

@@ -106,16 +106,14 @@ public class SaveInquiryVO {
      * 问诊药品明细
      */
     @Valid
-    @ApiModelProperty(value="问诊药品明细",required=true)
-    @NotEmpty(message="问诊药品明细不能为空")
+    @ApiModelProperty(value="问诊药品明细")
     private List<SaveInquiryDrugVO> drugList;
     
     /**
      * 评估结果
      */
     @Valid
-    @ApiModelProperty(value="评估结果",required=true)
-    @NotNull(message="评估结果必传")
+    @ApiModelProperty(value="评估结果")
     private SaveInquiryEvaluationVO inquiryEvaluation;
 
     /**

icssman-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -365,7 +365,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
             }*/
             
             Map<String, List<QuestionInfo>> questionInfoListMap = questionInfos.stream().collect(Collectors.groupingBy(QuestionInfo::getTagName));
-            if(questionNames.size()==questionInfos.size()){
+            if(questionNames.size()==questionInfoListMap.size()){
             	List<QuestionInfo> questionInfos_ = questionInfos.stream().filter(p->p.getTagType()==TagTypeEnum.T8.getKey()||p.getTagType()==TagTypeEnum.T10.getKey()||p.getTagType()==TagTypeEnum.T11.getKey()).collect(Collectors.toList());
             	if(questionInfos_.size()>0){
             		sbf.append("(");

icssman-service/src/main/java/com/diagbot/vo/DisclaimerInformationVO.java

@@ -22,13 +22,13 @@ public class DisclaimerInformationVO {
     /**
      * 标题
      */
-	@NotBlank(message = "请输入标题")
+	@NotBlank(message = "标题不能为空")
     private String title;
 
     /**
      * 描述
      */
-	@NotBlank(message = "请输入描述")
+	@NotBlank(message = "内容不能为空")
     private String description;
 
     /**

icssman-service/src/main/java/com/diagbot/vo/VersionInfoVO.java

@@ -26,7 +26,7 @@ public class VersionInfoVO {
 	/**
      * 名称
      */
-	@NotBlank(message = "请输入名称")
+	@NotBlank(message = "标题不能为空")
     private String name;
 
     /**

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -198,7 +198,7 @@
     <select id="getQuestionUsualsByDept" resultType="com.diagbot.dto.GetQuestionInfoDTO">
         SELECT a.* FROM `icss_question_info` a
         LEFT JOIN icss_question_usual b ON a.id = b.question_id
-        WHERE b.dept_id = #{deptId} AND a.type = #{type}
+        WHERE a.is_deleted = 'N' and b.is_deleted = 'N' and b.dept_id = #{deptId} AND a.type = #{type}
         GROUP BY a.id
     </select>