jiangjiazhi / regional-platform

Commit 6d3baf7aea69d6ca9c4b8a80c24b989770ce7ee3

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

增加区域孕妇查询

Showing 8 changed files with 393 additions and 29 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.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/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -90,6 +90,8 @@
90	90	private Date created;
91	91	private String hospitalId;
92	92	private String bp;
	93	+ //丈夫健康情况
	94	+ private String hHealthInfo;
93	95
94	96	public String getPid() {
95	97	return pid;
96	98
...	...	@@ -203,14 +205,22 @@
203	205	this.syjg = syjg;
204	206	}
205	207
	208	+ public String gethHealthInfo() {
	209	+ return hHealthInfo;
	210	+ }
	211	+
	212	+ public void sethHealthInfo(String hHealthInfo) {
	213	+ this.hHealthInfo = hHealthInfo;
	214	+ }
	215	+
206	216	/*//心率
207		- private double heartRate;
208		- //胎方位
209		- private String fetalPosition;
210		- //胎先露
211		- private String fetalPresentation;
212		- // 衔接
213		- private String join;*/
	217	+ private double heartRate;
	218	+ //胎方位
	219	+ private String fetalPosition;
	220	+ //胎先露
	221	+ private String fetalPresentation;
	222	+ // 衔接
	223	+ private String join;*/
214	224	//高危因素
215	225	private String highrisk ;
216	226	//高危评分

...	...	@@ -6,6 +6,7 @@
6	6	import com.lyms.platform.common.dao.operator.MongoOper;
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
8	8	import com.lyms.platform.common.utils.StringUtils;
	9	+import org.apache.commons.collections.CollectionUtils;
9	10	import org.springframework.data.mongodb.core.query.Criteria;
10	11
11	12	import java.util.Arrays;
...	...	@@ -70,7 +71,7 @@
70	71	*/
71	72	private int visitstatus = -1;
72	73
73		- private String areaId;
	74	+
74	75	//社区id
75	76	private String areaIdOrRestId;
76	77	//服务状态
77	78
...	...	@@ -92,7 +93,66 @@
92	93	private Date lastCTimeEnd;
93	94	private Integer postViewTimes;
94	95	private boolean gtePostTimes=false;
	96	+ //户籍地
	97	+ private String provinceRegisterId;
	98	+ private String cityRegisterId;
	99	+ private String areaRegisterId;
95	100
	101	+ //居住地
	102	+ private String provinceId;
	103	+ private String cityId;
	104	+ private String areaId;
	105	+ //医院id
	106	+ private List<String> hospitalList;
	107	+
	108	+ public String getProvinceRegisterId() {
	109	+ return provinceRegisterId;
	110	+ }
	111	+
	112	+ public void setProvinceRegisterId(String provinceRegisterId) {
	113	+ this.provinceRegisterId = provinceRegisterId;
	114	+ }
	115	+
	116	+ public String getCityRegisterId() {
	117	+ return cityRegisterId;
	118	+ }
	119	+
	120	+ public void setCityRegisterId(String cityRegisterId) {
	121	+ this.cityRegisterId = cityRegisterId;
	122	+ }
	123	+
	124	+ public String getAreaRegisterId() {
	125	+ return areaRegisterId;
	126	+ }
	127	+
	128	+ public void setAreaRegisterId(String areaRegisterId) {
	129	+ this.areaRegisterId = areaRegisterId;
	130	+ }
	131	+
	132	+ public String getProvinceId() {
	133	+ return provinceId;
	134	+ }
	135	+
	136	+ public void setProvinceId(String provinceId) {
	137	+ this.provinceId = provinceId;
	138	+ }
	139	+
	140	+ public String getCityId() {
	141	+ return cityId;
	142	+ }
	143	+
	144	+ public void setCityId(String cityId) {
	145	+ this.cityId = cityId;
	146	+ }
	147	+
	148	+ public List<String> getHospitalList() {
	149	+ return hospitalList;
	150	+ }
	151	+
	152	+ public void setHospitalList(List<String> hospitalList) {
	153	+ this.hospitalList = hospitalList;
	154	+ }
	155	+
