jiangjiazhi / regional-platform

Commit d7239f48ed92e544dc53ac2a5de6b0db69b7e273

Authored by wtt about 5 years ago

Exists in master and in 6 other branches

乳腺癌导出

Showing 4 changed files with 189 additions and 41 deletions

platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

...	...	@@ -16,6 +16,7 @@
16	16
17	17	import java.util.Date;
18	18	import java.util.HashMap;
	19	+import java.util.List;
19	20	import java.util.Map;
20	21
21	22	/**
...	...	@@ -26,6 +27,7 @@
26	27	private String id;
27	28	//妇女档案id
28	29	private String residentId;
	30	+ private List <String> residentIds;
29	31	//姓名
30	32	private String uname;
31	33	//出生日期
...	...	@@ -121,7 +123,9 @@
121	123	if(null != residentId){
122	124	condition=condition.and("residentId", residentId, MongoOper.IS);
123	125	}
124		-
	126	+ if(null != residentIds){
	127	+ condition=condition.and("residentId", residentIds, MongoOper.IN);
	128	+ }
125	129	if(StringUtils.isNotEmpty(rxlYyz) ){
126	130	condition=condition.and("rxlYyz.select",rxlYyz , MongoOper.IS);
127	131	}
...	...	@@ -196,6 +200,14 @@
196	200
197	201	public String getRxlYdz() {
198	202	return rxlYdz;
	203	+ }
	204	+
	205	+ public List <String> getResidentIds() {
	206	+ return residentIds;
	207	+ }
	208	+
	209	+ public void setResidentIds(List <String> residentIds) {
	210	+ this.residentIds = residentIds;
199	211	}
200	212
201	213	public void setRxlYdz(String rxlYdz) {

...	...	@@ -13,6 +13,7 @@
13	13	import org.springframework.web.bind.annotation.*;
14	14
15	15	import javax.servlet.http.HttpServletRequest;
	16	+import javax.servlet.http.HttpServletResponse;
16	17
17	18	/**
18	19	* 两癌筛查
...	...	@@ -83,6 +84,19 @@
83	84	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
84	85	return cancerScreenService.list(cancerScreeningRequest, loginState.getId());
85	86	}
	87	+ /**
	88	+ * 乳腺癌导出(查询两癌筛查列表)
	89	+ * @param cancerScreeningRequest
	90	+ * @param request
	91	+ * @return
	92	+ */
	93	+ @ResponseBody
	94	+ @RequestMapping(value="/exportLasc",method = RequestMethod.GET)
	95	+ @TokenRequired
	96	+ public void exportLasc(CancerScreeningRequest cancerScreeningRequest, HttpServletRequest request, HttpServletResponse response) {
	97	+ cancerScreenService.exportLasc(cancerScreeningRequest, getUserId(request),response);
	98	+ }
	99	+
