jiangjiazhi / regional-platform

Commit 92796030aa8ab4432181902522ef8291da562645

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

新生儿筛查

Showing 3 changed files with 64 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java

...	...	@@ -21,6 +21,7 @@
21	21	public static SimpleDateFormat m_d = new SimpleDateFormat("MM/dd");
22	22	public static SimpleDateFormat y_m_d_h_m_s = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
23	23	public static SimpleDateFormat y_m_d_h_m1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
	24	+ public static SimpleDateFormat y_m_d_h = new SimpleDateFormat("yyyy-MM-dd HH");
24	25	public static String[] parsePatterns = {"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss",
25	26	"yyyy/MM/dd HH:mm"};
26	27
...	...	@@ -421,6 +422,34 @@
421	422	try {
422	423	lock.lock();
423	424	return y_m_d.parse(s);
	425	+ } catch (Exception e) {
	426	+ return null;
	427	+ } finally {
	428	+ lock.unlock();
	429	+ }
	430	+ }
	431	+
	432	+ public static Date paseYMDH(String s){
	433	+ if(s == null){
	434	+ return null;
	435	+ }
	436	+ try {
	437	+ lock.lock();
	438	+ return y_m_d_h.parse(s);
	439	+ } catch (Exception e) {
	440	+ return null;
	441	+ } finally {
	442	+ lock.unlock();
	443	+ }
	444	+ }
	445	+
	446	+ public static String getYMDH(Date d){
	447	+ if(d == null){
	448	+ return null;
	449	+ }
	450	+ try {
	451	+ lock.lock();
	452	+ return y_m_d_h.format(d);
424	453	} catch (Exception e) {
425	454	return null;
426	455	} finally {

...	...	@@ -119,6 +119,14 @@
119	119	if(mList != null && mList.size() > 0){
120	120	maternalDeliverModel = mList.get(0);
121	121	}
	122	+ List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby();
	123	+ for(MaternalDeliverModel.Baby baby : babies){
	124	+ if(baby.getId() != null && babyModel.getId().equals(baby.getId())){
	125	+ Date d = DateUtil.parseYMDHM(baby.getDueTime());
	126	+ data.setDueDate(DateUtil.getYMDH(d));
	127	+ break;
	128	+ }
	129	+ }
122	130	data.setMatdeliverId(maternalDeliverModel.getId());
123	131	//分娩方式
124	132	String deliveryMode = "";
...	...	@@ -156,7 +164,7 @@
156	164	data.setDueType(deliveryMode);
157	165	data.setOperationCause(maternalDeliverModel.getOperationCause() == null ? "--" : maternalDeliverModel.getOperationCause());
158	166	}
159		- data.setDueDate(maternalDeliverModel.getDueDate());
	167	+ //data.setDueDate(maternalDeliverModel.getDueDate());
160	168	data.setId(babyModel.getId());
161	169	data.setCardNo(pat.getCardNo());
162	170	data.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
163	171
...	...	@@ -428,7 +436,31 @@
428	436	*/
429	437	public BabySieveManagerResult getBabySieveLab(BabySieveAddRequest babySieveAddRequest){
430	438	BabySieveManagerResult babySieveManagerResult = new BabySieveManagerResult();
	439	+ BabySieveQuery babySieveQuery = new BabySieveQuery();
	440	+ if(StringUtils.isNotEmpty(babySieveAddRequest.getCollectHospitalId())){
	441	+ babySieveQuery.setCollectHospitalId(babySieveAddRequest.getCollectHospitalId());
	442	+ }
	443	+ if(StringUtils.isNotEmpty(babySieveAddRequest.getApplyDate())){
	444	+ try {
	445	+ babySieveQuery.setApplyDateStrat(DateUtil.getSNDate(babySieveAddRequest.getApplyDate())[0]);
	446	+ babySieveQuery.setApplyDateEnd(DateUtil.getSNDate(babySieveAddRequest.getApplyDate())[1]);
	447	+ } catch (Exception e) {
	448	+ e.printStackTrace();
	449	+ }
	450	+ }
	451	+ if(StringUtils.isNotEmpty(babySieveAddRequest.getTestNumber())){
	452	+ babySieveQuery.setTestNumber(babySieveAddRequest.getTestNumber());
	453	+ }
	454	+ List<BabySieveModel> list = babySieveService.getBabySieveQuery(babySieveQuery);
	455	+
	456	+
	457	+
431	458	BabyModelQuery babyModelQuery = new BabyModelQuery();
	459	+ if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){
	460	+ babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus());
	461	+ }
	462	+
	463	+
432	464	//查询号
433	465	babyModelQuery.setQueryNo(StringUtils.isEmpty(babySieveAddRequest.getQueryNo()) ? null : babySieveAddRequest.getQueryNo());
434	466	babyModelQuery.setDataStatus(false);

...	...	@@ -358,7 +358,7 @@
358	358	babySieveModel.setCurrentHospitalId(currentHospitalId);
359	359	babySieveModel.setAddress(address);
360	360	babySieveModel.setCollectHospitalId(collectHospitalId);
361		- babySieveModel.setCollectDate(DateUtil.parseYMD(collectDate));
	361	+ babySieveModel.setCollectDate(DateUtil.paseYMDH(collectDate));
362	362	babySieveModel.setCollectDocterId(collectDocterId);
363	363	babySieveModel.setTestNumber(testNumber);
364	364	babySieveModel.setMontherName(montherName);
...	...	@@ -367,7 +367,7 @@
367	367	babySieveModel.setMontherDisease(montherDisease);
368	368	babySieveModel.setPhone(phone);
369	369	babySieveModel.setAddress(address);
370		- babySieveModel.setBabyBirth(DateUtil.parseYMD(babyBirth));
	370	+ babySieveModel.setBabyBirth(DateUtil.paseYMDH(babyBirth));
371	371	babySieveModel.setDueWeek(dueWeek);
372	372	babySieveModel.setDueType(dueType);
373	373	babySieveModel.setDuescfs(duescfs);