jiangjiazhi / regional-platform

Commit 65f9215ccd3a5ea27a031cf4f589c8b112438380

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

婚检和儿童编号

Showing 6 changed files with 66 additions and 2 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java

...	...	@@ -84,7 +84,7 @@
84	84	}
85	85
86	86	public static void main(String[] args) {
87		- System.out.println(dueWeekSwitchDays("1周2天"));
	87	+ System.out.println(numCodeStr(2020010711L));
88	88	}
89	89
90	90
...	...	@@ -415,5 +415,14 @@
415	415	}
416	416
417	417
	418	+ public static String numCodeStr(Long numCode) {
	419	+ if (numCode != null)
	420	+ {
	421	+ StringBuffer sb = new StringBuffer(String.valueOf(numCode));
	422	+ sb.insert(8,"-");
	423	+ return sb.toString();
	424	+ }
	425	+ return "";
	426	+ }
418	427	}

...	...	@@ -455,6 +455,16 @@
455	455	//用户签名
456	456	private String userSign;
457	457
	458	+ //滦平婚检每个用户分配一个编号20200107-1 20200107-2
	459	+ private Long numCode;
	460	+
	461	+ public Long getNumCode() {
	462	+ return numCode;
	463	+ }
	464	+
	465	+ public void setNumCode(Long numCode) {
	466	+ this.numCode = numCode;
	467	+ }
458	468
459	469	public String getBaseSign() {
460	470	return baseSign;

...	...	@@ -62,6 +62,7 @@
62	62	private String zywzzlState;
63	63	//膏药
64	64	private String gyState;
	65	+ private Long numCode;
65	66
66	67	@Override
67	68	public MongoQuery convertToQuery() {
...	...	@@ -93,6 +94,9 @@
93	94	if (created!=null) {
94	95	condition = condition.and("created", created, MongoOper.IS);
95	96	}
	97	+ if (numCode!=null) {
	98	+ condition = condition.and("numCode", true, MongoOper.EXISTS);
	99	+ }
96	100	if (modified!=null) {
97	101	condition = condition.and("modified", modified, MongoOper.IS);
98	102	}
...	...	@@ -145,6 +149,13 @@
145	149	return condition.toMongoQuery();
146	150	}
147	151
	152	+ public Long getNumCode() {
	153	+ return numCode;
	154	+ }
	155	+
	156	+ public void setNumCode(Long numCode) {
	157	+ this.numCode = numCode;
	158	+ }
148	159	public Date getModifiedStart() {
149	160	return modifiedStart;
150	161	}

...	...	@@ -879,7 +879,7 @@
879	879	operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档");
880	880	model.setEndCase(0);//秦皇岛，默认未结案
881	881
882		- //setRiksCode(model);
	882	+ setRiksCode(model);
883	883	model = babyBookbuildingService.addBabyBookbuilding(model);
884	884
885	885

...	...	@@ -33,6 +33,7 @@
33	33	import org.apache.commons.collections.CollectionUtils;
34	34	import org.apache.commons.lang.StringUtils;
35	35	import org.springframework.beans.factory.annotation.Autowired;
	36	+import org.springframework.data.domain.Sort;
36	37	import org.springframework.stereotype.Component;
37	38
38	39	import javax.servlet.http.HttpServletResponse;
...	...	@@ -473,6 +474,7 @@
473	474	checkupResult.setUserSign(result.getUserSign());
474	475	checkupResult.setJczt(result.getJczt());
475	476	checkupResult.setFkjjState(result.getFkjjState());
	477	+ checkupResult.setNumCode(com.lyms.platform.common.utils.StringUtils.numCodeStr(result.getNumCode()));
476	478	return checkupResult;
477	479	}
478	480
479	481
...	...	@@ -944,12 +946,34 @@
944	946	checkup.setPublishId(userId);
945	947	checkup.setCreated(new Date());
946	948	checkup.setHospitalId(addRequest.getHospitalId());
	949	+ setNumCode(checkup);
947	950	PremaritalCheckup premaritalCheckup = premaritalCheckupService.addPremaritalCheckup(checkup);
948	951	id = premaritalCheckup.getId();
949	952	}
950	953
951	954	addTrackDownInfo(userId, model);
952	955	return id;
	956	+ }
	957	+
	958	+
	959	+ public synchronized void setNumCode(PremaritalCheckup checkup)
	960	+ {
	961	+ Long result = Long.valueOf(DateUtil.getymd6()+"1");
	962	+ PremaritalCheckupQuery query = new PremaritalCheckupQuery();
	963	+ query.setPage(1);
	964	+ query.setLimit(1);
	965	+ query.setNeed("y");
	966	+ query.setYn(YnEnums.YES.getId());
	967	+ query.setHospitalId(checkup.getHospitalId());
	968	+ List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
	969	+ if (CollectionUtils.isNotEmpty(data))
	970	+ {
	971	+ if (data.get(0).getNumCode() != null && String.valueOf(data.get(0).getNumCode()).contains(DateUtil.getYmd()))
	972	+ {
	973	+ result = data.get(0).getNumCode()+1;
	974	+ }
	975	+ }
	976	+ checkup.setNumCode(result);
953	977	}
954	978
955	979	/**

...	...	@@ -425,6 +425,16 @@
425	425	//加上绝经 1否 2 是
426	426	private String fkjjState;
427	427
	428	+ private String numCode;
	429	+
	430	+ public String getNumCode() {
	431	+ return numCode;
	432	+ }
	433	+
	434	+ public void setNumCode(String numCode) {
	435	+ this.numCode = numCode;
	436	+ }
	437	+
428	438	public String getJczt() {
429	439	return jczt;
430	440	}