96	156	public Integer getPostViewTimes() {
97	157	return postViewTimes;
98	158	}
99	159
...	...	@@ -617,9 +677,43 @@
617	677	if (StringUtils.isNotEmpty(rLevel)) {
618	678	condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE);
619	679	}
620		- if (null != areaId) {
	680	+ //居住地
	681	+ if (StringUtils.isNotEmpty(areaId)) {
621	682	condition = condition.and("areaId", areaId, MongoOper.IS);
622	683	}
	684	+ if(StringUtils.isNotEmpty(cityId)){
	685	+ condition = condition.and("cityId", cityId, MongoOper.IS);
	686	+ }
	687	+ if(StringUtils.isNotEmpty(provinceId)){
	688	+ condition = condition.and("provinceId", cityId, MongoOper.IS);
	689	+ }
	690	+ //户籍地
	691	+ if(StringUtils.isNotEmpty(provinceRegisterId)){
	692	+ condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS);
	693	+ }
	694	+ if(StringUtils.isNotEmpty(cityRegisterId)){
	695	+ condition = condition.and("cityRegisterId", cityRegisterId, MongoOper.IS);
	696	+ }
	697	+ if(StringUtils.isNotEmpty(areaRegisterId)){
	698	+ condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS);
	699	+ }
	700	+
	701	+
	702	+ /* //户籍地
	703	+ private String provinceRegisterId;
	704	+ private String cityRegisterId;
	705	+ private String areaRegisterId;
	706	+
	707	+ //居住地
	708	+ private String provinceId;
	709	+ private String cityId;
	710	+ private String areaId;
	711	+ //医院id
	712	+ private List<String> hospitalList;*/
	713	+
	714	+
	715	+
	716	+
623	717	if (StringUtils.isNotEmpty(id)) {
624	718	condition = condition.and("id", id, MongoOper.IS);
625	719	}
...	...	@@ -638,6 +732,9 @@
638	732	} else if (null != likeName) {
639	733	condition = condition.and("username", likeName, MongoOper.LIKE);
640	734	}
	735	+ if(CollectionUtils.isNotEmpty(hospitalList)){
	736	+ condition = condition.and("hospitalId", hospitalList, MongoOper.IN);
	737	+ }else
641	738	if (null != hospitalId) {
642	739	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
643	740	}

...	...	@@ -92,7 +92,7 @@
92	92	@TokenRequired
93	93	public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
94	94	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
95		- return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(),"true");
	95	+ return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true",Boolean.FALSE);
96	96	}
97	97	/**
98	98	*全部孕妇管理
...	...	@@ -105,7 +105,7 @@
105	105	@TokenRequired
106	106	public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
107	107	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
108		- return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId(),"true");
	108	+ return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId(),"true",Boolean.FALSE);
109	109	}
110	110
111	111
...	...	@@ -133,7 +133,7 @@
133	133	@TokenRequired
134	134	public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
135	135	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
136		- return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true");
	136	+ return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.FALSE);
137	137	}
138	138
139	139	@RequestMapping(value = "/apatients/enums", method = RequestMethod.GET)
...	...	@@ -162,7 +162,7 @@
162	162	@TokenRequired
163	163	public BaseResponse getPatent(@Valid PatientQueryRequest request,HttpServletRequest request1){
164	164	LoginContext loginState = (LoginContext) request1.getAttribute("loginContext");
165		- return patientFacade.findPatient(request,loginState.getId());
	165	+ return patientFacade.findPatient(request, loginState.getId());
166	166	}
167	167	/**
168	168	* 发送孕妇指导短信
...	...	@@ -174,7 +174,48 @@
174	174	@TokenRequired
175	175	public BaseResponse patientGuildSms(@RequestBody @Valid PatientGuideSmsRequest patientGuideSmsRequest,HttpServletRequest request1){
176	176	LoginContext loginState = (LoginContext) request1.getAttribute("loginContext");
177		- return patientFacade.patientGuildSms(patientGuideSmsRequest,loginState.getId());
	177	+ return patientFacade.patientGuildSms(patientGuideSmsRequest, loginState.getId());
	178	+ }
	179	+
	180	+ /**
	181	+ * 区域高危孕妇管理
	182	+ *
	183	+ * @param patientsQueryRequest 产妇管理修改接口
	184	+ * @return 返回结果
	185	+ */
	186	+ @RequestMapping(value = "/rhPuer", method = RequestMethod.GET)
	187	+ @ResponseBody
	188	+ @TokenRequired
	189	+ public BaseResponse queryRegionPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
	190	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	191	+ return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(), "true",Boolean.TRUE);
	192	+ }
	193	+
	194	+ /**
	195	+ * 区域全部产妇
	196	+ *
	197	+ * @return
	198	+ */
	199	+ @RequestMapping(value = "/rapatients", method = RequestMethod.GET)
	200	+ @ResponseBody
	201	+ @TokenRequired
	202	+ public BaseResponse queryRegionAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
	203	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	204	+ return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.TRUE);
	205	+ }
	206	+
	207	+ /**
	208	+ *区域全部孕妇管理
	209	+ *
	210	+ * @param patientsQueryRequest 全部孕妇管理查询 (因为请求参数一样同用一个对象)
	211	+ * @return 返回结果
	212	+ */
	213	+ @RequestMapping(value = "/raPuer", method = RequestMethod.GET)
	214	+ @ResponseBody
	215	+ @TokenRequired
	216	+ public BaseResponse queryRegionAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
	217	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	218	+ return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId(),"true",Boolean.TRUE);
