From 65f9215ccd3a5ea27a031cf4f589c8b112438380 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 6 Jan 2021 15:58:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80=E5=92=8C=E5=84=BF=E7=AB=A5?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/utils/StringUtils.java | 11 +++++++++- .../com/lyms/platform/pojo/PremaritalCheckup.java | 10 +++++++++ .../platform/query/PremaritalCheckupQuery.java | 11 ++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- .../web/facade/PremaritalCheckupFacade.java | 24 ++++++++++++++++++++++ .../web/result/PremaritalCheckupResult.java | 10 +++++++++ 6 files changed, 66 insertions(+), 2 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index 4243c2f..be70222 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -84,7 +84,7 @@ public final class StringUtils { } public static void main(String[] args) { - System.out.println(dueWeekSwitchDays("1周2天")); + System.out.println(numCodeStr(2020010711L)); } @@ -415,4 +415,13 @@ public final class StringUtils { } + public static String numCodeStr(Long numCode) { + if (numCode != null) + { + StringBuffer sb = new StringBuffer(String.valueOf(numCode)); + sb.insert(8,"-"); + return sb.toString(); + } + return ""; + } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index 31e40b6..a67c881 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -455,6 +455,16 @@ public class PremaritalCheckup extends BaseModel { //用户签名 private String userSign; + //滦平婚检每个用户分配一个编号20200107-1 20200107-2 + private Long numCode; + + public Long getNumCode() { + return numCode; + } + + public void setNumCode(Long numCode) { + this.numCode = numCode; + } public String getBaseSign() { return baseSign; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java index a2b0b20..ea36c81 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java @@ -62,6 +62,7 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ private String zywzzlState; //膏药 private String gyState; + private Long numCode; @Override public MongoQuery convertToQuery() { @@ -93,6 +94,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ if (created!=null) { condition = condition.and("created", created, MongoOper.IS); } + if (numCode!=null) { + condition = condition.and("numCode", true, MongoOper.EXISTS); + } if (modified!=null) { condition = condition.and("modified", modified, MongoOper.IS); } @@ -145,6 +149,13 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ return condition.toMongoQuery(); } + public Long getNumCode() { + return numCode; + } + + public void setNumCode(Long numCode) { + this.numCode = numCode; + } public Date getModifiedStart() { return modifiedStart; } 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 43cd3e3..e980b2b 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 @@ -879,7 +879,7 @@ public class BabyBookbuildingFacade { operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档"); model.setEndCase(0);//秦皇岛，默认未结案 - //setRiksCode(model); + setRiksCode(model); model = babyBookbuildingService.addBabyBookbuilding(model); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 294c536..e98253e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -33,6 +33,7 @@ import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; @@ -473,6 +474,7 @@ public class PremaritalCheckupFacade { checkupResult.setUserSign(result.getUserSign()); checkupResult.setJczt(result.getJczt()); checkupResult.setFkjjState(result.getFkjjState()); + checkupResult.setNumCode(com.lyms.platform.common.utils.StringUtils.numCodeStr(result.getNumCode())); return checkupResult; } @@ -944,6 +946,7 @@ public class PremaritalCheckupFacade { checkup.setPublishId(userId); checkup.setCreated(new Date()); checkup.setHospitalId(addRequest.getHospitalId()); + setNumCode(checkup); PremaritalCheckup premaritalCheckup = premaritalCheckupService.addPremaritalCheckup(checkup); id = premaritalCheckup.getId(); } @@ -952,6 +955,27 @@ public class PremaritalCheckupFacade { return id; } + + public synchronized void setNumCode(PremaritalCheckup checkup) + { + Long result = Long.valueOf(DateUtil.getymd6()+"1"); + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setPage(1); + query.setLimit(1); + query.setNeed("y"); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(checkup.getHospitalId()); + List data = premaritalCheckupService.queryPremaritalCheckup(query); + if (CollectionUtils.isNotEmpty(data)) + { + if (data.get(0).getNumCode() != null && String.valueOf(data.get(0).getNumCode()).contains(DateUtil.getYmd())) + { + result = data.get(0).getNumCode()+1; + } + } + checkup.setNumCode(result); + } + /** * 新增婚检时追访信息 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index d667217..bd11089 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -425,6 +425,16 @@ public class PremaritalCheckupResult { //加上绝经 1否 2 是 private String fkjjState; + private String numCode; + + public String getNumCode() { + return numCode; + } + + public void setNumCode(String numCode) { + this.numCode = numCode; + } + public String getJczt() { return jczt; } -- 1.8.3.1