jiangjiazhi / regional-platform

Commit eab54cec075bc1a11d6f0a46aba53b458956e17d

Authored by liquanyu almost 2 years ago

Exists in master and in 3 other branches

两癌导出

Showing 4 changed files with 74 additions and 25 deletions

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/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java

...	...	@@ -353,8 +353,7 @@
353	353
354	354	patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
355	355	patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周
356		- DoctorDTO doctorDTO = yunRequest.getBooksuifangDoctor();
357		- patient.setBooksuifangDoctor(doctorDTO != null ? String.valueOf(doctorDTO.getId()) : null);
	356	+ patient.setBooksuifangDoctor(yunRequest.getBooksuifangDoctor());
358	357	//承德市妇幼通过就诊卡号查询到病人id保存下来
359	358	if ("2100001291".equals(patient.getHospitalId()) && StringUtils.isNotEmpty(yunRequest.getVcCardNo())) {
360	359	patient.setBlNum(cdfyHisService.getIdByVcCardNo(yunRequest.getVcCardNo()));
...	...	@@ -1220,8 +1219,7 @@
1220	1219	patient.setYyzyfmHospitalId(yunRequest.getYyzyfmHospitalId());
1221	1220	patient.setNextCheckTime(DateUtil.parseYMD(yunRequest.getNextCheckTime()));
1222	1221	patient.setcDueWeek(yunRequest.getcDueWeek());//前端计算出来的孕周
1223		- DoctorDTO doctorDTO = yunRequest.getBooksuifangDoctor();
1224		- patient.setBooksuifangDoctor(doctorDTO != null ? String.valueOf(doctorDTO.getId()) : null);
	1222	+ patient.setBooksuifangDoctor(yunRequest.getBooksuifangDoctor());
1225	1223	patient.setModified(new Date());
1226	1224	patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), DateUtil.parseYMD(yunRequest.getBookbuildingDate())));
1227	1225	// patient.setHospitalId(autoMatchFacade.getHospitalId(userId));

...	...	@@ -208,13 +208,18 @@
208	208	public void exportLasc(CancerScreeningRequest queryRequest, Integer id, HttpServletResponse response){
209	209	List <Map <String, Object>> datas = getLascList(queryRequest, id);
210	210	Map <String, String> cnames = new LinkedHashMap <>();
211		- // cnames.put("xz", "乡镇");
212		- cnames.put("created", "检查日期");
213	211	cnames.put("name", "姓名");
	212	+ cnames.put("sex", "性別");
	213	+ cnames.put("nation", "民族");
214	214	cnames.put("age", "年龄");
215	215	cnames.put("cardNum", "证件号");
216		- cnames.put("phone", "联系方式");
217		- cnames.put("liveAddress", "住址");
	216	+ cnames.put("marriage", "婚否");
	217	+ cnames.put("phone", "本人电话");
	218	+ cnames.put("contactName", "联系人姓名");
	219	+ cnames.put("contactPhone", "联系人电话");
	220	+ cnames.put("levelType", "文化程度");
	221	+ cnames.put("liveAddress", "家庭地址");
	222	+ cnames.put("country", "乡镇");
218	223	ResponseUtil.responseExcel(cnames, datas, response);
219	224	}
220	225
221	226
222	227
223	228
...	...	@@ -224,15 +229,36 @@
224	229	CancerScreeningQuery query = getCancerScreeningQuery(queryRequest, hospitalId);
225	230	List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
226	231	if (CollectionUtils.isNotEmpty(modelList)) {
	232	+ ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
227	233	for (CancerScreeningModel model : modelList) {
228	234	Map <String, Object> map = new HashMap <>();
229		- map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));//检查日期
	235	+ if (StringUtils.isNotEmpty(model.getCertificateNum())){
	236	+ archiveQuery.setCertificateNum(model.getCertificateNum());
	237	+ List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery);
	238	+ if (CollectionUtils.isNotEmpty(archiveModelList)){
	239	+ ResidentsArchiveModel residentsArchiveModel = archiveModelList.get(0);
	240	+ map.put("marriage", FunvCommonUtil.getBaseicConfigByid(residentsArchiveModel.getMarriageId(),
	241	+ basicConfigService));
	242	+ map.put("nation", FunvCommonUtil.getBaseicConfigByid(model.getNationId(), basicConfigService));
	243	+ map.put("levelType", FunvCommonUtil.getBaseicConfigByid(residentsArchiveModel.getLevelTypeId(), basicConfigService));
	244	+ } else{
	245	+ map.put("marriage","");
	246	+ map.put("nation","汉族");
	247	+ map.put("levelType","");
	248	+ }
	249	+ }
	250	+
	251	+ map.put("contactName", "");
	252	+ map.put("contactPhone", "");
230	253	map.put("name", model.getUsername());//姓名
	254	+ map.put("sex", "女");//姓名
231	255	map.put("age", DateUtil.getAge(model.getBirthday()));//年龄
232	256	map.put("cardNum", model.getCertificateNum());//证件号
233	257	map.put("phone", model.getPhone());//联系方式
234	258	map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
235	259	model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址
	260	+ map.put("country", CommonsHelper.getResidence(null, null,
	261	+ null, model.getStreetId(), null, basicConfigService));//住址
236	262	lascList.add(map);
237	263	}
238	264	}

