jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 210a70f234636166fbebd10ebb2c5f5148e0a637

Authored by litao@lymsh.com
1 parent 8649d81d41
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

改bug

Showing 2 changed files with 11 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ 210a70f
... ... @@ -14,12 +14,21 @@
14 14 private String fuckLastMens;
15 15 // 末次月经纠正依据
16 16 private String lastMenstrualPeriodBasis;
  17 + private String lastMenstrualPeriodBasisId;
17 18 // 末次月经纠正依据
18 19 private String lastMenstrualPeriodBasisOther;
19 20 // 末次月经纠正医生ID
20 21 private String lastMenstrualPeriodBasisDoctorId;
21 22 // 末次月经纠正时间
22 23 private String lastMenstrualPeriodBasisDate;
  24 +
  25 + public void setLastMenstrualPeriodBasisId(String lastMenstrualPeriodBasisId) {
  26 + this.lastMenstrualPeriodBasisId = lastMenstrualPeriodBasisId;
  27 + }
  28 +
  29 + public String getLastMenstrualPeriodBasisId() {
  30 + return lastMenstrualPeriodBasisId;
  31 + }
23 32  
24 33 public String getFuckLastMens() {
25 34 return fuckLastMens;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 210a70f
... ... @@ -1071,8 +1071,9 @@
1071 1071 if(pt.getType() == 3 || pt.getBuildType() == 2) { /** 当前孕周 */
1072 1072 map.put("week", "已分娩");
1073 1073 } else {
1074   - map.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date()));
  1074 + temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date()));
1075 1075 }
  1076 + System.out.println(pt.getBookbuildingDate().toLocaleString());
1076 1077 temp.put("buildWeek", DateUtil.getWeekDesc(pt.getLastMenses(), pt.getBookbuildingDate())); /** 建档孕周 */
1077 1078 temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); /** 建档日期 */
1078 1079 temp.put("doctorName", couponMapper.getUserName(pt.getBookbuildingDoctor()));