liquanyu / regional-platform

Commit 6121503e2e83a837265cdec8921029be0d549cb4

Authored by wtt over 5 years ago

update

Showing 2 changed files with 32 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java

...	...	@@ -665,8 +665,28 @@
665	665	//查询符合条件的孕妇
666	666	StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
667	667	stopWatch.start();
668		- System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
669		- List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
	668	+ //20201204 滦平实现默认查询有预约产检时间数据，可以选择有预约和没有预约时间，其它机构使用以前逻辑
	669	+ List <Patients> patientses = new ArrayList <>();
	670	+ if("lp".equals(riskPatientsQueryRequest.getHstart())){
	671	+ if(patientsQuery.getNextCheckTimeStart()!=null \|\| patientsQuery.getNextCheckTimeEnd()!=null){
	672	+ //下次检查时间非空
	673	+ patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
	674	+ }else {
	675	+ if("1".equals(riskPatientsQueryRequest.getYyzt())){
	676	+ //获取有检查数据
	677	+ patientsQuery.setNextCheckTimeNe(true);
	678	+ patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
	679	+ }else if("2".equals(riskPatientsQueryRequest.getYyzt())){
	680	+ //获取没有有检查数据
	681	+ patientsQuery.setNextCheckTimeIs(true);
	682	+ patientsQuery.setNextCheckTimeNe(false);
	683	+ patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
	684	+ }
	685	+ }
	686	+ }else {
	687	+ //以前逻辑
	688	+ patientses = patientsService.queryPatientBySort(patientsQuery, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
	689	+ }
670	690	stopWatch.stop();
671	691	logger.info(stopWatch.toString());
672	692	List data = new ArrayList<QuanChanResult>();

...	...	@@ -17,6 +17,8 @@
17	17	public class RiskPatientsQueryRequest extends BasePageQueryRequest {
18	18	//判断定制机构 lp滦平
19	19	private String hstart;
	20	+ // 预约产检日期状态：1 有预约产检日期 2 没有预约产检日期
	21	+ private String yyzt;
20	22
21	23	@FormParam
22	24	//孕妇名字
...	...	@@ -815,6 +817,14 @@
815	817
816	818	public String getTwinsType() {
817	819	return twinsType;
	820	+ }
	821	+
	822	+ public String getYyzt() {
	823	+ return yyzt;
	824	+ }
	825	+
	826	+ public void setYyzt(String yyzt) {
	827	+ this.yyzt = yyzt;
818	828	}
819	829
820	830	public void setTwinsType(String twinsType) {