diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java index 914f08f..77606e5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java @@ -99,8 +99,10 @@ public class BabyHighRiskBabyModel extends BaseModel { private String highRiskQt; //住院号 private String zyh; + //住院时间 - private Date hospitalDate; + private Date hospitalDateStatr; + private Date hospitalDateEnd; //出院诊断 private String cyzd; //既往检查 @@ -475,12 +477,20 @@ public class BabyHighRiskBabyModel extends BaseModel { this.zyh = zyh; } - public Date getHospitalDate() { - return hospitalDate; + public Date getHospitalDateStatr() { + return hospitalDateStatr; + } + + public void setHospitalDateStatr(Date hospitalDateStatr) { + this.hospitalDateStatr = hospitalDateStatr; + } + + public Date getHospitalDateEnd() { + return hospitalDateEnd; } - public void setHospitalDate(Date hospitalDate) { - this.hospitalDate = hospitalDate; + public void setHospitalDateEnd(Date hospitalDateEnd) { + this.hospitalDateEnd = hospitalDateEnd; } public String getCyzd() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index 3f876f1..26c8192 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -119,7 +119,8 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { model.setHighRiskDiagnose(request.getHighRiskDiagnose()); model.setHighRiskQt(request.getHighRiskQt()); model.setZyh(request.getZyh()); - model.setHospitalDate(DateUtil.parseYMD(request.getHospitalDate())); + model.setHospitalDateStatr(DateUtil.parseYMD(request.getHospitalDateStatr())); + model.setHospitalDateEnd(DateUtil.parseYMD(request.getHospitalDateEnd())); model.setCyzd(request.getCyzd()); model.setJwjc(request.getJwjc()); model.setHeight(request.getHeight()); @@ -185,6 +186,8 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), models, model, OptActionEnums.UPDATE.getId(), "高危儿专科检查"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + + } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java index 747fd82..8c58b1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java @@ -102,7 +102,8 @@ public class BabyHighRiskBabyRequest { //住院号 private String zyh; //住院时间 - private String hospitalDate; + private String hospitalDateStatr; + private String hospitalDateEnd; //出院诊断 private String cyzd; //既往检查 @@ -497,12 +498,20 @@ public class BabyHighRiskBabyRequest { this.zyh = zyh; } - public String getHospitalDate() { - return hospitalDate; + public String getHospitalDateStatr() { + return hospitalDateStatr; } - public void setHospitalDate(String hospitalDate) { - this.hospitalDate = hospitalDate; + public void setHospitalDateStatr(String hospitalDateStatr) { + this.hospitalDateStatr = hospitalDateStatr; + } + + public String getHospitalDateEnd() { + return hospitalDateEnd; + } + + public void setHospitalDateEnd(String hospitalDateEnd) { + this.hospitalDateEnd = hospitalDateEnd; } public String getCyzd() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java index 99ebda3..fc272de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java @@ -97,7 +97,9 @@ public class BabyHighRiskBabyResult implements IBasicResultConvert