jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b7b9f86665975faf58df545ff76a4aeed23222a2

Authored by jiangjiazhi
2 parents d90a8a095e 0a9c6e1eec
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ b7b9f86
... ... @@ -1471,8 +1471,10 @@
1471 1471 System.out.println(date.getTime());*/
1472 1472  
1473 1473  
1474   - Date date = parseDate("2018-01-05");
1475   - System.out.println(date.getTime());
  1474 +// Date baby = parseDate("2018-02-01");
  1475 +// int weeks = daysBetween(baby, new Date()) / 7;
  1476 +// String weekAge = String.valueOf(weeks);
  1477 +// System.out.print(weekAge);
1476 1478 }
1477 1479  
1478 1480 }
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java View file @ b7b9f86
... ... @@ -154,9 +154,9 @@
154 154 }
155 155  
156 156 public static void main(String[] args) {
157   - Map<String,List<MessageContent>> list = getMessageTemplateMap("1000000126",
158   - AmsServiceTypeEnum.YUN_GUIDE);
159   - List<MessageContent> msgs = list.get("年龄≥35岁");
  157 + Map<String,List<MessageContent>> list = getMessageTemplateMap("204",
  158 + AmsServiceTypeEnum.CHILD_GUIDE);
  159 + List<MessageContent> msgs = list.get("0周");
160 160 System.out.println(list);
161 161 }
162 162 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ b7b9f86
... ... @@ -124,7 +124,7 @@
124 124 result.setCertNo(model.getMeasureUserInfoModel().getCertNo());
125 125 result.setHospitalId(model.getMeasureUserInfoModel().getHospitalId());
126 126 result.setRecordCount(model.getRecordCount());
127   - result.setRecordTime(DateUtil.getyyyy_MM_dd(model.getCreated()));
  127 + result.setRecordTime(DateUtil.getyyyy_MM_dd(model.getModified()));
128 128 result.setSex(SexEnum.getTextById(model.getMeasureUserInfoModel().getSex()));
129 129 result.setAge(model.getMeasureUserInfoModel().getAge() == null ? "--" : String.valueOf(model.getMeasureUserInfoModel().getAge()));
130 130 result.setValueOne(model.getValueOne());
... ... @@ -495,6 +495,7 @@
495 495 if (CollectionUtils.isNotEmpty(models))
496 496 {
497 497 MeasureUserInfoModel userInfoModel = models.get(0);
  498 + result.setUserName(userInfoModel.getUserName());
498 499 result.setCertNo(userInfoModel.getCertNo());
499 500 result.setCertType(userInfoModel.getCertType());
500 501 result.setAge(userInfoModel.getAge());