shiyang / regional-platform

Download as
Browse Code »

Commit 9cbaac4079d44dfea5bba15ff1331f546eed0d2a

Authored by jiangjiazhi
1 parent 2b2ecaee12
Exists in master and in 1 other branch nobuildprocess

增加是否通知

Showing 5 changed files with 70 additions and 30 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 9cbaac4
... ... @@ -83,14 +83,23 @@
83 83 //产检医生
84 84 private String checkDoctor;
85 85 //产检日期
86   - private String checkDate;
  86 + private Date checkDate;
87 87 //下次产检日期
88   - private String nextCheckTime;
  88 + private Date nextCheckTime;
89 89 private Integer yn;
90 90 private Date created;
91 91 private Date modified;
92 92 private String hospitalId;
  93 + private String cDueWeek;
93 94  
  95 + public String getcDueWeek() {
  96 + return cDueWeek;
  97 + }
  98 +
  99 + public void setcDueWeek(String cDueWeek) {
  100 + this.cDueWeek = cDueWeek;
  101 + }
  102 +
94 103 public Date getModified() {
95 104 return modified;
96 105 }
97 106  
... ... @@ -163,13 +172,7 @@
163 172 this.bp = bp;
164 173 }
165 174  
166   - public String getCheckDate() {
167   - return checkDate;
168   - }
169 175  
170   - public void setCheckDate(String checkDate) {
171   - this.checkDate = checkDate;
172   - }
173 176  
174 177 public String getCheckDoctor() {
175 178 return checkDoctor;
176 179  
... ... @@ -243,11 +246,19 @@
243 246 this.id = id;
244 247 }
245 248  
246   - public String getNextCheckTime() {
  249 + public Date getCheckDate() {
  250 + return checkDate;
  251 + }
  252 +
  253 + public void setCheckDate(Date checkDate) {
  254 + this.checkDate = checkDate;
  255 + }
  256 +
  257 + public Date getNextCheckTime() {
247 258 return nextCheckTime;
248 259 }
249 260  
250   - public void setNextCheckTime(String nextCheckTime) {
  261 + public void setNextCheckTime(Date nextCheckTime) {
251 262 this.nextCheckTime = nextCheckTime;
252 263 }
253 264  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 9cbaac4
... ... @@ -271,7 +271,7 @@
271 271 List<AntenatalExaminationModel> ant = antExService.queryAntenatalExamination(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
272 272 String nextCheckTime = "";
273 273 if (CollectionUtils.isNotEmpty(ant)) {
274   - nextCheckTime = ant.get(0).getNextCheckTime();
  274 + nextCheckTime = DateUtil.getyyyy_MM_dd(ant.get(0).getNextCheckTime());
275 275 }
276 276 chanResult.setNextCheckTime(nextCheckTime);
277 277 data.add(chanResult);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 9cbaac4
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.common.base.IBasicRequestConvert;
4 4 import com.lyms.platform.common.core.annotation.form.Form;
  5 +import com.lyms.platform.common.utils.DateUtil;
5 6 import com.lyms.platform.common.utils.JsonUtil;
6 7 import com.lyms.platform.pojo.AntenatalExaminationModel;
7 8 import org.codehaus.jackson.annotate.JsonIgnore;
8 9  
9 10  
... ... @@ -69,10 +70,22 @@
69 70 //产检日期
70 71 private String checkDate;
71 72 //下次产检日期
72   - private Map nextCheckTime;
  73 + private String nextCheckTime;
  74 + private String cDueWeek;
73 75  
74 76  
  77 + public String getcDueWeek() {
  78 + return cDueWeek;
  79 + }
75 80  
  81 + public void setcDueWeek(String cDueWeek) {
  82 + this.cDueWeek = cDueWeek;
  83 + }
  84 +
  85 + public void setNextCheckTime(String nextCheckTime) {
  86 + this.nextCheckTime = nextCheckTime;
  87 + }
  88 +
76 89 public String getTypeYc() {
77 90 return typeYc;
78 91 }
79 92  
... ... @@ -108,9 +121,14 @@
108 121 examinationModel.setTreatmentOpinion(treatmentOpinion);
109 122 examinationModel.setGuide(guide);
110 123 examinationModel.setCheckDoctor(checkDoctor);
111   - examinationModel.setCheckDate(checkDate);
112   - examinationModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
  124 + if(null!=checkDate){
  125 + examinationModel.setCheckDate(DateUtil.parseYMD(checkDate));
  126 + }
  127 + if(null!=nextCheckTime){
113 128  
  129 + examinationModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
  130 + }
  131 +examinationModel.setcDueWeek(cDueWeek);
114 132 return examinationModel;
115 133 }
116 134  
117 135  
... ... @@ -226,12 +244,8 @@
226 244 this.id = id;
227 245 }
228 246  
229   - public Map getNextCheckTime() {
  247 + public String getNextCheckTime() {
230 248 return nextCheckTime;
231   - }
232   -
233   - public void setNextCheckTime(Map nextCheckTime) {
234   - this.nextCheckTime = nextCheckTime;
235 249 }
236 250  
237 251 public Map getOtherRisk() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java View file @ 9cbaac4
... ... @@ -51,7 +51,9 @@
51 51 public AntData(AntenatalExaminationModel model,String hospitalName) {
52 52 this.id = model.getId();
53 53 this.dueWeek = model.getCurrentDueDate();
54   - this.checkTime = model.getCheckDate();
  54 + if(null!=model.getCheckDate()){
  55 + this.checkTime = DateUtil.getyyyy_MM_dd(model.getCheckDate());
  56 + }
55 57 this.title="复诊";
56 58 this.type="3";
57 59 this.hospitalName=hospitalName;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 9cbaac4
1 1 package com.lyms.platform.operate.web.result;
2 2  
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
  4 +import com.lyms.platform.common.utils.DateUtil;
4 5 import com.lyms.platform.common.utils.JsonUtil;
5 6 import com.lyms.platform.pojo.AntenatalExaminationModel;
6 7  
7 8  
8 9  
... ... @@ -68,12 +69,25 @@
68 69 //产检日期
69 70 private String checkDate;
70 71 //下次产检日期
71   - private Map nextCheckTime;
  72 + private String nextCheckTime;
72 73 //是否有转诊
73 74 private int hasRefer;
74 75 //是否有产筛
75 76 private int hasSieve;
  77 + private String cDueWeek;
76 78  
  79 + public String getcDueWeek() {
  80 + return cDueWeek;
  81 + }
  82 +
  83 + public void setcDueWeek(String cDueWeek) {
  84 + this.cDueWeek = cDueWeek;
  85 + }
  86 +
  87 + public void setNextCheckTime(String nextCheckTime) {
  88 + this.nextCheckTime = nextCheckTime;
  89 + }
  90 +
77 91 public int getHasRefer() {
78 92 return hasRefer;
79 93 }
80 94  
... ... @@ -90,13 +104,7 @@
90 104 this.hasSieve = hasSieve;
91 105 }
92 106  
93   - public Map getNextCheckTime() {
94   - return nextCheckTime;
95   - }
96 107  
97   - public void setNextCheckTime(Map nextCheckTime) {
98   - this.nextCheckTime = nextCheckTime;
99   - }
100 108  
101 109 @Override
102 110 public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
103 111  
... ... @@ -114,12 +122,17 @@
114 122 } catch (Exception e) {
115 123 }
116 124 try {
117   - setNextCheckTime(JsonUtil.str2Obj(destModel.getNextCheckTime(),Map.class));
  125 + if(null!=destModel.getNextCheckTime()){
  126 + setNextCheckTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
  127 + }
  128 + if(null!=destModel.getCheckDate()){
  129 + setCheckDate(DateUtil.getyyyy_MM_dd(destModel.getCheckDate()));
  130 + }
118 131 }catch (Exception e){
119 132 }
120 133  
121 134 setChiefComplaint(destModel.getChiefComplaint());
122   - setCheckDate(destModel.getCheckDate());
  135 +
123 136 setCheckDoctor(destModel.getCheckDoctor());
124 137 setCurrentDueDate(destModel.getCurrentDueDate());
125 138 setGuide(destModel.getGuide());