Commit 9950ff7899eace892716171c3a6523fb5deefeac
1 parent
8b3eceb1a6
Exists in
master
and in
6 other branches
update
Showing 3 changed files with 35 additions and 31 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySpecialDiseaseClinicController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySpecialDiseaseClinicController.java
View file @
9950ff7
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java
View file @
9950ff7
| ... | ... | @@ -90,15 +90,15 @@ | 
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 | model.setZbProject(request.getZbProject()); | 
| 93 | - model.setCheckDate(new Date()); | |
| 93 | + model.setCheckDate(DateUtil.parseYMD(request.getCheckDate())); | |
| 94 | 94 | model.setCheckMonth(request.getCheckMonth()); | 
| 95 | 95 | model.setChiefComplaint(request.getChiefComplaint()); | 
| 96 | 96 | model.setPresentDisease(request.getPresentDisease()); | 
| 97 | 97 | model.setPastHistory(request.getPastHistory()); | 
| 98 | 98 | model.setDiagnosis(request.getDiagnosis()); | 
| 99 | 99 | model.setCheckDoctor(request.getCheckDoctor()); | 
| 100 | - model.setNextDate(request.getNextDate()); | |
| 101 | - model.setBuildDate(request.getBuildDate()); | |
| 100 | + model.setNextDate(DateUtil.parseYMD(request.getNextDate())); | |
| 101 | + model.setBuildDate(DateUtil.parseYMD(request.getBuildDate())); | |
| 102 | 102 | model.setBuildDoctorId(request.getBuildDoctorId()); | 
| 103 | 103 | model.setBuildDoctorName(request.getBuildDoctorName()); | 
| 104 | 104 | |
| ... | ... | @@ -220,7 +220,7 @@ | 
| 220 | 220 | babyQuery.setNeed("true"); | 
| 221 | 221 | babyQuery.setYn(YnEnums.YES.getId()); | 
| 222 | 222 | babyQuery.setHospitalId(hospitalId); | 
| 223 | - babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); | |
| 223 | + babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); | |
| 224 | 224 | } | 
| 225 | 225 | |
| 226 | 226 | br.setData(babySpecialDiseaseClinicModels); | 
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java
View file @
9950ff7
| ... | ... | @@ -50,7 +50,7 @@ | 
| 50 | 50 | private String sINCard; | 
| 51 | 51 | @NotEmpty(message = "儿童生日不能为空") | 
| 52 | 52 | //儿童生日 | 
| 53 | - private Date birthday; | |
| 53 | + private String birthday; | |
| 54 | 54 | //儿童月龄 | 
| 55 | 55 | private Integer month; | 
| 56 | 56 | |
| ... | ... | @@ -58,7 +58,7 @@ | 
| 58 | 58 | //专病项目 ①上呼②肺炎③腹泻④矮小⑤早熟⑥黄疸⑦多动⑧抽动⑨智力低下⑩自闭 | 
| 59 | 59 | private String zbProject; | 
| 60 | 60 | //检查日期 | 
| 61 | - private Date checkDate; | |
| 61 | + private String checkDate; | |
| 62 | 62 | //检查月龄 2月龄28天 | 
| 63 | 63 | private String checkMonth; | 
| 64 | 64 | //主诉 | 
| 65 | 65 | |
| ... | ... | @@ -73,11 +73,11 @@ | 
| 73 | 73 | @NotEmpty(message = "检查医生不能为空") | 
| 74 | 74 | private String checkDoctor; | 
| 75 | 75 | //下次预约 | 
| 76 | - private Date nextDate; | |
| 76 | + private String nextDate; | |
| 77 | 77 | |
| 78 | 78 | /*儿童专病门诊检查列表冗余内容*/ | 
| 79 | 79 | //建档时间 | 
| 80 | - private Date buildDate; | |
| 80 | + private String buildDate; | |
| 81 | 81 | //建档医生 | 
| 82 | 82 | private String buildDoctorId; | 
| 83 | 83 | private String buildDoctorName; | 
| 84 | 84 | |
| ... | ... | @@ -178,13 +178,7 @@ | 
| 178 | 178 | this.sINCard = sINCard; | 
| 179 | 179 | } | 
| 180 | 180 | |
| 181 | - public Date getBirthday() { | |
| 182 | - return birthday; | |
| 183 | - } | |
| 184 | 181 | |
| 185 | - public void setBirthday(Date birthday) { | |
| 186 | - this.birthday = birthday; | |
| 187 | - } | |
| 188 | 182 | |
| 189 | 183 | public Integer getMonth() { | 
| 190 | 184 | return month; | 
| 191 | 185 | |
| ... | ... | @@ -202,14 +196,7 @@ | 
| 202 | 196 | this.zbProject = zbProject; | 
| 203 | 197 | } | 
| 204 | 198 | |
| 205 | - public Date getCheckDate() { | |
| 206 | - return checkDate; | |
| 207 | - } | |
| 208 | 199 | |
| 209 | - public void setCheckDate(Date checkDate) { | |
| 210 | - this.checkDate = checkDate; | |
| 211 | - } | |
| 212 | - | |
| 213 | 200 | public String getCheckMonth() { | 
| 214 | 201 | return checkMonth; | 
| 215 | 202 | } | 
| 216 | 203 | |
| 217 | 204 | |
| ... | ... | @@ -260,14 +247,38 @@ | 
| 260 | 247 | this.checkDoctor = checkDoctor; | 
| 261 | 248 | } | 
| 262 | 249 | |
| 263 | - public Date getNextDate() { | |
| 250 | + public String getBirthday() { | |
| 251 | + return birthday; | |
| 252 | + } | |
| 253 | + | |
| 254 | + public void setBirthday(String birthday) { | |
| 255 | + this.birthday = birthday; | |
| 256 | + } | |
| 257 | + | |
| 258 | + public String getCheckDate() { | |
| 259 | + return checkDate; | |
| 260 | + } | |
| 261 | + | |
| 262 | + public void setCheckDate(String checkDate) { | |
| 263 | + this.checkDate = checkDate; | |
| 264 | + } | |
| 265 | + | |
| 266 | + public String getNextDate() { | |
| 264 | 267 | return nextDate; | 
| 265 | 268 | } | 
| 266 | 269 | |
| 267 | - public void setNextDate(Date nextDate) { | |
| 270 | + public void setNextDate(String nextDate) { | |
| 268 | 271 | this.nextDate = nextDate; | 
| 269 | 272 | } | 
| 270 | 273 | |
| 274 | + public String getBuildDate() { | |
| 275 | + return buildDate; | |
| 276 | + } | |
| 277 | + | |
| 278 | + public void setBuildDate(String buildDate) { | |
| 279 | + this.buildDate = buildDate; | |
| 280 | + } | |
| 281 | + | |
| 271 | 282 | public String getPid() { | 
| 272 | 283 | return pid; | 
| 273 | 284 | } | 
| ... | ... | @@ -276,13 +287,6 @@ | 
| 276 | 287 | this.pid = pid; | 
| 277 | 288 | } | 
| 278 | 289 | |
| 279 | - public Date getBuildDate() { | |
| 280 | - return buildDate; | |
| 281 | - } | |
| 282 | - | |
| 283 | - public void setBuildDate(Date buildDate) { | |
| 284 | - this.buildDate = buildDate; | |
| 285 | - } | |
| 286 | 290 | |
| 287 | 291 | public String getBuildDoctorId() { | 
| 288 | 292 | return buildDoctorId; |