178	219	}
179	220	}

...	...	@@ -1385,11 +1385,38 @@
1385	1385	}
1386	1386	}
1387	1387
1388		- public BaseListResponse queryBookBuild(BookBuildManagerQueryRequest bookBuildManagerQueryRequest){
	1388	+ /**
	1389	+ *
	1390	+ * 建档管理页面
	1391	+ *
	1392	+ * @param bookBuildManagerQueryRequest
	1393	+ * @return
	1394	+ */
	1395	+ public BaseListResponse queryBookBuild(BookBuildManagerQueryRequest bookBuildManagerQueryRequest,Integer userId){
1389	1396	PatientsQuery patientsQuery1=new PatientsQuery();
1390	1397	patientsQuery1.setYn(YnEnums.YES.getId());
1391		- yunBookbuildingService.queryPregnantWithQuery(patientsQuery1);
1392		- return new BaseListResponse();
	1398	+ List buildType = new ArrayList();
	1399	+ buildType.add(0);
	1400	+ buildType.add(2);
	1401	+ patientsQuery1.setBuildTypeList(buildType);
	1402	+ String hospitalId= autoMatchFacade.getHospitalId(userId);
	1403	+ patientsQuery1.setHospitalId(hospitalId);
	1404	+ patientsQuery1.setNeed("1");
	1405	+ patientsQuery1.setLimit(bookBuildManagerQueryRequest.getLimit());
	1406	+ patientsQuery1.setPage(bookBuildManagerQueryRequest.getPage());
	1407	+ patientsQuery1.setPhone(bookBuildManagerQueryRequest.getPhone());
	1408	+ patientsQuery1.setCardNo(bookBuildManagerQueryRequest.getCardNo());
	1409	+ patientsQuery1.setPhone(bookBuildManagerQueryRequest.getPhone());
	1410	+
	1411	+ List<Patients> patientses= yunBookbuildingService.queryPregnantWithQuery(patientsQuery1);
	1412	+
	1413	+ BookBuildManagerResult bookBuildManagerResult=new BookBuildManagerResult();
	1414	+ List<BookBuildManagerResult> data = new ArrayList<>();
	1415	+ for(Patients patients: patientses){
	1416	+ bookBuildManagerResult.convertToResult(patients);
	1417	+
	1418	+ }
	1419	+ return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1393	1420	}
1394	1421
1395	1422	public BaseResponse findPatientById(String parentId,Integer userId){

...	...	@@ -14,10 +14,14 @@
14	14	import com.lyms.platform.operate.web.worker.QuanChanPatientWorker;
15	15	import com.lyms.platform.operate.web.worker.QuanPatientWorker;
16	16	import com.lyms.platform.operate.web.worker.WorkHR;
	17	+import com.lyms.platform.permission.model.Organization;
	18	+import com.lyms.platform.permission.model.OrganizationQuery;
17	19	import com.lyms.platform.permission.model.Users;
	20	+import com.lyms.platform.permission.service.OrganizationService;
18	21	import com.lyms.platform.permission.service.UsersService;
19	22	import com.lyms.platform.pojo.*;
20	23	import com.lyms.platform.query.*;
	24	+import com.sun.javafx.collections.MappingChange;
21	25	import org.apache.commons.collections.CollectionUtils;
22	26	import org.apache.commons.lang.StringUtils;
23	27	import org.apache.commons.lang.math.NumberUtils;
...	...	@@ -68,6 +72,10 @@
68	72
69	73	@Autowired
70	74	private SyncDataService syncDataService;
	75	+ @Autowired
	76	+ private DataPermissionService dataPermissionService;
	77	+ @Autowired
	78	+ private OrganizationService organizationService;
71	79
72	80	private ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(15, 20, 1, TimeUnit.MINUTES, new LinkedBlockingQueue<Runnable>(5000));
73	81
...	...	@@ -200,7 +208,7 @@
200	208	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
201	209	}
202	210
203		- private PatientsQuery complayRequest(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage) {
	211	+ private PatientsQuery complayRequest(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage, boolean isRegion) {
204	212	PatientsQuery patientsQuery = new PatientsQuery();
205	213	patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
206	214	patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
...	...	@@ -213,7 +221,7 @@
213	221	Date currentDate = DateUtil.formatDate(new Date());
214	222
215	223	patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes());
216		- if(null!=riskPatientsQueryRequest.getPostViewTimes() &&riskPatientsQueryRequest.getPostViewTimes()>=4){
	224	+ if (null != riskPatientsQueryRequest.getPostViewTimes() && riskPatientsQueryRequest.getPostViewTimes() >= 4) {
217	225	patientsQuery.setGtePostTimes(true);
218	226	}
219	227
...	...	@@ -303,8 +311,63 @@
303	311	buildType.add(0);
304	312	buildType.add(2);
305	313	patientsQuery.setBuildTypeList(buildType);
306		- String hospital = autoMatchFacade.getHospitalId(userId);
307		- patientsQuery.setHospitalId(hospital);
	314	+ //居住地
	315	+ patientsQuery.setAreaId(riskPatientsQueryRequest.getAreaId());
	316	+ patientsQuery.setCityId(riskPatientsQueryRequest.getCityId());
	317	+ patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceId());
	318	+ //户籍地
	319	+ patientsQuery.setAreaRegisterId(riskPatientsQueryRequest.getAreaRegisterId());
	320	+ patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceRegisterId());
	321	+ patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityRegisterId());
	322	+ List<String> hospitalList = null;
	323	+ //区域范围内孕妇
	324	+ if (isRegion) {
	325	+ //王平说的必须要给区域医院权限，不然他就是蠢逼 201611124 16:41
	326	+ hospitalList = new ArrayList<>();
	327	+ DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
	328	+ dataPermissionsModelQuery.setUserId(userId);
	329	+ List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
	330	+ if (CollectionUtils.isNotEmpty(permissionsModels)) {
	331	+ Set<String> set = permissionsModels.get(0).getData().keySet();
	332	+ Iterator<String> it = set.iterator();
	333	+ while (it.hasNext()) {
	334	+ String id = it.next();
	335	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) {
	336	+ hospitalList.add(id);
	337	+ }
	338	+ }
	339	+ }
	340	+
	341	+ if (StringUtils.isNotEmpty(riskPatientsQueryRequest.gethId())) {
	342	+ List<String> orgId = new ArrayList<>();
	343	+ orgId.add(riskPatientsQueryRequest.gethId());
	344	+ hospitalList.retainAll(orgId);
	345	+ } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCprovinceId())) {
	346	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	347	+ organizationQuery.setYn(YnEnums.YES.getId());
	348	+ organizationQuery.setProvinceId(riskPatientsQueryRequest.getCprovinceId());
	349	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCcityId())) {
	350	+ organizationQuery.setCityId(riskPatientsQueryRequest.getCcityId());
	351	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCareaId())) {
	352	+ organizationQuery.setAreaId(riskPatientsQueryRequest.getCareaId());
	353	+ }
	354	+ }
	355	+ List<String> orgId = new ArrayList<>();
	356	+ List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
	357	+ if (CollectionUtils.isNotEmpty(organizations)) {
	358	+ for (Organization org : organizations) {
	359	+ if (null != org.getId()) {
	360	+ orgId.add(org.getId() + "");
	361	+ }
	362	+ }
	363	+ }
	364	+ hospitalList.retainAll(orgId);
	365	+ }
	366	+ patientsQuery.setHospitalList(hospitalList);
	367	+ } else {
	368	+ String hospital = autoMatchFacade.getHospitalId(userId);
	369	+ patientsQuery.setHospitalId(hospital);
	370	+ }
