From 0bc7be6f20683014d4da5f9f301d8672f1ab2551 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 12 Dec 2018 17:37:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=AD=9B=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/biz/service/BabySieveService.java | 2 +- .../com/lyms/platform/operate/web/facade/BabySieveFacede.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java index b162c48..312b880 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabySieveService.java @@ -38,7 +38,7 @@ public class BabySieveService { public List getBabySieveQuery1(BabySieveQuery babySieveQuery){ MongoQuery query = babySieveQuery.convertToQuery(); //babySieveQuery.mysqlBuild(babySieveDao.queryBabySieveCount(query)); - query.start(1).end(1); + query.start(0).end(1); return babySieveDao.queryBabySieve(query.addOrder(Sort.Direction.DESC, "testNumber")); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 42e7de8..20c2b70 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -994,17 +994,17 @@ public class BabySieveFacede { if(list1 != null && list1.size() > 0){ babySieveModel = list1.get(0); //倒序查询最大的初筛试验号 - List list = babySieveService.getBabySieveQuery1(babySieveQuery); + List list = babySieveService.getBabySieveQuery1(new BabySieveQuery()); if(list != null && list.size() > 0){ - String today = DateUtil.getymd(); + String today = DateUtil.getymd6(); //判断初筛试验号是否有值（确定第一次使用系统的时间，来编号） if(StringUtils.isNotEmpty(list.get(0).getTestNumber())){ String num = list.get(0).getTestNumber(); //比较今天是否有新生儿做过新筛检查 if(today.equals(num.substring(0,8))){ - String shu = num.substring(8); + String shu = num.substring(7); int can = Integer.parseInt(shu); - babySieveModel.setTestNumber((num.substring(0, 8)) + String.valueOf(can + 1)); + babySieveModel.setTestNumber((num.substring(0, 7)) + String.valueOf(can + 1)); }else{ babySieveModel.setTestNumber(today+"0001"); } -- 1.8.3.1