jiangjiazhi / regional-platform

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 5 additions and 5 deletions

...	...	@@ -38,7 +38,7 @@
38	38	public List<BabySieveModel> getBabySieveQuery1(BabySieveQuery babySieveQuery){
39	39	MongoQuery query = babySieveQuery.convertToQuery();
40	40	//babySieveQuery.mysqlBuild(babySieveDao.queryBabySieveCount(query));
41		- query.start(1).end(1);
	41	+ query.start(0).end(1);
42	42
43	43	return babySieveDao.queryBabySieve(query.addOrder(Sort.Direction.DESC, "testNumber"));
44	44	}

...	...	@@ -994,17 +994,17 @@
994	994	if(list1 != null && list1.size() > 0){
995	995	babySieveModel = list1.get(0);
996	996	//倒序查询最大的初筛试验号
997		- List<BabySieveModel> list = babySieveService.getBabySieveQuery1(babySieveQuery);
	997	+ List<BabySieveModel> list = babySieveService.getBabySieveQuery1(new BabySieveQuery());
998	998	if(list != null && list.size() > 0){
999		- String today = DateUtil.getymd();
	999	+ String today = DateUtil.getymd6();
1000	1000	//判断初筛试验号是否有值（确定第一次使用系统的时间，来编号）
1001	1001	if(StringUtils.isNotEmpty(list.get(0).getTestNumber())){
1002	1002	String num = list.get(0).getTestNumber();
1003	1003	//比较今天是否有新生儿做过新筛检查
1004	1004	if(today.equals(num.substring(0,8))){
1005		- String shu = num.substring(8);
	1005	+ String shu = num.substring(7);
1006	1006	int can = Integer.parseInt(shu);
1007		- babySieveModel.setTestNumber((num.substring(0, 8)) + String.valueOf(can + 1));
	1007	+ babySieveModel.setTestNumber((num.substring(0, 7)) + String.valueOf(can + 1));
1008	1008	}else{
1009	1009	babySieveModel.setTestNumber(today+"0001");
1010	1010	}