jiangjiazhi / regional-platform

Commit 24009cd38230362e4c463a0525309180d5f3e492

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

衡水导出

Showing 3 changed files with 23 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java

...	...	@@ -251,7 +251,7 @@
251	251
252	252	String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
253	253
254		- String hsColum = "vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation";
	254	+ String hsColum = "livingNumber,vcCardNo,name,cardNo,phone,husbandName,husbandCardNo,husbandPhone,pliveTypeId,pcensusTypeId,registerAddress,address,postAddress,dueDate,fileCode,chBpSsy1,chBpSzy1,dueWeek,fetalPosition,heartRate,fetalPresentation,perinealCondition,deliveryMode,breath,needleNum,pulse,prodprocessOne,prodprocessTwo,prodprocessThree,totalprocess,ohloseBloodL,thloseBloodL,rhloseBloodL,loseBloodCause,tpmcType,tpSize,tpWeight,umbilicalCordLength,umbilicalCordEx,umbilicalCordExType,tireNumber,maternalInfo,operationCause,fmHospital,deliverDoctor,sex,babyWeight,babyHeight,apgarScorePf1,apgarScorePf5,apgarScorePf10,pregnancyOut,asphyxiaM,deathCause,babyHealthy,malformation";
255	255
256	256	Organization o = organizationService.getOrganization(Integer.parseInt(hospitalId));
257	257	if (o != null && "12".equals(o.getCityId()))

...	...	@@ -2545,7 +2545,7 @@
2545	2545	List<MaternalDeliverModel> mlist = maternalDeliverModelList.subList(i, end);
2546	2546	Callable c = new MaterDeliverWorker(organizationService, usersService,
2547	2547	babyService, basicConfigService, childbirthManagerRequest.getInitQuery(),
2548		- mlist, patientsMap, postpartumRecordsService, recordsService);
	2548	+ mlist, patientsMap, postpartumRecordsService, recordsService,childbirthManagerRequest.getShowDetail());
2549	2549	Future f = commonThreadPool.submit(c);
2550	2550	if (f != null) {
2551	2551	futures.add(f);

...	...	@@ -40,11 +40,12 @@
40	40	private Map<String, Patients> patientsMap;
41	41	private PostpartumRecordsService postpartumRecordsService;
42	42	private RecordsService recordsService;
	43	+ private int showDetail;
43	44
44	45	public MaterDeliverWorker(OrganizationService organizationService,UsersService usersService,
45	46	BabyService babyService,BasicConfigService basicConfigService,String initQuery,
46	47	List<MaternalDeliverModel> maternalDeliverModelList,Map<String, Patients> patientsMap,
47		- PostpartumRecordsService postpartumRecordsService,RecordsService recordsService) {
	48	+ PostpartumRecordsService postpartumRecordsService,RecordsService recordsService,int showDetail) {
48	49	this.maternalDeliverModelList = maternalDeliverModelList;
49	50	this.patientsMap = patientsMap;
50	51	this.organizationService = organizationService;
...	...	@@ -54,6 +55,7 @@
54	55	this.basicConfigService = basicConfigService;
55	56	this.postpartumRecordsService = postpartumRecordsService;
56	57	this.recordsService = recordsService;
	58	+ this.showDetail = showDetail;
57	59	}
58	60
59	61	@Override
60	62
...	...	@@ -116,13 +118,25 @@
116	118	childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(),
117	119	patients.getStreetId(), patients.getAddress(), basicConfigService));
118	120	}
119		- // 电话转换
120		- childbirthManagerQueryModel.setPhone(patients.getPhone());
121		- childbirthManagerQueryModel.setHusbandPhone(patients.getHusbandPhone());
	121	+
	122	+ //带*
	123	+ if (showDetail == 1)
	124	+ {
	125	+ childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone()));
	126	+ childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone()));
	127	+
	128	+ childbirthManagerQueryModel.setHusbandCardNo(DefenceUtils.getCardNo(patients.getHcertificateNum()));
	129	+ childbirthManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo()));
	130	+ }
	131	+ else
	132	+ {
	133	+ childbirthManagerQueryModel.setPhone(patients.getPhone());
	134	+ childbirthManagerQueryModel.setHusbandPhone(patients.getHusbandPhone());
	135	+ childbirthManagerQueryModel.setHusbandCardNo(patients.getHcertificateNum());
	136	+ childbirthManagerQueryModel.setCardNo(patients.getCardNo());
	137	+ }
122	138	childbirthManagerQueryModel.setHusbandName(patients.getHusbandName());
123		- childbirthManagerQueryModel.setHusbandCardNo(patients.getHcertificateNum());
124		- // 加密身份证号
125		- childbirthManagerQueryModel.setCardNo(patients.getCardNo());
	139	+
126	140	// 年龄
127	141	childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth()));
128	142	childbirthManagerQueryModel.setFileCode(maternalDeliverModel.getBhNum());