From 02a6883364d8286f84b60fd98a8b62e5b08f536c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 16 Jun 2023 23:09:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/query/CancerScreeningQuery.java | 3 ++ .../com/lyms/hospitalapi/qhdfy/QhdPuerService.java | 2 +- .../web/controller/CancerScreeningController.java | 15 ++++++++ .../web/controller/CervicalCancerController.java | 13 +++++++ .../web/controller/MatdeliverFollowController.java | 7 ++++ .../web/controller/OrganizationController.java | 2 +- .../operate/web/facade/CancerScreeningFacade.java | 40 ++++++++++++++++++++++ .../operate/web/facade/MatdeliverFollowFacade.java | 18 ++++++++++ .../service/impl/CervicalCancerServiceImpl.java | 33 ++++++++++++++++++ 9 files changed, 131 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java index a271d27..b328f8f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java @@ -236,6 +236,9 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ if(null != yn){ condition=condition.and("yn", yn, MongoOper.IS); } + if(null != certificateNum){ + condition=condition.and("certificateNum", certificateNum, MongoOper.IS); + } if(null != status){ condition=condition.and("position", status, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java index 9b811a2..d9868eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java @@ -105,7 +105,7 @@ public class QhdPuerService { AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setPid(pats.get(0).getPid()); - antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(),-3)); + antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(),-6)); antExChuQuery.setCreatedTimeEnd(new Date()); List data = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(data)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java index 9c215fe..3dcb4e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java @@ -88,6 +88,12 @@ public class CancerScreeningController extends BaseController { } @ResponseBody + @RequestMapping(method = RequestMethod.GET,value = "/queryByCardNo/{cardNo}") + public String queryByCardNo(HttpServletRequest request,@PathVariable String cardNo) { + return cancerScreenService.queryByCardNo(cardNo); + } + + @ResponseBody @RequestMapping(method = RequestMethod.DELETE,value = "/deleteById/{id}") @TokenRequired public BaseResponse deleteById(@PathVariable String id, HttpServletRequest request) { @@ -146,6 +152,15 @@ public class CancerScreeningController extends BaseController { return cancerScreenService.doSyncCancerScreen(); } + + @RequestMapping(method = RequestMethod.GET, value = "/handleHistry") + @ResponseBody + public BaseResponse handleHistry( + HttpServletRequest request) { + return cancerScreenService.handleHistry(); + } + + /** * 乳腺癌统计表 * @param cancerScreeningRequest diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java index d3a6365..fbf5af6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java @@ -92,6 +92,19 @@ public class CervicalCancerController extends BaseController { return cervicalCancerService.listPage(param, getUserId(request)); } + @RequestMapping(method = RequestMethod.GET, value = "/queryByCardNo/{cardNo}") + @ResponseBody + public String queryByCardNo(@PathVariable String cardNo,HttpServletRequest request) { + return cervicalCancerService.queryByCardNo(cardNo); + } + + @RequestMapping(method = RequestMethod.GET, value = "/handleHistry") + @ResponseBody + public BaseResponse handleHistry( + HttpServletRequest request) { + return cervicalCancerService.handleHistry(); + } + /** * 宫颈癌管理列表增加搜索条件： * 乳腺癌管理列表增加搜索条件： diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java index 5c3454a..e26d84b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.List; /** *

@@ -88,6 +89,12 @@ public class MatdeliverFollowController extends BaseController { return matdeliverFollowFacade.getOneMatdeliverFollowMake(id); } + @ResponseBody + @RequestMapping(value = "updateByCardNo", method = RequestMethod.POST) + public BaseResponse updateByCardNo(@RequestBody String[] array) { + return matdeliverFollowFacade.updateByCardNo(array); + } + /** * 产后随访列表导出 * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 43d00eb..3dd9729 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -492,7 +492,7 @@ public class OrganizationController extends BaseController { } }else if (users.getOrgId()==216){ String hname = organization.getName(); - if (!(hname.contains("医院") ) || hname.equals("吉星里港口医院社区卫生服务站") || hname.equals("青龙满族自治县生殖保健医院") ) { + if ( hname.equals("吉星里港口医院社区卫生服务站") || hname.equals("青龙满族自治县生殖保健医院") ) { if (!hname.equals("秦皇岛市妇幼保健院")){ continue; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 4fa309c..0346c4c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -705,6 +705,33 @@ public class CancerScreeningFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + public BaseResponse handleHistry() { + //查询条件 + CancerScreeningQuery query = new CancerScreeningQuery(); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId("2100001605"); + query.setCreatedStart(DateUtil.parseYMD("2023-01-01")); + query.setCreatedEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD("2023-05-27"))); + List modelList = cancerScreenService.queryCancerScreList(query); + if (CollectionUtils.isNotEmpty(modelList)) { + System.out.println("handleHistry=" + modelList.size()); + for (CancerScreeningModel model : modelList) + { + String result = HttpClientUtil.doGet("https://area-chengde-api.healthbaby.com.cn:12356/cancerScr/queryByCardNo/" + + ""+model.getCertificateNum(),null,"utf-8",null); + if ("false".equals(result)){ + System.out.println(model.getCertificateNum()); + model.setIsSync(2); + String json = JsonUtil.obj2Str1(model); + String syncRsult = HttpClientUtil.doPostSSL("https://area-chengde-api.healthbaby.com.cn:12356/cancerScr/syncCancerScreen", json); + System.out.println(syncRsult); + } + } + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); public BaseObjectResponse queryCancerScreeningCount(CancerScreeningRequest request, Integer userId) { @@ -1248,4 +1275,17 @@ public class CancerScreeningFacade { CancerExamineModel cancerExamineModel = mongoTemplate.findOne(query,CancerExamineModel.class); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(cancerExamineModel); } + + public String queryByCardNo(String cardNo) { + //查询条件 + CancerScreeningQuery query = new CancerScreeningQuery(); + query.setYn(YnEnums.YES.getId()); + query.setCertificateNum(cardNo); + System.out.println(query.convertToQuery().convertToMongoQuery().toString()); + List modelList = cancerScreenService.queryCancerScreList(query); + if(CollectionUtils.isNotEmpty(modelList)){ + return "true"; + } + return "false"; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index 2dda53a..8d2348f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -972,4 +972,22 @@ public class MatdeliverFollowFacade { mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(param.getId())), update, MaternalDeliverModel.class); return new BaseListResponse(); } + + public BaseResponse updateByCardNo(String[] array) { + List models = mongoTemplate.find(Query.query(Criteria.where("cardNo").in(Arrays.asList(array))), Patients.class); + System.out.println(models.size()); + if(CollectionUtils.isNotEmpty(models)){ + for(Patients pat : models){ + Update update = new Update(); + update.set("makeType", 2); + mongoTemplate.updateFirst(Query.query(Criteria.where("pid").is(pat.getPid())), + update, MaternalDeliverModel.class); + mongoTemplate.updateFirst(Query.query(Criteria.where("pid").is(pat.getPid())), + update, MatdeliverFollowModel.class); + System.out.println("cardno="+pat.getCardNo()); + } + } + return new BaseListResponse(); + + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 4312e10..8fdf613 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -1106,4 +1106,37 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { mongoTemplate.remove(query, CervicalCancerModel.class); return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); } + + public String queryByCardNo(String cardNo) { + Query query = new Query(); + query.addCriteria(Criteria.where("idCardNo").is(cardNo)); + List cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class); + if(CollectionUtils.isNotEmpty(cervicalCancerModels)){ + return "true"; + } + return "false"; + + } + + public BaseResponse handleHistry() { + Query query = new Query(); + Criteria c = Criteria.where("hospitalId").is("2100001605"); + query.addCriteria(c); + query.addCriteria(Criteria.where("created").gte(DateUtil.parseYMD("2023-01-01")) + .lte(new Date(DateUtil.parseYMD("2023-05-27").getTime() + 24 * 60 * 60 * 1000 - 1))); + List cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class); + if(CollectionUtils.isNotEmpty(cervicalCancerModels)){ + for(CervicalCancerModel model : cervicalCancerModels){ + String result = HttpClientUtil.doGet("https://area-chengde-api.healthbaby.com.cn:12356/cervicalCancer/queryByCardNo/" + + ""+model.getIdCardNo(),null,"utf-8",null); + if ("false".equals(result)){ + System.out.println(model.getIdCardNo()); + String json = JsonUtil.obj2Str1(model); + String syncRsult = HttpClientUtil.doPostSSL("https://area-chengde-api.healthbaby.com.cn:12356/cervicalCancer/syncCervicalCancer", json); + System.out.println(syncRsult); + } + } + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } -- 1.8.3.1