From b671ba5cac20132d5b783b628611704a661577bc Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 18 Mar 2020 09:01:59 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/pojo/BabyModel.java | 10 ++++++++++ .../java/com/lyms/platform/query/BabyModelQuery.java | 7 ++----- .../java/com/lyms/platform/query/PatientsQuery.java | 12 ------------ .../main/java/com/lyms/platform/operate/web/Test.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 14 +++++++++++++- .../lyms/platform/operate/web/facade/BoneFacade.java | 4 ++-- .../operate/web/facade/BookbuildingFacade.java | 18 ++++++------------ .../main/java/com/lyms/platform/worker/BoneWorker.java | 2 +- platform-transfer/src/main/resources/application.yml | 2 +- .../src/main/resources/lib/Access_JDBC30.jar | 0 10 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 platform-transfer/src/main/resources/lib/Access_JDBC30.jar 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 3d3506d..8f6a9c7 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 @@ -398,6 +398,16 @@ public class BabyModel extends BaseModel { //居住类别 private String liveType; + private String numberCode; + + public String getNumberCode() { + return numberCode; + } + + public void setNumberCode(String numberCode) { + this.numberCode = numberCode; + } + public Integer getEndCase() { return endCase; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 26f88f7..0fd9142 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -106,7 +106,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //母亲证件号 private String mcertNo; - private String mcertNoEnd; //就诊卡号 private String vcCardNo; @@ -886,7 +885,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("blNo", hasBlno, MongoOper.EXISTS); } if (null != numberCode) { - condition = condition.and("numberCode", numberCode, MongoOper.LIKE); + condition = condition.and("numberCode", numberCode, MongoOper.IS); } if (-1 != visitstatus) { @@ -969,9 +968,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (!StringUtils.isEmpty(mcertNo)) { condition = condition.and("mcertNo", mcertNo, MongoOper.IS); } - if (!StringUtils.isEmpty(mcertNoEnd)) { - condition = condition.and("mcertNo", "^"+mcertNoEnd, MongoOper.LIKE); - } + if (!StringUtils.isEmpty(cardNo)) { condition = condition.and("cardNo", cardNo, MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 6ced10e..2d9a4b7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -183,7 +183,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { * 身份证号码 */ private String cardNo; - private String cardNoEnd; private Date birth; @@ -371,13 +370,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String trackHospitalId; - public String getCardNoEnd() { - return cardNoEnd; - } - - public void setCardNoEnd(String cardNoEnd) { - this.cardNoEnd = cardNoEnd; - } public String getTrackHospitalId() { return trackHospitalId; @@ -680,10 +672,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("cardNo", cardNo, MongoOper.IS); } - if (StringUtils.isNotEmpty(cardNoEnd)) { - condition = condition.and("cardNo", "^" + cardNoEnd, MongoOper.LIKE); - - } if (null != vcCardNos) { condition = condition.and("vcCardNo", vcCardNos, MongoOper.IN); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 1bd8f91..97968d9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -20,7 +20,7 @@ public class Test { // Map resutl = getSignParams("bisp-czsfy", "czsfy123$"); // System.out.println(resutl); - System.out.println(contain("偏大","偏大异常")); + System.out.println("360102199003079318".substring("360102199003079318".length() - 8)); } public static boolean contain(String value, String content) { 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 8dab54d..23e46d6 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 @@ -770,7 +770,7 @@ public class BabyBookbuildingFacade { model.setBuildType(1); model.setHospitalId(request.getHospitalId()); // String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName(); - + getNumberCode(model); operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档"); model = babyBookbuildingService.addBabyBookbuilding(model); @@ -818,6 +818,18 @@ public class BabyBookbuildingFacade { return br; } + private void getNumberCode(BabyModel model) + { + if (model.getMcertNo().length() > 8) + { + model.setNumberCode(model.getMcertNo().substring(model.getMcertNo().length() - 8)); + } + else + { + model.setNumberCode(model.getMcertNo()); + } + } + /** * 秦皇岛妇幼儿童建档后根据住院号 更新诊断记录为已经建档状态 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java index 6db5be3..b37ea33 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java @@ -263,7 +263,7 @@ public class BoneFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); - patientsQuery.setCardNo(boneModel.getCardNo()); + patientsQuery.setNumberCode(boneModel.getCardNo()); List patients = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) { @@ -284,7 +284,7 @@ public class BoneFacade { { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setMcertNo(boneModel.getCardNo()); + babyModelQuery.setNumberCode(boneModel.getCardNo()); List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); if (CollectionUtils.isNotEmpty(babyModels)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index bb0eaa1..f55c000 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -531,20 +531,14 @@ public class BookbuildingFacade { private void getNumberCode(Patients patients) { - String numberCode = ""; - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setYn(YnEnums.YES.getId()); - while (true) + if (patients.getCardNo().length() > 8) { - numberCode = patients.getHospitalId()+DateUtil.getYmd(new Date()) + new Random().nextInt(9999); - patientsQuery.setNumberCode(numberCode); - List patientses = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (!CollectionUtils.isNotEmpty(patientses)) - { - break; - } + patients.setNumberCode(patients.getCardNo().substring(patients.getCardNo().length() - 8)); + } + else + { + patients.setNumberCode(patients.getCardNo()); } - patients.setNumberCode(numberCode); } diff --git a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java index 87022e3..90ca60c 100644 --- a/platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java +++ b/platform-transfer/src/main/java/com/lyms/platform/worker/BoneWorker.java @@ -26,7 +26,7 @@ public class BoneWorker { @Autowired private ApplicationProperties properties; - @Scheduled(cron = "0 0/10 * * * ?") + @Scheduled(cron = "0 0/1 * * * ?") public void getBoneRecords() { System.out.println("getBoneRecords start"); diff --git a/platform-transfer/src/main/resources/application.yml b/platform-transfer/src/main/resources/application.yml index cbf5e99..7e03c91 100644 --- a/platform-transfer/src/main/resources/application.yml +++ b/platform-transfer/src/main/resources/application.yml @@ -4,7 +4,7 @@ server: param: #微量元素access路径 - microelement-path: D://tc.mdb + microelement-path: D://EK-8800181001-net_Plus//System//Patient.mdb #骨密度access数据库路径 bone-path: D://tc.mdb #区域url地址 diff --git a/platform-transfer/src/main/resources/lib/Access_JDBC30.jar b/platform-transfer/src/main/resources/lib/Access_JDBC30.jar new file mode 100644 index 0000000..e69de29 -- 1.8.3.1