308	371	patientsQuery.setNeed(needPage);
309	372	return patientsQuery;
310	373	}
311	374
...	...	@@ -318,9 +381,9 @@
318	381	* @param type 控制类型 1孕妇 3产妇
319	382	* @return
320	383	*/
321		- public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage) {
	384	+ public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId, String needPage, boolean isRegion) {
322	385	//组合请求
323		- PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage);
	386	+ PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
324	387
325	388	String hospital = autoMatchFacade.getHospitalId(userId);
326	389	//查询符合条件的孕妇
...	...	@@ -385,7 +448,7 @@
385	448	if (end > patientses.size()) {
386	449	end = patientses.size();
387	450	}
388		- listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService,patientsService)));
	451	+ listFuture.add(threadPoolExecutor.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService)));
389	452	}
390	453	for (Future f : listFuture) {
391	454	try {
...	...	@@ -408,7 +471,7 @@
408	471	if (end > patientses.size()) {
409	472	end = patientses.size();
410	473	}
411		- listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService,patientsService)));
	474	+ listFuture.add(threadPoolExecutor.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService)));
412	475	}
413	476	for (Future f : listFuture) {
414	477	try {
...	...	@@ -436,7 +499,7 @@
436	499	if (end > patientses.size()) {
437	500	end = patientses.size();
438	501	}
439		- listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService,patientsService)));
	502	+ listFuture.add(threadPoolExecutor.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService)));