86	100
87	101	/**
88	102	* 根据两癌Id查询详情

...	...	@@ -12,11 +12,16 @@
12	12	import com.lyms.platform.common.utils.DateUtil;
13	13	import com.lyms.platform.operate.web.request.CancerScreeningRequest;
14	14	import com.lyms.platform.operate.web.result.ResidentsPageResult;
	15	+import com.lyms.platform.operate.web.service.impl.PreEugebicsServiceImpl;
15	16	import com.lyms.platform.operate.web.utils.CommonsHelper;
16	17	import com.lyms.platform.operate.web.utils.FunvCommonUtil;
	18	+import com.lyms.platform.operate.web.utils.ResponseUtil;
17	19	import com.lyms.platform.operate.web.utils.UnitConstants;
	20	+import com.lyms.platform.permission.model.Organization;
18	21	import com.lyms.platform.permission.model.Users;
	22	+import com.lyms.platform.permission.service.OrganizationService;
19	23	import com.lyms.platform.permission.service.UsersService;
	24	+import com.lyms.platform.pojo.BasicConfig;
20	25	import com.lyms.platform.pojo.CancerScreeningModel;
21	26	import com.lyms.platform.pojo.ResidentsArchiveModel;
22	27	import com.lyms.platform.query.CancerScreeningQuery;
...	...	@@ -27,6 +32,7 @@
27	32	import org.springframework.beans.factory.annotation.Autowired;
28	33	import org.springframework.stereotype.Component;
29	34
	35	+import javax.servlet.http.HttpServletResponse;
30	36	import java.util.*;
31	37
32	38	/**
...	...	@@ -41,6 +47,8 @@
41	47	@Autowired
42	48	private AutoMatchFacade autoMatchFacade;
43	49	@Autowired
	50	+ private OrganizationService organizationService;
	51	+ @Autowired
44	52	private UsersService usersService;
45	53	@Autowired
46	54	private BasicConfigService basicConfigService;
...	...	@@ -68,8 +76,7 @@
68	76	if (hospitalId != null) {
69	77	query.setHospitalId(hospitalId);
70	78	}
71		- if (StringUtils.isNotEmpty(queryRequest.getCheckDate()))
72		- {
	79	+ if (StringUtils.isNotEmpty(queryRequest.getCheckDate())) {
73	80	String[] arrs = queryRequest.getCheckDate().split(" - ");
74	81	query.setCreatedStart(DateUtil.parseYMD(arrs[0]));
75	82	query.setCreatedEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
76	83
...	...	@@ -89,10 +96,10 @@
89	96
90	97	List list = new ArrayList();
91	98	//System.out.println(query.convertToQuery().convertToMongoQuery());
92		- List<CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
	99	+ List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
93	100	if (CollectionUtils.isNotEmpty(modelList)) {
94	101	for (CancerScreeningModel model : modelList) {
95		- Map<String, Object> map = new HashMap<>();
	102	+ Map <String, Object> map = new HashMap <>();
96	103	map.put("id", model.getId());
97	104	map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
98	105	map.put("name", model.getUsername());
99	106
100	107
...	...	@@ -101,12 +108,12 @@
101	108	map.put("phone", model.getPhone());
102	109	map.put("age", DateUtil.getAge(model.getBirthday()));
103	110	map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
104		- map.put("sfZhzd",model.getSfZhzd());
105		- map.put("sfJcry",model.getSfBlzd() == null ? "" : model.getSfBlzd());
	111	+ map.put("sfZhzd", model.getSfZhzd());
	112	+ map.put("sfJcry", model.getSfBlzd() == null ? "" : model.getSfBlzd());
106	113
107		- map.put("sfZzjg",model.getSfZzjg());//检査机构
	114	+ map.put("sfZzjg", model.getSfZzjg());//检査机构
108	115
109		- map.put("sfJcsj",DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期
	116	+ map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期
110	117
111	118	list.add(map);
112	119	}
113	120
...	...	@@ -114,7 +121,122 @@
114	121	return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(query.getPageInfo());
115	122	}
116	123
	124	+
117	125	/**
	126	+ * 查询两癌筛查列表导出
	127	+ *
	128	+ * @param queryRequest
	129	+ * @param id
	130	+ * @return
	131	+ */
	132	+ public void exportLasc(CancerScreeningRequest queryRequest, Integer id, HttpServletResponse response){
	133	+ List <Map <String, Object>> datas = getLascList(queryRequest, id);
	134	+ Map <String, String> cnames = new LinkedHashMap <>();
	135	+ cnames.put("xz", "乡镇");
	136	+ cnames.put("created", "检查日期");
	137	+ cnames.put("name", "姓名");
	138	+ cnames.put("age", "年龄");
	139	+ cnames.put("cardNum", "证件号");
	140	+ cnames.put("phone", "联系方式");
	141	+ cnames.put("liveAddress", "住址");
	142	+ ResponseUtil.responseExcel(cnames, datas, response);
	143	+ }
	144	+
	145	+ public List <Map <String, Object>> getLascList(CancerScreeningRequest queryRequest, Integer id) {
	146	+ List <Map <String, Object>> lascList = new LinkedList <>();
	147	+
	148	+ //获取当前用户获取对应的乡镇列表
	149	+ String hospitalId = autoMatchFacade.getHospitalId(id);
	150	+ Organization organization = organizationService.getOrganization(Integer.valueOf(hospitalId));
	151	+ List <BasicConfig> items = basicConfigService.queryByParentId(organization.getAreaId());
	152	+ if (CollectionUtils.isNotEmpty(items)) {
	153	+ for (BasicConfig item : items) {
	154	+
	155	+ //获取该乡镇所有的女性建档数据
	156	+ List <String> residentsIds = getResidentsIds(hospitalId, item);
	157	+ if (CollectionUtils.isNotEmpty(residentsIds)) {
	158	+ //查询条件
	159	+ CancerScreeningQuery query = new CancerScreeningQuery();
	160	+ query.setResidentIds(residentsIds);
	161	+ query.setLimit(queryRequest.getLimit());
	162	+ query.setPage(queryRequest.getPage());
	163	+ query.setNeed("need");
	164	+ query.setYn(YnEnums.YES.getId());
	165	+ query.setQueryNo(queryRequest.getQueryNo());
	166	+ if (hospitalId != null) {
	167	+ query.setHospitalId(hospitalId);
	168	+ }
	169	+ if (StringUtils.isNotEmpty(queryRequest.getCheckDate())) {
	170	+ String[] arrs = queryRequest.getCheckDate().split(" - ");
	171	+ query.setCreatedStart(DateUtil.parseYMD(arrs[0]));
	172	+ query.setCreatedEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
	173	+ }
	174	+ query.setProvinceId(queryRequest.getProvinceId());
	175	+ query.setCityId(queryRequest.getCityId());
	176	+ query.setAreaId(queryRequest.getAreaId());
	177	+ query.setStreetId(queryRequest.getStreetId());
	178	+ query.setRxlYyz(queryRequest.getRxlYyz());
	179	+ query.setRxlYyy(queryRequest.getRxlYyy());
	180	+ query.setRxlYdz(queryRequest.getRxlYdz());
	181	+ query.setRxlYdy(queryRequest.getRxlYdy());
	182	+ query.setRxlJcjg(queryRequest.getRxlJcjg());
	183	+ query.setRxlJy(queryRequest.getRxlJy());
	184	+ query.setRxJy(queryRequest.getRxJy());
	185	+ query.setSfZhzd(queryRequest.getSfZhzd());
	186	+
	187	+ System.out.println(query.convertToQuery().convertToMongoQuery());
	188	+ List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
	189	+ if (CollectionUtils.isNotEmpty(modelList)) {
	190	+ for (CancerScreeningModel model : modelList) {
	191	+ Map <String, Object> map = new HashMap <>();
	192	+// map.put("id", model.getId());
	193	+ map.put("xz", item.getName());//乡镇
	194	+// map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检查日期
	195	+ map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));//检查日期
	196	+ map.put("name", model.getUsername());//姓名
	197	+ map.put("age", DateUtil.getAge(model.getBirthday()));//年龄
	198	+ map.put("cardNum", model.getCertificateNum());//证件号
	199	+ map.put("phone", model.getPhone());//联系方式
	200	+ map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
	201	+ model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址
	202	+ lascList.add(map);
	203	+ }
	204	+ }
	205	+
	206	+ }
	207	+ }
	208	+
	209	+ }
	210	+
	211	+ return lascList;
	212	+ }
	213	+
	214	+
	215	+ /**
	216	+ * 获取乡镇，婚检建档女Id
	217	+ *
	218	+ * @Author: 武涛涛
	219	+ * @Date: 2020/9/24 17:18
	220	+ */
	221	+ private List <String> getResidentsIds(String hospitalId, BasicConfig item) {
	222	+ List <String> residentsIds = new ArrayList <>();
	223	+ ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
	224	+ archiveQuery.setYn(YnEnums.YES.getId());
	225	+ archiveQuery.setHospitalId(hospitalId);
	226	+ archiveQuery.setStreetId(item.getId());
	227	+ archiveQuery.setSex("c23779f1-cb6e-44d0-9fc8-0a990bf6184c");//张洁说只要女性的婚检数据
	228	+ List <ResidentsArchiveModel> hjCounts = residentsArchiveService.queryResident(archiveQuery);
	229	+ if (CollectionUtils.isNotEmpty(hjCounts)) {
	230	+ for (int i = 0; i < hjCounts.size(); i++) {
	231	+ if (hjCounts.get(i) != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(hjCounts.get(i).getId())) {
	232	+ residentsIds.add(hjCounts.get(i).getId());
	233	+ }
	234	+ }
	235	+ }
	236	+ return residentsIds;
	237	+ }
	238	+
	239	+ /**
118	240	* 获取妇女两癌筛查列表
119	241	*
120	242	* @param residentId
121	243
...	...	@@ -122,10 +244,10 @@
122	244	*/
123	245	public BaseResponse getResIdCancerScreenList(String residentId) {
124	246	BaseResponse baseResponse = new BaseResponse();
125		- List<CancerScreeningModel> cancerScreeningModels = cancerScreenService.findResIdCancerScreenList(residentId);
126		- List<Map<String, String>> hisCancerScrList = new ArrayList<>();
	247	+ List <CancerScreeningModel> cancerScreeningModels = cancerScreenService.findResIdCancerScreenList(residentId);
	248	+ List <Map <String, String>> hisCancerScrList = new ArrayList <>();
127	249	for (CancerScreeningModel cs : cancerScreeningModels) {
128		- Map<String, String> map = new HashedMap();
	250	+ Map <String, String> map = new HashedMap();
129	251	map.put("id", cs.getId());
130	252	map.put("createTime", DateUtil.getyyyy_MM_dd(cs.getCreated()));
131	253	//根据用户id获取医院ID
...	...	@@ -156,7 +278,7 @@
156	278	public BaseResponse updateCancerScreen(CancerScreeningModel cancerScr, Integer id) {
157	279	try {
158	280	cancerScr.setOperator(id);
159		- cancerScreenService.updateOneCancerScreen(cancerScr,cancerScr.getId());
	281	+ cancerScreenService.updateOneCancerScreen(cancerScr, cancerScr.getId());
160	282	return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
161	283	} catch (Exception e) {
162	284	e.printStackTrace();
...	...	@@ -168,7 +290,7 @@
168	290	try {
169	291	ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.getResident(cancerScr.getResidentId());
170	292	//冗余妇女建档数据
171		- if(residentsArchiveModel!=null){
	293	+ if (residentsArchiveModel != null) {
172	294	//姓名
173	295	cancerScr.setUsername(residentsArchiveModel.getUsername());
174	296	//出生日期
...	...	@@ -201,7 +323,7 @@
201	323	cancerScr.setYn(YnEnums.YES.getId());
202	324	cancerScreenService.addOneCancerScreen(cancerScr);
203	325	return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
204		- }else{
	326	+ } else {
205	327	return new BaseResponse("未传入的妇女建档id", ErrorCodeConstants.SUCCESS);
206	328	}
207	329	} catch (Exception e) {
208	330
209	331
210	332
211	333
212	334
...	...	@@ -211,27 +333,27 @@
211	333	}
212	334
213	335	public BaseResponse queryCanSrcInfo(String cardNo, String vcCardNo, Integer userId) {
214		- List<ResidentsArchiveModel> residents = new ArrayList<>();
	336	+ List <ResidentsArchiveModel> residents = new ArrayList <>();
215	337
216	338	ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
217	339	archiveQuery.setYn(YnEnums.YES.getId());
218	340	//身份证不为空的情况下通过身份证查询
219		- if (StringUtils.isNotEmpty(cardNo)){
	341	+ if (StringUtils.isNotEmpty(cardNo)) {
220	342	archiveQuery.setCertificateNum(cardNo);
221	343	residents = residentsArchiveService.queryResident(archiveQuery);
222	344
223	345	//使用就诊卡号查询,先用登录ID查询属于哪家医院,然后查询到该居民的身份证号,调出所有的建档记录
224		- }else if (StringUtils.isNotEmpty(vcCardNo)){
	346	+ } else if (StringUtils.isNotEmpty(vcCardNo)) {
225	347	//通过用户ID查询医院ID
226	348	String hospitalId = autoMatchFacade.getHospitalId(userId);
227	349	archiveQuery.setVcCardNo(vcCardNo);
228	350	archiveQuery.setHospitalId(hospitalId);
229		- List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery);
230		- if (CollectionUtils.isNotEmpty(archiveModelList)){
	351	+ List <ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery);
	352	+ if (CollectionUtils.isNotEmpty(archiveModelList)) {
231	353	//判断身份证号是否为null
232		- if (StringUtils.isEmpty(archiveModelList.get(0).getCertificateNum())){
	354	+ if (StringUtils.isEmpty(archiveModelList.get(0).getCertificateNum())) {
233	355	residents = archiveModelList;
234		- }else {
	356	+ } else {
235	357	archiveQuery.setHospitalId(null);
236	358	archiveQuery.setVcCardNo(null);
237	359	archiveQuery.setCertificateNum(archiveModelList.get(0).getCertificateNum());
238	360
239	361
240	362
241	363
242	364
243	365
244	366
245	367
246	368
...	...	@@ -240,43 +362,42 @@
240	362	}
241	363	}
242	364
243		- if (CollectionUtils.isNotEmpty(residents))
244		- {
	365	+ if (CollectionUtils.isNotEmpty(residents)) {
245	366	ResidentsArchiveModel model = residents.get(0);
246		- Map<String,Object> result = new HashMap<>();
	367	+ Map <String, Object> result = new HashMap <>();
247	368
248		- result.put("userName",model.getUsername());
	369	+ result.put("userName", model.getUsername());
249	370
250		- result.put("cardNo",model.getCertificateNum());
251		- result.put("certificateTypeId",model.getCertificateTypeId());
	371	+ result.put("cardNo", model.getCertificateNum());
	372	+ result.put("certificateTypeId", model.getCertificateTypeId());
252	373
253	374	if (model.getBirthday() != null) {
254	375	result.put("age", com.lyms.platform.common.utils.StringUtils.unitHandle(DateUtil.getAge(model.getBirthday(), new Date()).toString(), UnitConstants.SUI));
255	376	}
256	377
257		- result.put("sex",FunvCommonUtil.getBaseicConfigByid(model.getSex(), basicConfigService));
258		- result.put("birthday",DateUtil.getyyyy_MM_dd(model.getBirthday()));
259		- result.put("phone",model.getPhone());
	378	+ result.put("sex", FunvCommonUtil.getBaseicConfigByid(model.getSex(), basicConfigService));
	379	+ result.put("birthday", DateUtil.getyyyy_MM_dd(model.getBirthday()));
	380	+ result.put("phone", model.getPhone());
260	381
261	382	//居住地址
262	383	String liveRegister = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
263	384	model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService);
264		- result.put("liveRegister",liveRegister);
	385	+ result.put("liveRegister", liveRegister);
265	386
266	387
267	388	//户籍地
268	389	String addressRegister = CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),
269	390	model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService);
270		- result.put("addressRegister",addressRegister);
	391	+ result.put("addressRegister", addressRegister);
271	392
272		- result.put("levelType",FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService));
	393	+ result.put("levelType", FunvCommonUtil.getBaseicConfigByid(model.getLevelTypeId(), basicConfigService));
273	394	result.put("residentId", model.getId());
274	395
275	396
276		- List<CancerScreeningModel> cancerScreeningModels = cancerScreenService.findResIdCancerScreenList(model.getId());
277		- List<Map<String, String>> hisCancerScrList = new ArrayList<>();
	397	+ List <CancerScreeningModel> cancerScreeningModels = cancerScreenService.findResIdCancerScreenList(model.getId());
	398	+ List <Map <String, String>> hisCancerScrList = new ArrayList <>();
278	399	for (CancerScreeningModel cs : cancerScreeningModels) {
279		- Map<String, String> map = new HashedMap();
	400	+ Map <String, String> map = new HashedMap();
280	401	map.put("id", cs.getId());
281	402	map.put("createTime", DateUtil.getyyyy_MM_dd(cs.getCreated()));
282	403	//根据用户id获取医院ID

...	...	@@ -680,7 +680,7 @@
680	680	}
681	681
682	682	}
683		-
	683	+
684	684	}
685	685	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);
686	686	}
...	...	@@ -699,6 +699,7 @@
699	699	public void exportYj(String time, Integer userId, HttpServletResponse response) {
700	700	List <Map <String, Object>> datas = getYjdcList(time, userId);
701	701	Map <String, String> cnames = new LinkedHashMap <>();
	702	+ cnames.put("xz", "乡镇");
702	703	cnames.put("username", "姓名");
703	704	cnames.put("certificateNum", "证件号");
704	705	cnames.put("age", "年龄");
...	...	@@ -714,6 +715,7 @@
714	715	public void exportHj(String time, Integer userId, HttpServletResponse response) {
715	716	List <Map <String, Object>> datas = getHyjdcList(time, userId);
716	717	Map <String, String> cnames = new LinkedHashMap <>();
	718	+ cnames.put("xz", "乡镇");
717	719	cnames.put("username", "姓名");
718	720	cnames.put("certificateNum", "证件号");
719	721	cnames.put("age", "年龄");
...	...	@@ -759,6 +761,7 @@
759	761	if (CollectionUtils.isNotEmpty(yjList)) {
760	762	for (int i = 0; i < yjList.size(); i++) {
761	763	Map <String, Object> yjjMap = new HashMap();
	764	+ yjjMap.put("xz",item.getName());
762	765	PreEugenicsBaseModel preEugenicsBaseModel = yjList.get(i);
763	766	yjjMap.put("username", preEugenicsBaseModel.getWifeName());//姓名
764	767	yjjMap.put("certificateNum", preEugenicsBaseModel.getWifeCardNo());//证件号
...	...	@@ -771,7 +774,6 @@
771	774	yjjMap.put("phone", preEugenicsBaseModel.getWifePhone());//联系电话
772	775	yjjMap.put("spouseName", preEugenicsBaseModel.getHusbandName());//配偶姓名
773	776	yjjMap.put("spousePhone", preEugenicsBaseModel.getHusbandPhone());//联系方式
774		-
775	777	yjdcList.add(yjjMap);
776	778	}
777	779	}
...	...	@@ -797,8 +799,6 @@
797	799	List <BasicConfig> items = basicConfigService.queryByParentId(organization.getAreaId());
798	800	if (CollectionUtils.isNotEmpty(items)) {
799	801	for (BasicConfig item : items) {
800		- Map <String, Object> data = new HashMap();
801		- data.put("name", item.getName());
802	802	/婚检/
803	803	List <String> residentsIds = getResidentsIds(hospitalId, item);
804	804	//通过建档 residentsIds 获取这短时间婚检孕检的男女
...	...	@@ -820,6 +820,7 @@
820	820	if (CollectionUtils.isNotEmpty(hjList)) {
821	821	for (int i = 0; i < hjList.size(); i++) {
822	822	Map <String, Object> hyjMap = new HashMap();
	823	+ hyjMap.put("xz", item.getName());//乡镇
823	824	//检查数据
824	825	PremaritalCheckup premaritalCheckup = hjList.get(i);
825	826	if (premaritalCheckup != null && StringUtils.isNotEmpty(premaritalCheckup.getParentId())) {