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