jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1fbf2ea251497790d255a9a86339f5c70ea4ef6a

Authored by jiangjiazhi
1 parent 0541c5ee3e
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

增加设置parentid

Showing 1 changed file with 7 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java View file @ 1fbf2ea
1 1 package com.lyms.platform.operate.web.result;
2 2  
3 3 import com.lyms.platform.common.utils.DateUtil;
  4 +import com.lyms.platform.common.utils.StringUtils;
4 5 import com.lyms.platform.pojo.*;
5 6  
6 7 import java.util.Date;
... ... @@ -62,10 +63,7 @@
62 63  
63 64 public AntData(AntExChuModel model,String hospitalName) {
64 65 this.id = model.getId();
65   - int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
66   - String week = (days / 7) + "";
67   - int day = (days % 7);
68   - this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
  66 + this.dueWeek = model.getcDueWeek();
69 67 if(null!=model.getCheckTime()){
70 68 this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckTime());
71 69 }
... ... @@ -78,10 +76,8 @@
78 76  
79 77 public AntData(Patients model,String hospitalName) {
80 78 this.id = model.getId();
81   - int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
82   - String week = (days / 7) + "";
83   - int day = (days % 7);
84   - this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
  79 + int days = DateUtil.daysBetween(model.getLastMenses(), model.getCreated());
  80 + this.dueWeek = StringUtils.dueWeek(days);
85 81 this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated());
86 82 this.title="孕妇建档";
87 83 this.type="1";
... ... @@ -92,9 +88,7 @@
92 88 public AntData(MaternalDeliverModel model,Date lastMenses,String hospitalName) {
93 89 this.id = model.getId();
94 90 int days = DateUtil.daysBetween(lastMenses,model.getCreated());
95   - String week = (days / 7) + "";
96   - int day = (days % 7);
97   - this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
  91 + this.dueWeek = StringUtils.dueWeek(days);
98 92 this.checkTime = DateUtil.getyyyy_MM_dd(model.getCreated());
99 93 this.title="孕妇分娩";
100 94 this.type="4";
101 95  
... ... @@ -115,14 +109,12 @@
115 109 public AntData(StopPregModel postReviewModel,Date lastMenses,String hospitalName) {
116 110 this.id=postReviewModel.getId();
117 111 int days= DateUtil.daysBetween(lastMenses,postReviewModel.getStopDate());
118   - String week= (days/7)+"";
119   - int day = (days%7);
120   - this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
  112 + this.dueWeek=StringUtils.dueWeek(days);
121 113 this.checkTime=DateUtil.getyyyy_MM_dd(postReviewModel.getCreated());
122 114 this.title="终止妊娠";
123 115 this.type="6";
124 116 this.hospitalName=hospitalName;
125   - this.hospitalId="医院id";
  117 + this.hospitalId=postReviewModel.getHospitalId();
126 118 }
127 119  
128 120 public String getCheckTime() {