jiangjiazhi / regional-platform

Commit 943e3361fc82ff335741ab39b196e94521c98227

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

外区县人员查询

Showing 3 changed files with 54 additions and 0 deletions

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
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java

...	...	@@ -122,6 +122,8 @@
122	122	private String cityId;
123	123	private String areaId;
124	124	private String streetId;
	125	+
	126	+
125	127	//医院id
126	128	private List<String> hospitalList;
127	129
...	...	@@ -406,6 +408,28 @@
406	408	//秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
407	409	public Integer productionSieveType;
408	410
	411	+ //1 本县嫁外县 2 外县嫁本县
	412	+ private Integer wqxType;
	413	+
	414	+
	415	+ private String currentAreaId;
	416	+
	417	+ public String getCurrentAreaId() {
	418	+ return currentAreaId;
	419	+ }
	420	+
	421	+ public void setCurrentAreaId(String currentAreaId) {
	422	+ this.currentAreaId = currentAreaId;
	423	+ }
	424	+
	425	+ public Integer getWqxType() {
	426	+ return wqxType;
	427	+ }
	428	+
	429	+ public void setWqxType(Integer wqxType) {
	430	+ this.wqxType = wqxType;
	431	+ }
	432	+
409	433	public Integer getProductionSieveType() {
410	434	return productionSieveType;
411	435	}
...	...	@@ -590,6 +614,19 @@
590	614	condition = condition.orCondition(new MongoCondition[]{con1, con});
591	615	}
592	616
	617	+ //1 本县嫁外县 2 外县嫁本县
	618	+// private Integer wqxType;
	619	+ if (null != wqxType && wqxType == 1) {
	620	+ hospitalId = null;
	621	+ condition = condition.and("areaId", currentAreaId, MongoOper.IS);
	622	+ condition = condition.and("areaRegisterId", currentAreaId, MongoOper.NE);
	623	+ }
	624	+
	625	+ if (null != wqxType && wqxType == 2) {
	626	+ hospitalId = null;
	627	+ condition = condition.and("areaId", currentAreaId, MongoOper.NE);
	628	+ condition = condition.and("areaRegisterId", currentAreaId, MongoOper.IS);
	629	+ }
593	630
594	631	if (null != pcensusTypeId) {
595	632	condition = condition.and("pcensusTypeId", pcensusTypeId, MongoOper.IS);

...	...	@@ -2614,7 +2614,12 @@
2614	2614	public PatientManagerResult patientManager(PatientManagerRequest patientManagerRequest) {
2615	2615	PatientManagerResult patientManagerResult = new PatientManagerResult();
2616	2616	String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId());
	2617	+
	2618	+ Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
	2619	+
2617	2620	PatientsQuery patientsQuery = new PatientsQuery();
	2621	+ patientsQuery.setCurrentAreaId(organization.getAreaId());
	2622	+ patientsQuery.setWqxType(patientManagerRequest.getWqxType());
2618	2623
2619	2624	//孕产建档管理-初诊医生是否条件查询
2620	2625	if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){

...	...	@@ -139,6 +139,18 @@
139	139	//预约下次检查时间
140	140	private String nextCheckTime;
141	141
	142	+ //1 本县嫁外县 2 外县嫁本县
	143	+ private Integer wqxType;
	144	+
	145	+
	146	+ public Integer getWqxType() {
	147	+ return wqxType;
	148	+ }
	149	+
	150	+ public void setWqxType(Integer wqxType) {
	151	+ this.wqxType = wqxType;
	152	+ }
	153	+
142	154	public Integer getDueStatus() {
143	155	return dueStatus;
144	156	}