From 9950ff7899eace892716171c3a6523fb5deefeac Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 3 Aug 2020 10:29:47 +0800 Subject: [PATCH] update --- .../BabySpecialDiseaseClinicController.java | 2 +- .../web/facade/BabySpecialDiseaseClinicFacade.java | 8 ++-- .../request/BabySpecialDiseaseClinicRequest.java | 56 ++++++++++++---------- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySpecialDiseaseClinicController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySpecialDiseaseClinicController.java index 5b5b5c4..4ceb7b5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySpecialDiseaseClinicController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySpecialDiseaseClinicController.java @@ -72,7 +72,7 @@ public class BabySpecialDiseaseClinicController extends BaseController { } /** - * 删除儿保专病 + * 查询儿保专病 * * @param id * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java index 14f758c..9e45c6a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java @@ -90,15 +90,15 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { model.setZbProject(request.getZbProject()); - model.setCheckDate(new Date()); + model.setCheckDate(DateUtil.parseYMD(request.getCheckDate())); model.setCheckMonth(request.getCheckMonth()); model.setChiefComplaint(request.getChiefComplaint()); model.setPresentDisease(request.getPresentDisease()); model.setPastHistory(request.getPastHistory()); model.setDiagnosis(request.getDiagnosis()); model.setCheckDoctor(request.getCheckDoctor()); - model.setNextDate(request.getNextDate()); - model.setBuildDate(request.getBuildDate()); + model.setNextDate(DateUtil.parseYMD(request.getNextDate())); + model.setBuildDate(DateUtil.parseYMD(request.getBuildDate())); model.setBuildDoctorId(request.getBuildDoctorId()); model.setBuildDoctorName(request.getBuildDoctorName()); @@ -220,7 +220,7 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { babyQuery.setNeed("true"); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); - babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); + babySpecialDiseaseClinicModels = babySDCService.queryBabySpecialDiseaseClinicRecord(babyQuery); } br.setData(babySpecialDiseaseClinicModels); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java index a5c7074..452ecbf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySpecialDiseaseClinicRequest.java @@ -50,7 +50,7 @@ public class BabySpecialDiseaseClinicRequest { private String sINCard; @NotEmpty(message = "儿童生日不能为空") //儿童生日 - private Date birthday; + private String birthday; //儿童月龄 private Integer month; @@ -58,7 +58,7 @@ public class BabySpecialDiseaseClinicRequest { //专病项目 ①上呼②肺炎③腹泻④矮小⑤早熟⑥黄疸⑦多动⑧抽动⑨智力低下⑩自闭 private String zbProject; //检查日期 - private Date checkDate; + private String checkDate; //检查月龄 2月龄28天 private String checkMonth; //主诉 @@ -73,11 +73,11 @@ public class BabySpecialDiseaseClinicRequest { @NotEmpty(message = "检查医生不能为空") private String checkDoctor; //下次预约 - private Date nextDate; + private String nextDate; /*儿童专病门诊检查列表冗余内容*/ //建档时间 - private Date buildDate; + private String buildDate; //建档医生 private String buildDoctorId; private String buildDoctorName; @@ -178,13 +178,7 @@ public class BabySpecialDiseaseClinicRequest { this.sINCard = sINCard; } - public Date getBirthday() { - return birthday; - } - public void setBirthday(Date birthday) { - this.birthday = birthday; - } public Integer getMonth() { return month; @@ -202,13 +196,6 @@ public class BabySpecialDiseaseClinicRequest { this.zbProject = zbProject; } - public Date getCheckDate() { - return checkDate; - } - - public void setCheckDate(Date checkDate) { - this.checkDate = checkDate; - } public String getCheckMonth() { return checkMonth; @@ -260,14 +247,38 @@ public class BabySpecialDiseaseClinicRequest { this.checkDoctor = checkDoctor; } - public Date getNextDate() { + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public String getCheckDate() { + return checkDate; + } + + public void setCheckDate(String checkDate) { + this.checkDate = checkDate; + } + + public String getNextDate() { return nextDate; } - public void setNextDate(Date nextDate) { + public void setNextDate(String nextDate) { this.nextDate = nextDate; } + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + public String getPid() { return pid; } @@ -276,13 +287,6 @@ public class BabySpecialDiseaseClinicRequest { this.pid = pid; } - public Date getBuildDate() { - return buildDate; - } - - public void setBuildDate(Date buildDate) { - this.buildDate = buildDate; - } public String getBuildDoctorId() { return buildDoctorId; -- 1.8.3.1