jiangjiazhi / regional-platform

Commit 1d370ce10d624d6ffea075d0da6ed888e02a5685

Authored by shiyang almost 3 years ago

Exists in master and in 6 other branches

隆化：儿童建档增加预约建档号，获取最新一个儿童的就诊卡号生成新的号码逻辑

Showing 6 changed files with 80 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.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/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java

...	...	@@ -888,6 +888,19 @@
888	888	*/
889	889	private String babyAccountNature;
890	890
	891	+ /**
	892	+ * 隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
	893	+ */
	894	+ private String vcCardNoArticle;
	895	+
	896	+ public String getVcCardNoArticle() {
	897	+ return vcCardNoArticle;
	898	+ }
	899	+
	900	+ public void setVcCardNoArticle(String vcCardNoArticle) {
	901	+ this.vcCardNoArticle = vcCardNoArticle;
	902	+ }
	903	+
891	904	public String getBabyAccountNature() {
892	905	return babyAccountNature;
893	906	}

...	...	@@ -1699,6 +1699,8 @@
1699	1699	bm.setBabyAreaId(b.getBabyAreaId());
1700	1700	bm.setBabyStreetId(b.getBabyStreetId());
1701	1701	bm.setBabyAddress(b.getBabyAddress());
	1702	+ //隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
	1703	+ bm.setVcCardNoArticle(b.getVcCardNoArticle());
1702	1704
1703	1705	return bm;
1704	1706	}
...	...	@@ -2135,6 +2137,8 @@
2135	2137	result.setBabyAreaId(model.getBabyAreaId());
2136	2138	result.setBabyStreetId(model.getBabyStreetId());
2137	2139	result.setBabyAddress(model.getBabyAddress());
	2140	+ //隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
	2141	+ result.setVcCardNoArticle(model.getVcCardNoArticle());
2138	2142	return result;
2139	2143	}
2140	2144
2141	2145
2142	2146
2143	2147
...	...	@@ -6448,20 +6452,38 @@
6448	6452	babyModelQuery.setHospitalId(hospitalId);
6449	6453	babyModelQuery.setNeed("y");
6450	6454	babyModelQuery.setPage(1);
6451		- babyModelQuery.setLimit(5);
	6455	+ babyModelQuery.setLimit(10);
	6456	+ //判断是否重复
6452	6457	if(StringUtils.isNotEmpty(vcard)){
6453	6458	babyModelQuery.setVcCardNo(vcard);
	6459	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
	6460	+ if(CollectionUtils.isNotEmpty(models)){
	6461	+ return baseResponse.setErrormsg("就诊卡号:"+vcard+"已存在请刷新页面重新获取").setErrorcode(ErrorCodeConstants.DATA_EXIST);
	6462	+ }
6454	6463	}
6455	6464	//新就诊卡号
6456	6465	String newVcard="";
6457	6466	List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
6458	6467	for (int i=0; i<babyModels.size();i++){
6459	6468	if (StringUtils.isNotEmpty(babyModels.get(i).getVcCardNo())) {
	6469	+ newVcard=babyModels.get(i).getVcCardNo();
	6470	+ String b="";
	6471	+ for (int j=0;j<newVcard.length();j++){
	6472	+ char ch=newVcard.charAt(j);
	6473	+ if ((ch>='a' && ch<='z') \|\| (ch>='A' && ch<='Z')) {
	6474	+ continue;
	6475	+ }
	6476	+ b+=ch;
	6477	+ }
	6478	+ if(com.lyms.platform.common.utils.NumberUtils.isNumber(b)){
	6479	+ newVcard=String.valueOf(Integer.valueOf(b)+1);
	6480	+ baseResponse.setObject(newVcard);
	6481	+ }else {
	6482	+ newVcard="";
	6483	+ }
6460	6484	break;
6461	6485	}
6462	6486	}
6463		-
6464		-
6465	6487	if(StringUtils.isEmpty(newVcard)){
6466	6488	baseResponse.setErrormsg("生成就诊卡号失败").setErrorcode(ErrorCodeConstants.NO_DATA).setObject(newVcard);
6467	6489	}

...	...	@@ -5563,6 +5563,9 @@
5563	5563
5564	5564	result.setFatherLevel(getBasicConfig(model.getfLevelId()));
5565	5565	result.setFatherProfessionType(getBasicConfig(model.getFproTypeId()));
	5566	+ //隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
	5567	+ result.setVcCardNoArticle(model.getVcCardNoArticle());
	5568	+
5566	5569	if (StringUtils.isNotEmpty(model.getDeliverOrg())) {
5567	5570	try {
5568	5571	Organization organization = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg()));

...	...	@@ -446,6 +446,18 @@
446	446	*详细地址
447	447	*/
448	448	private String babyAddress;
	449	+ /**
	450	+ * 隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
	451	+ */
	452	+ private String vcCardNoArticle;
	453	+
	454	+ public String getVcCardNoArticle() {
	455	+ return vcCardNoArticle;
	456	+ }
	457	+
	458	+ public void setVcCardNoArticle(String vcCardNoArticle) {
	459	+ this.vcCardNoArticle = vcCardNoArticle;
	460	+ }
449	461
450	462	public String getBabyProvinceId() {
451	463	return babyProvinceId;

...	...	@@ -389,6 +389,18 @@
389	389	*/
390	390	private String babyAddress;
391	391
	392	+ /**
	393	+ * 隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
	394	+ */
	395	+ private String vcCardNoArticle;
	396	+
	397	+ public String getVcCardNoArticle() {
	398	+ return vcCardNoArticle;
	399	+ }
	400	+
	401	+ public void setVcCardNoArticle(String vcCardNoArticle) {
	402	+ this.vcCardNoArticle = vcCardNoArticle;
	403	+ }
392	404	public String getBabyProvinceId() {
393	405	return babyProvinceId;
394	406	}

...	...	@@ -381,7 +381,19 @@
381	381	*详细地址
382	382	*/
383	383	private String babyAddress;
	384	+ /**
	385	+ * 隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
	386	+ */
	387	+ private String vcCardNoArticle;
384	388
	389	+ public String getVcCardNoArticle() {
	390	+ return vcCardNoArticle;
	391	+ }
	392	+
	393	+ public void setVcCardNoArticle(String vcCardNoArticle) {
	394	+ this.vcCardNoArticle = vcCardNoArticle;
	395	+ }
	396	+
385	397	public String getBabyProvinceId() {
386	398	return babyProvinceId;
387	399	}
...	...	@@ -1575,6 +1587,9 @@
1575	1587	setBabyAreaId(destModel.getBabyAreaId());
1576	1588	setBabyStreetId(destModel.getBabyStreetId());
1577	1589	setBabyAddress(destModel.getBabyAddress());
	1590	+ //隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
	1591	+ setVcCardNoArticle(destModel.getVcCardNoArticle());
	1592	+
1578	1593	return this;
1579	1594	}
1580	1595