shiyang / regional-platform

Download as
Browse Code »

Commit d7ddda093477d05b778ba1542b91d4558a6d2a93

Authored by jiangjiazhi
2 parents 33a25e00cc b1465fa5e5
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ d7ddda0
... ... @@ -393,15 +393,10 @@
393 393 }
394 394  
395 395 if (null != nextDateStart && nextDateEnd != null) {
396   - if (c != null)
397   - {
398   - Criteria nc = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd);
399   - c.andOperator(nc);
400   - }
401   - else {
402   - c = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd);
403   - }
404   - condition.andCondition( new MongoCondition(c));
  396 +
  397 + Criteria cr = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd);
  398 + condition.andCondition(new MongoCondition(cr));
  399 +
405 400 }
406 401  
407 402 if (null != birthEnd) {
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ d7ddda0
... ... @@ -1240,7 +1240,7 @@
1240 1240 {
1241 1241 PatientsQuery patientsQuery = new PatientsQuery();
1242 1242 patientsQuery.setYn(YnEnums.YES.getId());
1243   - //1孕妇
  1243 + //1孕妇 3产妇
1244 1244 patientsQuery.setType(3);
1245 1245  
1246 1246 patientsQuery = getServicePatientQuery(serviceType, serviceStatus, patientsQuery);
... ... @@ -1672,7 +1672,7 @@
1672 1672 if (startDate != null)
1673 1673 {
1674 1674 //把时间格式化成 yyyy_MM_dd 的日期
1675   - startDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(startDate));
  1675 + startDate = DateUtil.formatDate(startDate);
1676 1676 }
1677 1677 List<BabyCheckModel> models = babyBookbuildingService.queryBabyOrder(startDate, tempHid, pid);
1678 1678 for (BabyCheckModel model : models)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ d7ddda0
... ... @@ -1267,7 +1267,7 @@
1267 1267 } else {
1268 1268 result.setHighRisk("高危");
1269 1269 }
1270   - result.setSex(SexTypeEnums.getTitleById(model.getSex()));
  1270 + result.setSex(SexEnum.getTextById(model.getSex()));
1271 1271 result.setBabyName(model.getName());
1272 1272 result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
1273 1273 result.setMommyName(model.getMname());