440	503	}
441	504	for (Future f : listFuture) {
442	505	try {
...	...	@@ -517,7 +580,7 @@
517	580	if (patientsQueryRequest.getQueryType() != null) {
518	581	// 0 高危孕妇 1 全部孕妇 2全部产妇
519	582	if (patientsQueryRequest.getQueryType() == 0) {
520		- listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null);
	583	+ listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null, Boolean.FALSE);
521	584	List list = listResponse.getData();
522	585	for (Object obj : list) {
523	586	Map<String, Object> data = new HashMap<>();
...	...	@@ -552,7 +615,7 @@
552	615	cnames.put("phone", "联系方式");
553	616
554	617	} else if (patientsQueryRequest.getQueryType() == 1) {
555		- listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null);
	618	+ listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE);
556	619	List list = listResponse.getData();
557	620	for (Object obj : list) {
558	621	Map<String, Object> data = new HashMap<>();
...	...	@@ -585,7 +648,7 @@
585	648	cnames.put("phone", "联系方式");
586	649	cnames.put("serviceType", "服务类型");
587	650	} else if (patientsQueryRequest.getQueryType() == 2) {
588		- listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null);
	651	+ listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE);
589	652	List list = listResponse.getData();
590	653	for (Object obj : list) {
591	654	Map<String, Object> data = new HashMap<>();

...	...	@@ -46,6 +46,8 @@
46	46	private Map ysfyHistory ;
47	47	//本次妊娠情况
48	48	private Map cestationInfo;
	49	+ //丈夫健康情况
	50	+ private Map hHealthInfo;
49	51
50	52	//孕次
51	53	private Integer pregnancyTimes;
...	...	@@ -272,6 +274,14 @@
272	274	this.cDueWeek = cDueWeek;
273	275	}
274	276
	277	+ public Map gethHealthInfo() {
	278	+ return hHealthInfo;
	279	+ }
	280	+
	281	+ public void sethHealthInfo(Map hHealthInfo) {
	282	+ this.hHealthInfo = hHealthInfo;
	283	+ }
	284	+
275	285	public String getDueDate() {
276	286	return dueDate;
277	287	}
...	...	@@ -876,6 +886,9 @@
876	886	antExChuModel.setCervical(cervical);
877	887	antExChuModel.setUterus(uterus);
878	888	antExChuModel.setFujian(fujian);
	889	+ if(null!=hHealthInfo){
	890	+ antExChuModel.sethHealthInfo(JsonUtil.obj2JsonString(hHealthInfo));
	891	+ }
879	892	// antExChuModel.setMdxqsy(mdxqsy);
880	893	antExChuModel.setHivkt(hivkt);
881	894	antExChuModel.setYdfmw(JsonUtil.obj2JsonString(ydfmw));

