jiangjiazhi / regional-platform

Download as
Browse Code »

Commit aa63508067b8970a2e0e7605f9a22156c8510101

Authored by [wangbo]
1 parent b4c5fa922f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

妇女建档 未建档bug处理

Showing 3 changed files with 19 additions and 17 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ aa63508
... ... @@ -419,13 +419,13 @@
419 419 downRecordQuery.setFoundStart(downQueryRequest.getFoundDateStart());
420 420 downRecordQuery.setFoundEnd(downQueryRequest.getFoundDateEnd());
421 421 //预约追访时间
422   - downRecordQuery.setAppointmentDateStart(downQueryRequest.getAppointmentDateStart());
423   - downRecordQuery.setAppointmentDateEnd(downQueryRequest.getAppointmentDateEnd());
  422 + downRecordQuery.setAppointmentDateStart(DateUtil.parseYMD(downQueryRequest.getAppointmentDateStart()));
  423 + downRecordQuery.setAppointmentDateEnd(DateUtil.parseYMD(downQueryRequest.getAppointmentDateEnd()) );
424 424 //追访状态
425 425 downRecordQuery.setFollowupStatus(downQueryRequest.getFollowupStatus());
426 426 //追访时间
427   - downRecordQuery.setTrackDownDateStart(downQueryRequest.getTrackDownDateStart());
428   - downRecordQuery.setTrackDownDateEnd(downQueryRequest.getTrackDownDateEnd());
  427 + downRecordQuery.setTrackDownDateStart(DateUtil.parseYMD(downQueryRequest.getTrackDownDateStart()));
  428 + downRecordQuery.setTrackDownDateEnd(DateUtil.parseYMD(downQueryRequest.getTrackDownDateEnd()));
429 429  
430 430 //逾期天数
431 431 if (null != downQueryRequest.getBeOverdueDays()) {
... ... @@ -816,7 +816,7 @@
816 816 // 预约时间
817 817 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate()));
818 818 //孕妇建档日期
819   - temp.put("womanCreatedTime",downRecord.getCreated());
  819 + temp.put("womanCreatedTime", downRecord.getCreated());
820 820 return temp;
821 821 }
822 822 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java View file @ aa63508
... ... @@ -191,6 +191,8 @@
191 191 model.setAddressRegister(addressRegister);
192 192 //默认为为婚检
193 193 model.setCheckup("0");
  194 + //默认为怀孕建档
  195 + model.setPregnantBuild("0");
194 196  
195 197 if (pastHistory != null) {
196 198 model.setPastHistory(JsonUtil.obj2JsonString(pastHistory));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java View file @ aa63508
... ... @@ -55,10 +55,10 @@
55 55 private Date foundDateEnd;
56 56  
57 57 //预约开始追访日期
58   - private Date appointmentDateStart;
  58 + private String appointmentDateStart;
59 59  
60 60 //预约结束追访日期
61   - private Date appointmentDateEnd;
  61 + private String appointmentDateEnd;
62 62  
63 63 //追访状态 0 正常 1. 待追访 2.已终止
64 64 private Integer followupStatus;
65 65  
... ... @@ -67,10 +67,10 @@
67 67 private Integer beOverdueDays;
68 68  
69 69 //开始追访日期
70   - private Date trackDownDateStart;
  70 + private String trackDownDateStart;
71 71  
72 72 //结束追访日期
73   - private Date trackDownDateEnd;
  73 + private String trackDownDateEnd;
74 74  
75 75 //是否加密 0 你加密 1加密
76 76 private Integer encryption;
77 77  
78 78  
79 79  
... ... @@ -127,19 +127,19 @@
127 127 this.encryption = encryption;
128 128 }
129 129  
130   - public Date getTrackDownDateStart() {
  130 + public String getTrackDownDateStart() {
131 131 return trackDownDateStart;
132 132 }
133 133  
134   - public void setTrackDownDateStart(Date trackDownDateStart) {
  134 + public void setTrackDownDateStart(String trackDownDateStart) {
135 135 this.trackDownDateStart = trackDownDateStart;
136 136 }
137 137  
138   - public Date getTrackDownDateEnd() {
  138 + public String getTrackDownDateEnd() {
139 139 return trackDownDateEnd;
140 140 }
141 141  
142   - public void setTrackDownDateEnd(Date trackDownDateEnd) {
  142 + public void setTrackDownDateEnd(String trackDownDateEnd) {
143 143 this.trackDownDateEnd = trackDownDateEnd;
144 144 }
145 145  
146 146  
147 147  
148 148  
... ... @@ -159,19 +159,19 @@
159 159 this.followupStatus = followupStatus;
160 160 }
161 161  
162   - public Date getAppointmentDateStart() {
  162 + public String getAppointmentDateStart() {
163 163 return appointmentDateStart;
164 164 }
165 165  
166   - public void setAppointmentDateStart(Date appointmentDateStart) {
  166 + public void setAppointmentDateStart(String appointmentDateStart) {
167 167 this.appointmentDateStart = appointmentDateStart;
168 168 }
169 169  
170   - public Date getAppointmentDateEnd() {
  170 + public String getAppointmentDateEnd() {
171 171 return appointmentDateEnd;
172 172 }
173 173  
174   - public void setAppointmentDateEnd(Date appointmentDateEnd) {
  174 + public void setAppointmentDateEnd(String appointmentDateEnd) {
175 175 this.appointmentDateEnd = appointmentDateEnd;
176 176 }
177 177