...	...	@@ -52,10 +52,10 @@
52	52	private FilePathModel filePath;
53	53
54	54	//随访医生
55		- //private String booksuifangDoctor;
	55	+ private String booksuifangDoctor;
56	56
57		- //随访医生
58		- private DoctorDTO booksuifangDoctor;
	57	+// //随访医生
	58	+// private DoctorDTO booksuifangDoctor;
59	59
60	60	//孕妇证件核验方式 1 自动核验 2人工核验
61	61	private String patientVerifType;
62	62
...	...	@@ -107,11 +107,11 @@
107	107	this.level = level;
108	108	}
109	109
110		- public DoctorDTO getBooksuifangDoctor() {
	110	+ public String getBooksuifangDoctor() {
111	111	return booksuifangDoctor;
112	112	}
113	113
114		- public void setBooksuifangDoctor(DoctorDTO booksuifangDoctor) {
	114	+ public void setBooksuifangDoctor(String booksuifangDoctor) {
115	115	this.booksuifangDoctor = booksuifangDoctor;
116	116	}
117	117

...	...	@@ -17,6 +17,7 @@
17	17	import com.lyms.platform.operate.web.service.CervicalCancerService;
18	18	import com.lyms.platform.operate.web.utils.CollectionUtils;
19	19	import com.lyms.platform.operate.web.utils.CommonsHelper;
	20	+import com.lyms.platform.operate.web.utils.FunvCommonUtil;
20	21	import com.lyms.platform.operate.web.utils.ResponseUtil;
21	22	import com.lyms.platform.permission.model.Organization;
22	23	import com.lyms.platform.permission.model.Users;
23	24
24	25
...	...	@@ -406,12 +407,18 @@
406	407	Map <String, String> cnames = new LinkedHashMap <>();
407	408	//cnames.put("xz", "乡镇");
408	409	//cnames.put("checkPackage", "检查套餐");
409		- cnames.put("created", "检查日期");
410	410	cnames.put("name", "姓名");
	411	+ cnames.put("sex", "性別");
	412	+ cnames.put("nation", "民族");
411	413	cnames.put("age", "年龄");
412	414	cnames.put("cardNum", "证件号");
413		- cnames.put("phone", "联系方式");
414		- cnames.put("liveAddress", "住址");
	415	+ cnames.put("marriage", "婚否");
	416	+ cnames.put("phone", "本人电话");
	417	+ cnames.put("contactName", "联系人姓名");
	418	+ cnames.put("contactPhone", "联系人电话");
	419	+ cnames.put("levelType", "文化程度");
	420	+ cnames.put("liveAddress", "家庭地址");
	421	+ cnames.put("country", "乡镇");
415	422	ResponseUtil.responseExcel(cnames, datas, response);
416	423	}
417	424
418	425
419	426
420	427
...	...	@@ -421,19 +428,37 @@
421	428	String hospitalId = autoMatchFacade.getHospitalId(userId);
422	429	Query query = extracted(param, hospitalId);
423	430	List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class);
	431	+ ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
424	432	for (CervicalCancerModel model : cervicalCancerModels) {
425	433	Map <String, Object> map = new HashMap <>();
426		- //map.put("xz", item.getName());//乡镇
427		- //map.put("checkPackage", null!=model.getCheckPackage()?model.getCheckPackage()==1?"宫颈癌筛查":"宫颈+B超检查":"");//检查套餐
428		- map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));//检查日期
	434	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getIdCardNo())){
	435	+ archiveQuery.setCertificateNum(model.getParentId());
	436	+ List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery);
	437	+ if (org.apache.commons.collections.CollectionUtils.isNotEmpty(archiveModelList)){
	438	+ ResidentsArchiveModel residentsArchiveModel = archiveModelList.get(0);
	439	+ map.put("marriage", FunvCommonUtil.getBaseicConfigByid(residentsArchiveModel.getMarriageId(),
	440	+ basicConfigService));
	441	+ map.put("nation", FunvCommonUtil.getBaseicConfigByid(model.getNationId(), basicConfigService));
	442	+ map.put("levelType", FunvCommonUtil.getBaseicConfigByid(residentsArchiveModel.getLevelTypeId(),
	443	+ basicConfigService));
	444	+ } else{
	445	+ map.put("marriage","");
	446	+ map.put("nation","汉族");
	447	+ map.put("levelType","");
	448	+ }
	449	+ }
	450	+
	451	+ map.put("contactName", "");
	452	+ map.put("contactPhone", "");
429	453	map.put("name", model.getName());//姓名
430		- map.put("age", model.getAge());//年龄
	454	+ map.put("sex", "女");//姓名
	455	+ map.put("age",model.getAge());//年龄
431	456	map.put("cardNum", model.getIdCardNo());//证件号
432	457	map.put("phone", model.getPhone());//联系方式
433		- map.put("liveAddress", CommonsHelper.getResidence(
434		- model.getProvinceId(),model.getCityId(),
435		- model.getAreaId(),model.getStreetId(),
436		- null,basicConfigService));//住址
	458	+ map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
	459	+ model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址
	460	+ map.put("country", CommonsHelper.getResidence(null, null,
	461	+ null, model.getStreetId(), null, basicConfigService));//住址
437	462	gjaList.add(map);
438	463	}
439	464	return gjaList;