jiangjiazhi / regional-platform

Commit a831a9b632e39c19daaa69374e81cb84b455d9a7

Authored by shiyang over 4 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 9 additions and 9 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java

...	...	@@ -89,7 +89,6 @@
89	89
90	90	public List<Patients> queryPatient(PatientsQuery patientsQuery) {
91	91	MongoQuery query = patientsQuery.convertToQuery();
92		- System.out.println(query.convertToMongoQuery().toString());
93	92	if (StringUtils.isNotEmpty(patientsQuery.getNeed())) {
94	93	patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
95	94	query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());

...	...	@@ -805,14 +805,14 @@
805	805	if (null != firstCheckId) {
806	806	condition = condition.and("firstCheckId", firstCheckId, MongoOper.IS);
807	807	}
808		- if(null!=prodDoctor){
	808	+
	809	+ if(null!= prodDoctor){
809	810	if("是".equals(prodDoctor)){
810		- condition=condition.and("prodDoctor",null,MongoOper.NE);
	811	+ condition=condition.and("firstCheckId",null,MongoOper.NE);
811	812	}else {
812		- condition=condition.and("prodDoctor",null,MongoOper.IS);
	813	+ condition=condition.and("firstCheckId",null,MongoOper.IS);
813	814	}
814	815	}
815		-
816	816
817	817	Criteria c1 = null;
818	818

...	...	@@ -2455,8 +2455,10 @@
2455	2455	PatientManagerResult patientManagerResult = new PatientManagerResult();
2456	2456	String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId());
2457	2457	PatientsQuery patientsQuery = new PatientsQuery();
	2458	+ if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){
	2459	+ patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor());
	2460	+ }
2458	2461	patientsQuery.setScreening(patientManagerRequest.getScreening());
2459		- patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor());
2460	2462
2461	2463	patientsQuery.setYyzyfmHospitalId(patientManagerRequest.getYyzyfmHospitalId());
2462	2464
...	...	@@ -2532,7 +2534,6 @@
2532	2534	patientsQuery.setQueryNo(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo());
2533	2535
2534	2536	List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
2535		- System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
2536	2537	List <PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList <>();
2537	2538	if (CollectionUtils.isNotEmpty(patientsList)) {
2538	2539	for (Patients patients : patientsList) {
...	...	@@ -2577,8 +2578,8 @@
2577	2578	System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor());
2578	2579	}
2579	2580	}
2580		- //滦平定制
2581		- if ("2100001377".equals(hospitalId)) {
	2581	+ //滦平定制,围场也需要。初诊时间和初诊医生字段展示。后期其它地区如果需要在这里添加医院id,如果整体变成模块化放开判断即可
	2582	+ if ("2100001377".equals(hospitalId)\|\|"2100001452".equals(hospitalId)) {
2582	2583	//初诊
2583	2584	AntExChuQuery antExChuQuery = new AntExChuQuery();
2584	2585	antExChuQuery.setYn(YnEnums.YES.getId());