diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 02f9b0d..0ca7fd1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -279,7 +279,8 @@ public class AntenatalExaminationController extends BaseController { * 唐山零时限制 */ Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) request.getAttribute("loginContext")).getId()).getOrgId()); - if ("4".equals(organization.getCityId())) + //遵化市妇幼保健院单独放开 + if (!"1000000094".equals(String.valueOf(organization.getId())) && "4".equals(organization.getCityId())) { String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(), -3))+" - "+DateUtil.getyyyy_MM_dd(new Date()); antExManagerQueryRequest.setcTime(date); @@ -333,7 +334,8 @@ public class AntenatalExaminationController extends BaseController { * 唐山零时限制 */ Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) request.getAttribute("loginContext")).getId()).getOrgId()); - if ("4".equals(organization.getCityId())) + //遵化市妇幼保健院单独放开 + if (!"1000000094".equals(String.valueOf(organization.getId())) && "4".equals(organization.getCityId())) { String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(), -3))+" - "+DateUtil.getyyyy_MM_dd(new Date()); antExManagerQueryRequest.setcTime(date); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index a3e8920..d95743c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -153,7 +153,7 @@ public class BabyEyeCheckController extends BaseController { Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) { return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, - bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds); + bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds); } /** @@ -167,9 +167,9 @@ public class BabyEyeCheckController extends BaseController { @RequestMapping(value = "/childrenFilingList", method = RequestMethod.GET) public BaseResponse childrenFilingList( Date startBuildDate, Date endBuildDate,Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) { - return babyEyeCheckService.childrenFilingList(getUserId(request),startBuildDate, endBuildDate,startDate, endDate, doctor, key, + return babyEyeCheckService.childrenFilingList(getUserId(request), startBuildDate, endBuildDate, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, - bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds); + bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds); } @ResponseBody @TokenRequired @@ -185,4 +185,19 @@ public class BabyEyeCheckController extends BaseController { return babyEyeCheckService.listInit(getUserId(request)); } + + /** + * 用于小程序调去儿童眼保检查 + * @param request + * @param hospitalId + * @param babyId + * @return + */ + @ResponseBody + @RequestMapping(value = "/getBabyEyeCheckInfo", method = RequestMethod.GET) + public BaseResponse getBabyEyeCheckInfo(HttpServletRequest request,@RequestParam String hospitalId,@RequestParam String babyId) { + return babyEyeCheckService.getBabyEyeCheckInfo(hospitalId,babyId); + } + + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index 25f2831..e4cca8d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -149,7 +149,8 @@ public class PuerperaManageController extends BaseController { * 唐山零时限制 */ Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) request.getAttribute("loginContext")).getId()).getOrgId()); - if ("4".equals(organization.getCityId())) + //遵化市妇幼保健院单独放开 + if (!"1000000094".equals(String.valueOf(organization.getId())) && "4".equals(organization.getCityId())) { String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(), -3))+" - "+DateUtil.getyyyy_MM_dd(new Date()); patientsQueryRequest.setBuildTime(date); @@ -528,7 +529,8 @@ public class PuerperaManageController extends BaseController { * 唐山零时限制 */ Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) request.getAttribute("loginContext")).getId()).getOrgId()); - if ("4".equals(organization.getCityId())) + //遵化市妇幼保健院单独放开 + if (!"1000000094".equals(String.valueOf(organization.getId())) && "4".equals(organization.getCityId())) { String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(), -3))+" - "+DateUtil.getyyyy_MM_dd(new Date()); patientsQueryRequest.setBuildTime(date); @@ -559,7 +561,8 @@ public class PuerperaManageController extends BaseController { * 唐山零时限制 */ Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()).getOrgId()); - if ("4".equals(organization.getCityId())) + //遵化市妇幼保健院单独放开 + if (!"1000000094".equals(String.valueOf(organization.getId())) && "4".equals(organization.getCityId())) { String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(),-3))+" - "+DateUtil.getyyyy_MM_dd(new Date()); patientManagerRequest.setBookBuildingDate(date); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java index 87f7710..76e1689 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -43,4 +43,6 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse listInit(Integer userId); void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin); + + BaseResponse getBabyEyeCheckInfo(String hospitalId, String babyId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 810595b..5d59167 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -51,15 +51,12 @@ import static com.lyms.platform.operate.web.service.BabyAfterVisitService.*; public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeCheckService { @Autowired private BabyEyeCheckMapper babyEyeCheckMapper; - @Autowired - private OrganizationGroupsFacade groupsFacade; + @Autowired private BabyBookbuildingService babyBookbuildingService; @Autowired private AutoMatchFacade autoMatchFacade; - @Autowired - @Qualifier("commonThreadPool") - private ThreadPoolTaskExecutor commonThreadPool; + @Autowired private MongoTemplate mongoTemplate; @Autowired @@ -429,10 +426,15 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC @Override public BaseResponse info(String id) { + Map map= getEyeCheckView(id); + return RespBuilder.buildSuccess(map); + } + + + private Map getEyeCheckView(String id) + { BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); - if (babyEyeCheck == null) { - return RespBuilder.buildSuccess(); - } + Map map = ReflectionUtils.beanToMap(babyEyeCheck); map.put("eyeMovementsId", "xz".equals(babyEyeCheck.getEyeMovementsId()) ? "限制" : "xt".equals(babyEyeCheck.getEyeMovementsId()) ? "协调" : "qhz".equals(babyEyeCheck.getEyeMovementsId()) ? "欠合作" : ""); map.put("nystagmus", parseYinYang(babyEyeCheck.getNystagmus())); @@ -579,7 +581,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("filePath", filePath); // CollectionUtils.removeNullValue(map); - return RespBuilder.buildSuccess(map); + return map; } /** @@ -1958,6 +1960,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC ResponseUtil.responseExcel(cnames, results, response); } + + private void syncData(String action, Object data, String id) { try { SyncDataModel model = new SyncDataModel(); @@ -1979,22 +1983,38 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } } + @Override + public BaseResponse getBabyEyeCheckInfo(String hospitalId, String babyId) { + - public static void main(String[] args) { - List ls = new ArrayList<>(); - ls.add("1"); - ls.add("2"); - ls.add("3"); - ls.add("4"); + List datas = new ArrayList<>(); - List ls2 = new ArrayList<>(); - ls2.add("1"); - ls2.add("6"); + List babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").is(hospitalId).and("yn").ne("0")) + .with(new Sort(Sort.Direction.ASC, "checkTime")), BabyEyeCheck.class); + for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { + Map temp = new HashMap<>(); + temp.put("id", babyEyeCheck.getId()); + temp.put("hospitalId", babyEyeCheck.getHospitalId()); + temp.put("pid", babyEyeCheck.getPid()); + temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); + BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); + if (babyModel != null) { + temp.put("name", babyModel.getName()); + if (babyModel.getSex() != null) { + temp.put("sex", SexEnum.getTextById(babyModel.getSex())); + } + } + temp.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); + temp.put("type", "2"); + CollectionUtils.removeNullValue(temp); - System.out.println(ls.containsAll(ls2)); + Map map = getEyeCheckView(babyEyeCheck.getId()); + temp.put("viewData",map); + datas.add(temp); + } + return new BaseObjectResponse().setData(datas).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - }