jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6c527ba1a8a0e6087c99b0318e35a435da4ce753

Authored by wtt
1 parent 381f6b5326
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 51 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabySpecialDiseaseClinicModelQuery.java View file @ 6c527ba
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.common.dao.operator.MongoCondition;
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
  8 +import com.lyms.platform.common.utils.DateUtil;
8 9 import com.lyms.platform.common.utils.StringUtils;
9 10 import org.springframework.data.mongodb.core.query.Criteria;
10 11  
... ... @@ -236,7 +237,7 @@
236 237  
237 238 Criteria c = null;
238 239 //月龄
239   - if (null != monthStart) {
  240 + /*if (null != monthStart) {
240 241 if (null != c) {
241 242 c = c.and("month").gte(monthStart);
242 243 } else {
243 244  
... ... @@ -249,7 +250,17 @@
249 250 } else {
250 251 c = Criteria.where("month").lte(monthEnd);
251 252 }
  253 + }*/
  254 + if (null != monthStart && null != monthEnd) {
  255 + Date currentDate = DateUtil.formatDate(new Date());
  256 + Date start = DateUtil.addMonth(currentDate, -monthStart);
  257 + setBirthEnd(start);
  258 +
  259 + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -monthEnd - 1), 1);
  260 + setBirthStart(end);
252 261 }
  262 +
  263 +
253 264 // 预约检查时间
254 265 if (null != nextDateStart) {
255 266 if (null != c) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabySpecialDiseaseClinicController.java View file @ 6c527ba
... ... @@ -72,7 +72,7 @@
72 72 }
73 73  
74 74 /**
75   - * 查询儿保专病
  75 + * 查询儿保专病，查看使用
76 76 *
77 77 * @param id
78 78 * @return
... ... @@ -82,6 +82,19 @@
82 82 @TokenRequired
83 83 public BaseResponse queryBabySpecialDiseaseClinicOne(@PathVariable("id") String id) {
84 84 return babySpecialDiseaseClinicFacade.queryBabySpecialDiseaseClinicOne(id);
  85 +
  86 + }
  87 + /**
  88 + * 查询儿保专病，编辑使用
  89 + *
  90 + * @param id
  91 + * @return
  92 + */
  93 + @RequestMapping(value = "/queryBabySpecialDiseaseClinicEditOne/{id}", method = RequestMethod.GET)
  94 + @ResponseBody
  95 + @TokenRequired
  96 + public BaseResponse queryBabySpecialDiseaseClinicEditOne(@PathVariable("id") String id) {
  97 + return babySpecialDiseaseClinicFacade.queryBabySpecialDiseaseClinicEditOne(id);
85 98  
86 99 }
87 100  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySpecialDiseaseClinicFacade.java View file @ 6c527ba
... ... @@ -209,6 +209,31 @@
209 209 BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySDCService.queryBabySpecialDiseaseClinicById(id);
210 210 BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult();
211 211 babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel);
  212 + if(StringUtils.isNotEmpty(babySpecialDiseaseClinicModel.getCheckDoctor())){
  213 + Users users = usersService.getUsers(NumberUtils.toInt(babySpecialDiseaseClinicModel.getCheckDoctor()));
  214 + babySpecialDiseaseClinicResult.setCheckDoctor(users.getName());
  215 + }
  216 + babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService));
  217 + br.setData(babySpecialDiseaseClinicResult);
  218 + br.setErrorcode(ErrorCodeConstants.SUCCESS);
  219 + br.setErrormsg("成功");
  220 + }
  221 + return br;
  222 + }
  223 +
  224 + /**
  225 + * 根据专病id,查询儿保专病
  226 + *
  227 + * @Author: 武涛涛
  228 + * @Date: 2020/7/31 11:34
  229 + */
  230 + public BaseObjectResponse queryBabySpecialDiseaseClinicEditOne(String id) {
  231 +
  232 + BaseObjectResponse br = new BaseObjectResponse();
  233 + if(StringUtils.isNotEmpty(id)){
  234 + BabySpecialDiseaseClinicModel babySpecialDiseaseClinicModel = babySDCService.queryBabySpecialDiseaseClinicById(id);
  235 + BabySpecialDiseaseClinicResult babySpecialDiseaseClinicResult = new BabySpecialDiseaseClinicResult();
  236 + babySpecialDiseaseClinicResult.convertToResult(babySpecialDiseaseClinicModel);
212 237 babySpecialDiseaseClinicResult.setHospitalName(CommonsHelper.getHospitalName(babySpecialDiseaseClinicModel.getHospitalId(), organizationService));
213 238 br.setData(babySpecialDiseaseClinicResult);
214 239 br.setErrorcode(ErrorCodeConstants.SUCCESS);