From 852ea0787273ffa3d1fd0504a3069284f5d434da Mon Sep 17 00:00:00 2001 From: wtt <1872109740@qq.com> Date: Wed, 11 Mar 2020 13:25:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=89=8D=E4=BC=98=E7=94=9F=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PreEugenicsBaseController.java | 41 ++++++++++++++++++---- .../web/service/impl/PreEugebicsServiceImpl.java | 41 +++++++++++----------- 2 files changed, 55 insertions(+), 27 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java index cc4bfd4..c9096f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java @@ -2,8 +2,11 @@ package com.lyms.platform.operate.web.controller; import javax.servlet.http.HttpServletRequest; +import com.lyms.hospitalapi.lcfy.LcTyInterface; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.operate.web.request.YqysParamRequest; import com.lyms.platform.operate.web.service.impl.PreEugebicsServiceImpl; +import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.PreEugenicsBaseModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -33,8 +36,9 @@ public class PreEugenicsBaseController extends BaseController { @Autowired private PreEugebicsServiceImpl preEugebicsService; + @Autowired + private LcTyInterface lcTyInterface; /** - * * 根据身份证号获取对应的孕前优生信息 * * @param param @@ -43,14 +47,36 @@ public class PreEugenicsBaseController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getInfoByIdCard") @ResponseBody @TokenRequired - public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param,HttpServletRequest request) { - return iPreEugenicsService.getPatientInfoByIdCard(param,getUserId(request)); + public BaseResponse getPatientInfoByIdCard(@JsonAlias CommonParamRequest param, HttpServletRequest request) { + return iPreEugenicsService.getPatientInfoByIdCard(param, getUserId(request)); } + @RequestMapping(method = RequestMethod.GET, value = "/getInfoByIdCardYqys") @ResponseBody public PreEugenicsBaseModel getPatientInfoByIdCardYqys(@JsonAlias YqysParamRequest param) { return preEugebicsService.getPatientInfoByIdCardYqys(param); } + /** + * 孕前优生临床检查定时数据手动同步 + * @param start 2020-03-08 + * @param end 2020-03-09 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/timingCheck") + @ResponseBody + public BaseResponse timingCheck(String start ,String end) { + start = start + "%2000:00:00"; + end = end+ "%2023:59:59"; + System.out.println("start: "+start+" , end: "+end); + lcTyInterface.dzlcYqys(start,end); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + @RequestMapping(method = RequestMethod.GET, value = "/getasicConfigYqys") + @ResponseBody + public BasicConfig getBasicConfigYqys(String id) { + return preEugebicsService.getBasicConfigYqys(id); + } /** * 保存单个 @@ -61,7 +87,7 @@ public class PreEugenicsBaseController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/add") @ResponseBody @TokenRequired - public BaseResponse add( @RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) { + public BaseResponse add(@RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) { Integer userId = getUserId(request); param.setCreateUser(userId.toString()); return iPreEugenicsService.add(param, getUserId(request)); @@ -76,7 +102,7 @@ public class PreEugenicsBaseController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/edit") @ResponseBody @TokenRequired - public BaseResponse edit( @RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) { + public BaseResponse edit(@RequestBody PreEugenicsBaseRequest param, HttpServletRequest request) { Integer userId = getUserId(request); param.setCreateUser(userId.toString()); return iPreEugenicsService.edit(param); @@ -91,7 +117,7 @@ public class PreEugenicsBaseController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/listPage") @ResponseBody @TokenRequired - public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param,HttpServletRequest request) { + public BaseListResponse listPage(@JsonAlias PreEugenicsBaseListRequest param, HttpServletRequest request) { return iPreEugenicsService.listPage(param, getUserId(request)); } @@ -104,13 +130,14 @@ public class PreEugenicsBaseController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/detail") @ResponseBody @TokenRequired - public BaseResponse detail( @JsonAlias PreEugenicsBaseRequest param) { + public BaseResponse detail(@JsonAlias PreEugenicsBaseRequest param) { return iPreEugenicsService.detail(param); } /** * 删除孕前优生 + * * @param id * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 51cfa8e..cfdcb56 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -6,6 +6,7 @@ import com.lyms.hospitalapi.lcfy.LisService; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.request.YqysParamRequest; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.BasicConfig; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -64,7 +65,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen * @return */ @Override - public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) { + public BaseResponse getPatientInfoByIdCard(CommonParamRequest param, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); String cardNo = param.getCardNo(); Query query = new Query(); @@ -82,7 +83,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen query.addCriteria(Criteria.where("code").is(code)); } - PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class); + PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class); if (one == null) { if (StringUtils.isNotEmpty(cardNo)) { ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class); @@ -139,7 +140,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if (StringUtils.isNotEmpty(param.getWifeCardNo())) { query.addCriteria(Criteria.where("wifeCardNo").is(param.getWifeCardNo())); } - if(StringUtils.isNotEmpty(param.getHospitalId()) && StringUtils.isNotEmpty(param.getUserId())){ + if (StringUtils.isNotEmpty(param.getHospitalId()) && StringUtils.isNotEmpty(param.getUserId())) { query.addCriteria(Criteria.where("hospitalId").is(param.getHospitalId()).and("createUser").is(param.getUserId())); } query.addCriteria(Criteria.where("hasUpload").is("2")); @@ -147,6 +148,10 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen return one; } + public BasicConfig getBasicConfigYqys(String id) { + return basicConfigService.getOneBasicConfigById(id); + } + /** * 保存单个 @@ -155,7 +160,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen * @return */ @Override - public BaseResponse add(PreEugenicsBaseRequest param,Integer userId) { + public BaseResponse add(PreEugenicsBaseRequest param, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); PreEugenicsBaseModel model = param; model.setHospitalId(hospitalId); @@ -169,8 +174,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen /** * 保存到lis */ - private void saveLis(final PreEugenicsBaseModel model) - { + private void saveLis(final PreEugenicsBaseModel model) { new Thread(new Runnable() { @Override public void run() { @@ -207,7 +211,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen * @return */ @Override - public BaseListResponse listPage(PreEugenicsBaseListRequest param,Integer userId) { + public BaseListResponse listPage(PreEugenicsBaseListRequest param, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Query query = new Query(); @@ -339,7 +343,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen if (StringUtils.isNotEmpty(idCardNo)) { if (StringUtils.isNotEmpty(searchType)) { if ("1".equals(searchType)) { - return query.addCriteria(Criteria.where("husbandCardNo").is(idCardNo)); + return query.addCriteria(Criteria.where("husbandCardNo").is(idCardNo)); } if ("2".equals(searchType)) { return query.addCriteria(Criteria.where("wifeCardNo").is(idCardNo)); @@ -353,6 +357,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen /** * 添加 丈夫户口所在地/丈夫现住址/妻子户口所在地/妻子现住地址 省市区街道详细地址 + * * @param model * @return */ @@ -409,21 +414,17 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen } - private void setDoctorName(Map map) - { - if (map != null && map.size() > 0 && map.get("doctor") != null) - { + private void setDoctorName(Map map) { + if (map != null && map.size() > 0 && map.get("doctor") != null) { String doctor = String.valueOf(map.get("doctor")); - String doctorStr = CommonsHelper.getUserName(doctor,usersService); - map.put("doctorStr",doctorStr); + String doctorStr = CommonsHelper.getUserName(doctor, usersService); + map.put("doctorStr", doctorStr); } - if (map != null && map.size() > 0 && map.get("checkDoctor") != null) - { + if (map != null && map.size() > 0 && map.get("checkDoctor") != null) { String doctor = String.valueOf(map.get("checkDoctor")); - if (StringUtils.isNotEmpty(doctor)) - { - String doctorStr = CommonsHelper.getUserName(doctor,usersService); - map.put("checkDoctorStr",doctorStr); + if (StringUtils.isNotEmpty(doctor)) { + String doctorStr = CommonsHelper.getUserName(doctor, usersService); + map.put("checkDoctorStr", doctorStr); } } } -- 1.8.3.1