From 1d370ce10d624d6ffea075d0da6ed888e02a5685 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Fri, 8 Jul 2022 17:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96=EF=BC=9A=E5=84=BF=E7=AB=A5?= =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=BA=A6=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3=E5=8F=B7=EF=BC=8C=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=84=BF=E7=AB=A5=E7=9A=84=E5=B0=B1=E8=AF=8A?= =?UTF-8?q?=E5=8D=A1=E5=8F=B7=E7=94=9F=E6=88=90=E6=96=B0=E7=9A=84=E5=8F=B7?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyModel.java | 13 ++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 28 +++++++++++++++++++--- .../platform/operate/web/facade/ViewFacade.java | 3 +++ .../web/request/BabyBookbuildingAddRequest.java | 12 ++++++++++ .../operate/web/result/BabyBuildResult.java | 12 ++++++++++ .../operate/web/result/BabyPageResult.java | 15 ++++++++++++ 6 files changed, 80 insertions(+), 3 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 5b4e4ae..3af628c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -888,6 +888,19 @@ public class BabyModel extends BaseModel { */ private String babyAccountNature; + /** + * 隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成） + */ + private String vcCardNoArticle; + + public String getVcCardNoArticle() { + return vcCardNoArticle; + } + + public void setVcCardNoArticle(String vcCardNoArticle) { + this.vcCardNoArticle = vcCardNoArticle; + } + public String getBabyAccountNature() { return babyAccountNature; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index beb158d..753e220 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1699,6 +1699,8 @@ public class BabyBookbuildingFacade { bm.setBabyAreaId(b.getBabyAreaId()); bm.setBabyStreetId(b.getBabyStreetId()); bm.setBabyAddress(b.getBabyAddress()); + //隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成） + bm.setVcCardNoArticle(b.getVcCardNoArticle()); return bm; } @@ -2135,6 +2137,8 @@ public class BabyBookbuildingFacade { result.setBabyAreaId(model.getBabyAreaId()); result.setBabyStreetId(model.getBabyStreetId()); result.setBabyAddress(model.getBabyAddress()); + //隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成） + result.setVcCardNoArticle(model.getVcCardNoArticle()); return result; } @@ -6448,20 +6452,38 @@ public class BabyBookbuildingFacade { babyModelQuery.setHospitalId(hospitalId); babyModelQuery.setNeed("y"); babyModelQuery.setPage(1); - babyModelQuery.setLimit(5); + babyModelQuery.setLimit(10); + //判断是否重复 if(StringUtils.isNotEmpty(vcard)){ babyModelQuery.setVcCardNo(vcard); + List models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if(CollectionUtils.isNotEmpty(models)){ + return baseResponse.setErrormsg("就诊卡号:"+vcard+"已存在请刷新页面重新获取").setErrorcode(ErrorCodeConstants.DATA_EXIST); + } } //新就诊卡号 String newVcard=""; List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); for (int i=0; i='a' && ch<='z') || (ch>='A' && ch<='Z')) { + continue; + } + b+=ch; + } + if(com.lyms.platform.common.utils.NumberUtils.isNumber(b)){ + newVcard=String.valueOf(Integer.valueOf(b)+1); + baseResponse.setObject(newVcard); + }else { + newVcard=""; + } break; } } - - if(StringUtils.isEmpty(newVcard)){ baseResponse.setErrormsg("生成就诊卡号失败").setErrorcode(ErrorCodeConstants.NO_DATA).setObject(newVcard); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 156c461..7e836a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5563,6 +5563,9 @@ public class ViewFacade { result.setFatherLevel(getBasicConfig(model.getfLevelId())); result.setFatherProfessionType(getBasicConfig(model.getFproTypeId())); + //隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成） + result.setVcCardNoArticle(model.getVcCardNoArticle()); + if (StringUtils.isNotEmpty(model.getDeliverOrg())) { try { Organization organization = organizationService.getOrganization(Integer.parseInt(model.getDeliverOrg())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index f038d61..843d3cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -446,6 +446,18 @@ public class BabyBookbuildingAddRequest { *详细地址 */ private String babyAddress; + /** + * 隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成） + */ + private String vcCardNoArticle; + + public String getVcCardNoArticle() { + return vcCardNoArticle; + } + + public void setVcCardNoArticle(String vcCardNoArticle) { + this.vcCardNoArticle = vcCardNoArticle; + } public String getBabyProvinceId() { return babyProvinceId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index 7ebad1a..f89cd1f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -389,6 +389,18 @@ public class BabyBuildResult { */ private String babyAddress; + /** + * 隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成） + */ + private String vcCardNoArticle; + + public String getVcCardNoArticle() { + return vcCardNoArticle; + } + + public void setVcCardNoArticle(String vcCardNoArticle) { + this.vcCardNoArticle = vcCardNoArticle; + } public String getBabyProvinceId() { return babyProvinceId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 810beff..819987e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -381,6 +381,18 @@ public class BabyPageResult implements IBasicResultConvert