diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index 8f7f309..0838399 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -460,6 +460,56 @@ public class BabyCheckModel extends BaseModel { */ private String socialContactIA; private String socialContactDQ; + //运动 + private String exercise ; + //语言 + private String language; + //社交 + private String socialContact; + //大运动 + private String alotExercise ; + //精细运动 + private String fineExercise ; + + public String getExercise() { + return exercise; + } + + public void setExercise(String exercise) { + this.exercise = exercise; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + + public String getSocialContact() { + return socialContact; + } + + public void setSocialContact(String socialContact) { + this.socialContact = socialContact; + } + + public String getAlotExercise() { + return alotExercise; + } + + public void setAlotExercise(String alotExercise) { + this.alotExercise = alotExercise; + } + + public String getFineExercise() { + return fineExercise; + } + + public void setFineExercise(String fineExercise) { + this.fineExercise = fineExercise; + } public String getExerciseIA() { return exerciseIA; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 0fd9142..de05eaa 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -212,6 +212,12 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private Integer dueWeek; private Integer endCase; + /* + 结案日期 + */ + private Date endCaseTimeStart; + + private Date endCaseTimeEnd; private String areaId; @@ -238,6 +244,30 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String numberCode; + public Date getEndCaseTimeStart() { + return endCaseTimeStart; + } + + public void setEndCaseTimeStart(Date endCaseTimeStart) { + this.endCaseTimeStart = endCaseTimeStart; + } + + public Date getEndCaseTimeEnd() { + return endCaseTimeEnd; + } + + public void setEndCaseTimeEnd(Date endCaseTimeEnd) { + this.endCaseTimeEnd = endCaseTimeEnd; + } + + public Boolean getNull() { + return isNull; + } + + public void setNull(Boolean aNull) { + isNull = aNull; + } + public String getNumberCode() { return numberCode; } @@ -1225,7 +1255,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { Criteria cr = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); condition.andCondition(new MongoCondition(cr)); } - + if (null != endCaseTimeStart && endCaseTimeEnd != null) { + Criteria cr = Criteria.where("endCaseTime").gte(endCaseTimeStart).lte(endCaseTimeEnd); + condition.andCondition(new MongoCondition(cr)); + } if (null != phoneOrcardNo) { MongoCondition c1 = MongoCondition.newInstance(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 6d82369..3e548a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -213,6 +213,7 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge, @RequestParam(value = "birth", required = false) String birth, @RequestParam(value = "nextDate", required = false) String nextDate, + @RequestParam(value = "endCaseTime", required = false) String endCaseTime, @RequestParam(value = "expVip", required = false) Integer expVip, @RequestParam(value = "serviceType", required = false) Integer serviceType, @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus, @@ -266,6 +267,7 @@ public class BabyBuildController extends BaseController { request.setMonthAgeEnd(endMonthAge); request.setBirth(birth); request.setNextDate(nextDate); + request.setEndCaseTime(endCaseTime); request.setExpVip(expVip); request.setHighRiskType(highRiskType); request.setServiceType(serviceType); @@ -299,6 +301,19 @@ public class BabyBuildController extends BaseController { return babyBookbuildingFacade.queryBabyList(request, loginState.getId()); } + /** + * 修改儿童档案结案状态 + * @param babyManageRequest + * @param httpServletRequest + * @return + */ + @RequestMapping(value = "/updateEndCase", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse updateEndCase(BabyCheckRequest babyManageRequest,HttpServletRequest httpServletRequest ){ + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + return babyBookbuildingFacade.updateEndCase(babyManageRequest, loginState.getId()); + } @RequestMapping(value = "/exportChilds", method = RequestMethod.GET) @TokenRequired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 701000f..0650ddb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -17,10 +17,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; -import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; -import com.lyms.platform.operate.web.request.BabyGuideSmsequest; -import com.lyms.platform.operate.web.request.BabyManageRequest; -import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; +import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.BabyAfterVisitService; import com.lyms.platform.operate.web.service.ITrackDownService; @@ -818,14 +815,10 @@ public class BabyBookbuildingFacade { return br; } - private void getNumberCode(BabyModel model) - { - if (model.getMcertNo().length() > 8) - { + private void getNumberCode(BabyModel model) { + if (model.getMcertNo().length() > 8) { model.setNumberCode(model.getMcertNo().substring(model.getMcertNo().length() - 8)); - } - else - { + } else { model.setNumberCode(model.getMcertNo()); } } @@ -2284,6 +2277,32 @@ public class BabyBookbuildingFacade { } + public BaseResponse updateEndCase(BabyCheckRequest request, Integer userId) { + BaseObjectResponse br = new BaseObjectResponse(); + BabyModel bm = new BabyModel(); + try { + if (request == null || request.getBuildId() == null) { + br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + br.setErrormsg("失败"); + } + //添加结案记录 + if (null != request.getEndCase()) { + bm.setEndCase(request.getEndCase()); + if (1 == request.getEndCase()) { + bm.setEndCaseTime(new Date()); + } + } + + } catch (Exception e) { + e.printStackTrace(); + } + babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + } + + private List getBabayListByCondition(BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) { @@ -2322,6 +2341,18 @@ public class BabyBookbuildingFacade { babyQuery.setNextDateEnd(DateUtil.parseYMD(dates[1])); } } + //结案时间 + if (StringUtils.isNotEmpty(request.getEndCaseTime())) { + String endCaseTime = request.getEndCaseTime(); + String[] dates = endCaseTime.split(" - "); + + babyQuery.setEndCaseTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + // babyQuery.setEndCaseTimeEnd(DateUtil.parseYMD(dates[1])); + babyQuery.setEndCaseTimeEnd(new Date(DateUtil.parseYMD(dates[1]).getTime() + 24 * 60 * 60 * 1000 - 1)); + + } + } if (org.apache.commons.lang.StringUtils.isNotEmpty(request.getBuildDate())) { babyQuery.setBuildDateStart(DateUtil.getSNDate(request.getBuildDate())[0]); @@ -4183,7 +4214,7 @@ public class BabyBookbuildingFacade { public void autoGetBabyDiagnose() { Date end = new Date(); - Date start = DateUtil.addDay(end,-2); + Date start = DateUtil.addDay(end, -2); String lrrqStart = DateUtil.getYyyyMMddHHssmm(start); String lrrqEnd = DateUtil.getYyyyMMddHHssmm(end); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 6374b2c..724c10c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -456,6 +456,13 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setLanguageDQ(request.getLanguageDQ()); model.setMovementDQ(request.getMovementDQ()); model.setSocialContactDQ(request.getSocialContactDQ()); + model.setExercise(request.getExercise()); + model.setLanguage(request.getLanguage()); + model.setSocialContact(request.getSocialContact()); + model.setAlotExercise(request.getAlotExercise()); + model.setFineExercise(request.getFineExercise()); + + return model; } @@ -1404,6 +1411,7 @@ public class BabyCheckFacade extends BaseServiceImpl { result.setName(model.getName()); result.setBirth(DateUtil.getyyyy_MM_dd(model.getBirth())); result.setHospitalId(model.getHospitalId()); + result.setBlNo(model.getBlNo()); String hospital = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getHospitalId())) { Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index bb8d4db..99ad9ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -402,6 +402,14 @@ public class BabyCheckRequest { private String exerciseIA; private String exerciseDQ ; + private String exercise ; + private String language; + private String socialContact; + //大运动 + private String alotExercise ; + //精细运动 + private String fineExercise ; + /** * 动作 */ @@ -426,6 +434,46 @@ public class BabyCheckRequest { private String socialContactIA; private String socialContactDQ; + public String getSocialContact() { + return socialContact; + } + + public void setSocialContact(String socialContact) { + this.socialContact = socialContact; + } + + public String getExercise() { + return exercise; + } + + public void setExercise(String exercise) { + this.exercise = exercise; + } + + public String getAlotExercise() { + return alotExercise; + } + + public void setAlotExercise(String alotExercise) { + this.alotExercise = alotExercise; + } + + public String getFineExercise() { + return fineExercise; + } + + public void setFineExercise(String fineExercise) { + this.fineExercise = fineExercise; + } + + public String getLanguage() { + return language; + } + + public void setLanguage(String language) { + this.language = language; + } + public String getExerciseIA() { return exerciseIA; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 4ade298..9c77450 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -30,6 +30,8 @@ public class BabyManageRequest extends BaseQuery { private String birth; //下次预约时间 private String nextDate; + //结案时间 + private String endCaseTime; //母亲联系方式 private String mphone; //性别 @@ -364,6 +366,14 @@ public class BabyManageRequest extends BaseQuery { this.monthAgeEnd = monthAgeEnd; } + public String getEndCaseTime() { + return endCaseTime; + } + + public void setEndCaseTime(String endCaseTime) { + this.endCaseTime = endCaseTime; + } + public String getNextDate() { return nextDate; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java index cee5d48..a357d47 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java @@ -12,6 +12,15 @@ public class BabyChooseResult { private String pid; private String hospitalId; private String hospitalName; + private String blNo; + + public String getBlNo() { + return blNo; + } + + public void setBlNo(String blNo) { + this.blNo = blNo; + } public String getHospitalName() { return hospitalName;