diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java index 6cd8c49..251c3cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java @@ -108,7 +108,16 @@ public class BabyNutritionSpecialtyController extends BaseController { public BaseResponse queryOne(BabyNutritionSpecialtyModelQuery babyNutritionSpecialtyModelQuery, HttpServletRequest request) { return babyNutritionSpecialtyFacade.queryOne(babyNutritionSpecialtyModelQuery,getUserId(request)); } - + /** + * 查询单人所有营养专科检查历史记录 + * + */ + @RequestMapping(value = "/queryOneList", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryOneList(BabyNutritionSpecialtyModelQuery babyNutritionSpecialtyModelQuery, HttpServletRequest request) { + return babyNutritionSpecialtyFacade.queryOneList(babyNutritionSpecialtyModelQuery,getUserId(request)); + } /** * 查询全部所有心理专科检查记录 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java index b813163..54da8b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java @@ -26,9 +26,7 @@ import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 营养专科 逻辑处理 @@ -140,14 +138,14 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { } - /** - * 新增 营养专科检查 - * - * @param request - * @param userId - * @Author: 武涛涛 - * @Date: 2020/8/14 10:55 - */ + /** + * 新增 营养专科检查 + * + * @param request + * @param userId + * @Author: 武涛涛 + * @Date: 2020/8/14 10:55 + */ public BaseResponse add(BabyNutritionSpecialtyRequest request, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -163,7 +161,7 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { model.setCreateDate(new Date()); model.setHospitalId(hospitalId); model = babyBabyNSService.add(model); - if (model!=null && model.getId()!=null) { + if (model != null && model.getId() != null) { operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), model, model, OptActionEnums.ADD.getId(), "新增营养专科检查"); } BaseObjectResponse br = new BaseObjectResponse(); @@ -181,13 +179,13 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2020/8/14 10:55 */ - public BaseResponse update (BabyNutritionSpecialtyRequest request, Integer userId) { + public BaseResponse update(BabyNutritionSpecialtyRequest request, Integer userId) { //当前登录人医院Id String hospitalId = autoMatchFacade.getHospitalId(userId); BabyNutritionSpecialtyModel model = getBabyNutritionSpecialtyModel(request); BabyNutritionSpecialtyModel models = babyBabyNSService.queryById(request.getId()); - if (models !=null && models.getId()!=null) { + if (models != null && models.getId() != null) { babyBabyNSService.update(model, request.getId()); operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), models, model, OptActionEnums.UPDATE.getId(), "修改营养专科检查"); } @@ -203,8 +201,8 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { String hospitalId = autoMatchFacade.getHospitalId(userId); //查询营养专科记录 - BabyNutritionSpecialtyModel checkModel = babyBabyNSService.queryById(id); - if(checkModel !=null && checkModel.getId()!= null){ + BabyNutritionSpecialtyModel checkModel = babyBabyNSService.queryById(id); + if (checkModel != null && checkModel.getId() != null) { babyBabyNSService.deleteById(id); operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), checkModel, OptActionEnums.DELETE.getId(), "删除营养专科检查"); @@ -221,21 +219,21 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { public BaseObjectResponse queryByIdShow(String id) { BaseObjectResponse br = new BaseObjectResponse(); - if(StringUtils.isNotEmpty(id)){ + if (StringUtils.isNotEmpty(id)) { BabyNutritionSpecialtyModel babyNutritionSpecialtyModel = babyBabyNSService.queryById(id); BabyNutritionSpecialtyResult babyNutritionSpecialtyResult = new BabyNutritionSpecialtyResult(); babyNutritionSpecialtyResult.convertToShowResult(babyNutritionSpecialtyModel); - if(CollectionUtils.isNotEmpty(babyNutritionSpecialtyModel.getmHighRiskReason())){ + if (CollectionUtils.isNotEmpty(babyNutritionSpecialtyModel.getmHighRiskReason())) { babyNutritionSpecialtyResult.setmHighRiskReason(mongoUtil.findColor(babyNutritionSpecialtyModel.getmHighRiskReason())); } - if(StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCheckDoctor())){ + if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCheckDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(babyNutritionSpecialtyModel.getCheckDoctor())); - if(users!=null && StringUtils.isNotEmpty(users.getName())){ + if (users != null && StringUtils.isNotEmpty(users.getName())) { babyNutritionSpecialtyResult.setCheckDoctor(users.getName()); } } - if(StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getHospitalId())){ + if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getHospitalId())) { babyNutritionSpecialtyResult.setHospitalName(CommonsHelper.getHospitalName(babyNutritionSpecialtyModel.getHospitalId(), organizationService)); } br.setData(babyNutritionSpecialtyResult); @@ -255,7 +253,7 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { public BaseObjectResponse queryByIdEdit(String id) { BaseObjectResponse br = new BaseObjectResponse(); - if(StringUtils.isNotEmpty(id)){ + if (StringUtils.isNotEmpty(id)) { BabyNutritionSpecialtyModel babyNutritionSpecialtyModel = babyBabyNSService.queryById(id); BabyNutritionSpecialtyResult babyNutritionSpecialtyResult = new BabyNutritionSpecialtyResult(); babyNutritionSpecialtyResult.convertToResult(babyNutritionSpecialtyModel); @@ -280,10 +278,10 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { BaseObjectResponse br = new BaseObjectResponse(); String hospitalId = autoMatchFacade.getHospitalId(userId); - List babyNutritionSpecialtyResults = new ArrayList<>(); + List babyNutritionSpecialtyResults = new ArrayList <>(); //单人多条专病记录 - List babyNutritionSpecialtyModelList = new ArrayList<>(); - if( StringUtils.isNotEmpty(babyQuery.getBuildId()) || StringUtils.isNotEmpty(babyQuery.getYyProject())){ + List babyNutritionSpecialtyModelList = new ArrayList <>(); + if (StringUtils.isNotEmpty(babyQuery.getBuildId()) || StringUtils.isNotEmpty(babyQuery.getYyProject())) { babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); babyQuery.setSort("checkDate"); @@ -293,9 +291,9 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { for (int i = 0; i < babyNutritionSpecialtyModelList.size(); i++) { BabyNutritionSpecialtyModel babyNutritionSpecialtyModel = babyNutritionSpecialtyModelList.get(i); BabyNutritionSpecialtyResult babyNutritionSpecialtyResult = new BabyNutritionSpecialtyResult(); - if(babyNutritionSpecialtyModel !=null ){ + if (babyNutritionSpecialtyModel != null) { babyNutritionSpecialtyResult.convertToResult(babyNutritionSpecialtyModel); - if(StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getHospitalId())){ + if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getHospitalId())) { babyNutritionSpecialtyResult.setHospitalName(CommonsHelper.getHospitalName(babyNutritionSpecialtyModel.getHospitalId(), organizationService)); } babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult); @@ -309,6 +307,49 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { } + public BaseObjectResponse queryOneList(BabyNutritionSpecialtyModelQuery babyQuery, Integer userId) { + + BaseObjectResponse br = new BaseObjectResponse(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + Map map = new HashMap <>(); + map.put("dbznl",getBabyNutritionSpecialtyResults(babyQuery, hospitalId, "dbznl")); + map.put("pxet",getBabyNutritionSpecialtyResults(babyQuery, hospitalId, "pxet")); + map.put("jlbet",getBabyNutritionSpecialtyResults(babyQuery, hospitalId, "jlbet")); + map.put("fpetjc",getBabyNutritionSpecialtyResults(babyQuery, hospitalId, "fpetjc")); + br.setData(map); + br.setPageInfo(babyQuery.getPageInfo()); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + + } + + private List getBabyNutritionSpecialtyResults(BabyNutritionSpecialtyModelQuery babyQuery, String hospitalId, String yyProject) { + List babyNutritionSpecialtyResults = new ArrayList <>(); + babyQuery.setYyProject(yyProject); + //单人多条专病记录 + List babyNutritionSpecialtyModelList = new ArrayList <>(); + if (StringUtils.isNotEmpty(babyQuery.getBuildId()) || StringUtils.isNotEmpty(babyQuery.getYyProject())) { + babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setHospitalId(hospitalId); + babyQuery.setSort("checkDate"); + babyNutritionSpecialtyModelList = babyBabyNSService.queryOne(babyQuery); + + } + for (int i = 0; i < babyNutritionSpecialtyModelList.size(); i++) { + BabyNutritionSpecialtyModel babyNutritionSpecialtyModel = babyNutritionSpecialtyModelList.get(i); + BabyNutritionSpecialtyResult babyNutritionSpecialtyResult = new BabyNutritionSpecialtyResult(); + if (babyNutritionSpecialtyModel != null) { + babyNutritionSpecialtyResult.convertToResult(babyNutritionSpecialtyModel); + if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getHospitalId())) { + babyNutritionSpecialtyResult.setHospitalName(CommonsHelper.getHospitalName(babyNutritionSpecialtyModel.getHospitalId(), organizationService)); + } + babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult); + } + } + return babyNutritionSpecialtyResults; + } + /** * 查询全部所有营养专科检查记录 * @@ -321,34 +362,34 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { BaseObjectResponse br = new BaseObjectResponse(); String hospitalId = autoMatchFacade.getHospitalId(userId); - List babyNutritionSpecialtyResults = new ArrayList<>(); + List babyNutritionSpecialtyResults = new ArrayList <>(); //单人多条专病记录 - List babyNutritionSpecialtyModelList = new ArrayList<>(); - if(StringUtils.isEmpty(babyQuery.getBuildId()) ){ + List babyNutritionSpecialtyModelList = new ArrayList <>(); + if (StringUtils.isEmpty(babyQuery.getBuildId())) { babyQuery.setNeed("true"); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); babyQuery.setSort("createDate"); - if(babyQuery.getCheckDateEnd()!=null){ + if (babyQuery.getCheckDateEnd() != null) { babyQuery.setCheckDateEnd(DateUtil.getDayLastSecond(babyQuery.getCheckDateEnd())); } - if(babyQuery.getNextDateEnd()!=null){ + if (babyQuery.getNextDateEnd() != null) { babyQuery.setNextDateEnd(DateUtil.getDayLastSecond(babyQuery.getNextDateEnd())); } - if(babyQuery.getBirthEnd()!=null){ + if (babyQuery.getBirthEnd() != null) { babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); } - if(babyQuery.getcCDateEnd()!=null){ - babyQuery.setcCDateEnd(DateUtil.getDayLastSecond(babyQuery.getcCDateEnd())); - } + if (babyQuery.getcCDateEnd() != null) { + babyQuery.setcCDateEnd(DateUtil.getDayLastSecond(babyQuery.getcCDateEnd())); + } - babyNutritionSpecialtyModelList = babyBabyNSService.queryAll(babyQuery); + babyNutritionSpecialtyModelList = babyBabyNSService.queryAll(babyQuery); System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } for (int i = 0; i < babyNutritionSpecialtyModelList.size(); i++) { BabyNutritionSpecialtyModel babyNutritionSpecialtyModel = babyNutritionSpecialtyModelList.get(i); - BabyNutritionSpecialtyResult babyNutritionSpecialtyResult= new BabyNutritionSpecialtyResult(); - if(babyNutritionSpecialtyModel !=null ){ + BabyNutritionSpecialtyResult babyNutritionSpecialtyResult = new BabyNutritionSpecialtyResult(); + if (babyNutritionSpecialtyModel != null) { babyNutritionSpecialtyResult.convertToResult(babyNutritionSpecialtyModel); babyNutritionSpecialtyResult.setHospitalId(CommonsHelper.getHospitalName(babyNutritionSpecialtyModel.getHospitalId(), organizationService)); babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult);