diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java index 6747503c..a4b950e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; @@ -236,7 +237,7 @@ public class BabySpecialDiseaseClinicModelQuery extends BaseQuery implements ICo Criteria c = null; //月龄 - if (null != monthStart) { + /*if (null != monthStart) { if (null != c) { c = c.and("month").gte(monthStart); } else { @@ -249,7 +250,17 @@ public class BabySpecialDiseaseClinicModelQuery extends BaseQuery implements ICo } else { c = Criteria.where("month").lte(monthEnd); } + }*/ + if (null != monthStart && null != monthEnd) { + Date currentDate = DateUtil.formatDate(new Date()); + Date start = DateUtil.addMonth(currentDate, -monthStart); + setBirthEnd(start); + + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthEnd - 1), 1); + setBirthStart(end); } + + // 预约检查时间 if (null != nextDateStart) { if (null != c) { 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 4ceb7b5..d0c62d2 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 @@ -84,6 +84,19 @@ public class BabySpecialDiseaseClinicController extends BaseController { return babySpecialDiseaseClinicFacade.queryBabySpecialDiseaseClinicOne(id); } + /** + * 查询儿保专病,编辑使用 + * + * @param id + * @return + */ + @RequestMapping(value = "/queryBabySpecialDiseaseClinicEditOne/{id}", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryBabySpecialDiseaseClinicEditOne(@PathVariable("id") String id) { + return babySpecialDiseaseClinicFacade.queryBabySpecialDiseaseClinicEditOne(id); + + } 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 c10eb72..3b4c1c1 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 @@ -209,6 +209,31 @@ public class BabySpecialDiseaseClinicFacade extends BaseServiceImpl { BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySDCService.queryBabySpecialDiseaseClinicById(id); BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); + if(StringUtils.isNotEmpty(babySpecialDiseaseClinicModel.getCheckDoctor())){ + Users users = usersService.getUsers(NumberUtils.toInt(babySpecialDiseaseClinicModel.getCheckDoctor())); + babySpecialDiseaseClinicResult.setCheckDoctor(users.getName()); + } + babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); + br.setData(babySpecialDiseaseClinicResult); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + } + return br; + } + + /** + * 根据专病id,查询儿保专病 + * + * @Author: 武涛涛 + * @Date: 2020/7/31 11:34 + */ + public BaseObjectResponse queryBabySpecialDiseaseClinicEditOne(String id) { + + BaseObjectResponse br = new BaseObjectResponse(); + if(StringUtils.isNotEmpty(id)){ + BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySDCService.queryBabySpecialDiseaseClinicById(id); + BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult(); + babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel); babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService)); br.setData(babySpecialDiseaseClinicResult); br.setErrorcode(ErrorCodeConstants.SUCCESS);