...	...	@@ -75,6 +75,105 @@
75	75	// 0 高危孕妇 1 全部孕妇 2全部产妇
76	76	private Integer queryType;
77	77
	78	+
	79	+ //户籍id
	80	+ private String provinceRegisterId;
	81	+ private String cityRegisterId;
	82	+ private String areaRegisterId;
	83	+
	84	+ //居住地
	85	+ private String provinceId;
	86	+ private String cityId;
	87	+ private String areaId;
	88	+
	89	+ //产检医院
	90	+ private String cprovinceId;
	91	+ private String ccityId;
	92	+ private String careaId;
	93	+ // 医院id
	94	+ private String hId;
	95	+
	96	+
	97	+ public String getProvinceRegisterId() {
	98	+ return provinceRegisterId;
	99	+ }
	100	+
	101	+ public void setProvinceRegisterId(String provinceRegisterId) {
	102	+ this.provinceRegisterId = provinceRegisterId;
	103	+ }
	104	+
	105	+ public String getCityRegisterId() {
	106	+ return cityRegisterId;
	107	+ }
	108	+
	109	+ public void setCityRegisterId(String cityRegisterId) {
	110	+ this.cityRegisterId = cityRegisterId;
	111	+ }
	112	+
	113	+ public String getAreaRegisterId() {
	114	+ return areaRegisterId;
	115	+ }
	116	+
	117	+ public void setAreaRegisterId(String areaRegisterId) {
	118	+ this.areaRegisterId = areaRegisterId;
	119	+ }
	120	+
	121	+ public String getProvinceId() {
	122	+ return provinceId;
	123	+ }
	124	+
	125	+ public void setProvinceId(String provinceId) {
	126	+ this.provinceId = provinceId;
	127	+ }
	128	+
	129	+ public String getCityId() {
	130	+ return cityId;
	131	+ }
	132	+
	133	+ public void setCityId(String cityId) {
	134	+ this.cityId = cityId;
	135	+ }
	136	+
	137	+ public String getAreaId() {
	138	+ return areaId;
	139	+ }
	140	+
	141	+ public void setAreaId(String areaId) {
	142	+ this.areaId = areaId;
	143	+ }
	144	+
	145	+ public String getCprovinceId() {
	146	+ return cprovinceId;
	147	+ }
	148	+
	149	+ public void setCprovinceId(String cprovinceId) {
	150	+ this.cprovinceId = cprovinceId;
	151	+ }
	152	+
	153	+ public String getCcityId() {
	154	+ return ccityId;
	155	+ }
	156	+
	157	+ public void setCcityId(String ccityId) {
	158	+ this.ccityId = ccityId;
	159	+ }
	160	+
	161	+ public String getCareaId() {
	162	+ return careaId;
	163	+ }
	164	+
	165	+ public void setCareaId(String careaId) {
	166	+ this.careaId = careaId;
	167	+ }
	168	+
	169	+ public String gethId() {
	170	+ return hId;
	171	+ }
	172	+
	173	+ public void sethId(String hId) {
	174	+ this.hId = hId;
	175	+ }
	176	+
78	177	public Integer getPostViewTimes() {
79	178	return postViewTimes;
80	179	}

...	...	@@ -63,6 +63,8 @@
63	63	private Map fksxHistory;
64	64	// 叶酸服用
65	65	private Map ysfyHistory;
	66	+
	67	+ private Map hHealthInfo;
66	68	//孕次
67	69	private Integer pregnancyTimes;
68	70	// 产次
...	...	@@ -860,6 +862,14 @@
860	862	this.parentId = parentId;
861	863	}
862	864
	865	+ public Map gethHealthInfo() {
	866	+ return hHealthInfo;
	867	+ }
	868	+
	869	+ public void sethHealthInfo(Map hHealthInfo) {
	870	+ this.hHealthInfo = hHealthInfo;
	871	+ }
	872	+
863	873	public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
864	874	if (null != antExChuModel) {
865	875	setId(antExChuModel.getId());
...	...	@@ -870,6 +880,10 @@
870	880	}
871	881	try {
872	882	setFamilyHistory(JsonUtil.str2Obj(antExChuModel.getFamilyHistory(), Map.class));
	883	+ } catch (Exception e) {
	884	+ }
	885	+ try {
	886	+ sethHealthInfo(JsonUtil.str2Obj(antExChuModel.gethHealthInfo(), Map.class));
873	887	} catch (Exception e) {
874	888	}
875	889	try {