jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 02a6883364d8286f84b60fd98a8b62e5b08f536c

Authored by liquanyu
1 parent 9344f946e3
Exists in master and in 2 other branches dev, luanping

同步修改

Showing 9 changed files with 131 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java View file @ 02a6883
... ... @@ -236,6 +236,9 @@
236 236 if(null != yn){
237 237 condition=condition.and("yn", yn, MongoOper.IS);
238 238 }
  239 + if(null != certificateNum){
  240 + condition=condition.and("certificateNum", certificateNum, MongoOper.IS);
  241 + }
239 242 if(null != status){
240 243 condition=condition.and("position", status, MongoOper.IS);
241 244 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdPuerService.java View file @ 02a6883
... ... @@ -105,7 +105,7 @@
105 105 AntExChuQuery antExChuQuery = new AntExChuQuery();
106 106 antExChuQuery.setYn(YnEnums.YES.getId());
107 107 antExChuQuery.setPid(pats.get(0).getPid());
108   - antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(),-3));
  108 + antExChuQuery.setCreatedTimeStart(DateUtil.addMonth(new Date(),-6));
109 109 antExChuQuery.setCreatedTimeEnd(new Date());
110 110 List <AntExChuModel> data = antenatalExaminationService.queryAntExChu(antExChuQuery);
111 111 if (CollectionUtils.isNotEmpty(data))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java View file @ 02a6883
... ... @@ -88,6 +88,12 @@
88 88 }
89 89  
90 90 @ResponseBody
  91 + @RequestMapping(method = RequestMethod.GET,value = "/queryByCardNo/{cardNo}")
  92 + public String queryByCardNo(HttpServletRequest request,@PathVariable String cardNo) {
  93 + return cancerScreenService.queryByCardNo(cardNo);
  94 + }
  95 +
  96 + @ResponseBody
91 97 @RequestMapping(method = RequestMethod.DELETE,value = "/deleteById/{id}")
92 98 @TokenRequired
93 99 public BaseResponse deleteById(@PathVariable String id, HttpServletRequest request) {
... ... @@ -145,6 +151,15 @@
145 151 HttpServletRequest request) {
146 152 return cancerScreenService.doSyncCancerScreen();
147 153 }
  154 +
  155 +
  156 + @RequestMapping(method = RequestMethod.GET, value = "/handleHistry")
  157 + @ResponseBody
  158 + public BaseResponse handleHistry(
  159 + HttpServletRequest request) {
  160 + return cancerScreenService.handleHistry();
  161 + }
  162 +
148 163  
149 164 /**
150 165 * 乳腺癌统计表
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CervicalCancerController.java View file @ 02a6883
... ... @@ -92,6 +92,19 @@
92 92 return cervicalCancerService.listPage(param, getUserId(request));
93 93 }
94 94  
  95 + @RequestMapping(method = RequestMethod.GET, value = "/queryByCardNo/{cardNo}")
  96 + @ResponseBody
  97 + public String queryByCardNo(@PathVariable String cardNo,HttpServletRequest request) {
  98 + return cervicalCancerService.queryByCardNo(cardNo);
  99 + }
  100 +
  101 + @RequestMapping(method = RequestMethod.GET, value = "/handleHistry")
  102 + @ResponseBody
  103 + public BaseResponse handleHistry(
  104 + HttpServletRequest request) {
  105 + return cervicalCancerService.handleHistry();
  106 + }
  107 +
95 108 /**
96 109 * 宫颈癌管理列表增加搜索条件：
97 110 * 乳腺癌管理列表增加搜索条件：
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java View file @ 02a6883
... ... @@ -15,6 +15,7 @@
15 15 import javax.servlet.http.HttpServletRequest;
16 16 import javax.servlet.http.HttpServletResponse;
17 17 import javax.validation.Valid;
  18 +import java.util.List;
18 19  
19 20 /**
20 21 * <p>
... ... @@ -86,6 +87,12 @@
86 87 @RequestMapping(value = "/{id}", method = RequestMethod.GET)
87 88 public BaseResponse getOneMatdeliverFollowMake(@PathVariable String id) {
88 89 return matdeliverFollowFacade.getOneMatdeliverFollowMake(id);
  90 + }
  91 +
  92 + @ResponseBody
  93 + @RequestMapping(value = "updateByCardNo", method = RequestMethod.POST)
  94 + public BaseResponse updateByCardNo(@RequestBody String[] array) {
  95 + return matdeliverFollowFacade.updateByCardNo(array);
89 96 }
90 97  
91 98 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 02a6883
... ... @@ -492,7 +492,7 @@
492 492 }
493 493 }else if (users.getOrgId()==216){
494 494 String hname = organization.getName();
495   - if (!(hname.contains("医院") ) || hname.equals("吉星里港口医院社区卫生服务站") || hname.equals("青龙满族自治县生殖保健医院") ) {
  495 + if ( hname.equals("吉星里港口医院社区卫生服务站") || hname.equals("青龙满族自治县生殖保健医院") ) {
496 496 if (!hname.equals("秦皇岛市妇幼保健院")){
497 497 continue;
498 498 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 02a6883
... ... @@ -705,6 +705,33 @@
705 705 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
706 706 }
707 707  
  708 +
  709 + public BaseResponse handleHistry() {
  710 + //查询条件
  711 + CancerScreeningQuery query = new CancerScreeningQuery();
  712 + query.setYn(YnEnums.YES.getId());
  713 + query.setHospitalId("2100001605");
  714 + query.setCreatedStart(DateUtil.parseYMD("2023-01-01"));
  715 + query.setCreatedEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD("2023-05-27")));
  716 + List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
  717 + if (CollectionUtils.isNotEmpty(modelList)) {
  718 + System.out.println("handleHistry=" + modelList.size());
  719 + for (CancerScreeningModel model : modelList)
  720 + {
  721 + String result = HttpClientUtil.doGet("https://area-chengde-api.healthbaby.com.cn:12356/cancerScr/queryByCardNo/" +
  722 + ""+model.getCertificateNum(),null,"utf-8",null);
  723 + if ("false".equals(result)){
  724 + System.out.println(model.getCertificateNum());
  725 + model.setIsSync(2);
  726 + String json = JsonUtil.obj2Str1(model);
  727 + String syncRsult = HttpClientUtil.doPostSSL("https://area-chengde-api.healthbaby.com.cn:12356/cancerScr/syncCancerScreen", json);
  728 + System.out.println(syncRsult);
  729 + }
  730 + }
  731 + }
  732 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  733 + }
  734 +
708 735 public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url");
709 736  
710 737 public BaseObjectResponse queryCancerScreeningCount(CancerScreeningRequest request, Integer userId) {
... ... @@ -1247,6 +1274,19 @@
1247 1274 Query query = Query.query(Criteria.where("id").is(id));
1248 1275 CancerExamineModel cancerExamineModel = mongoTemplate.findOne(query,CancerExamineModel.class);
1249 1276 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(cancerExamineModel);
  1277 + }
  1278 +
  1279 + public String queryByCardNo(String cardNo) {
  1280 + //查询条件
  1281 + CancerScreeningQuery query = new CancerScreeningQuery();
  1282 + query.setYn(YnEnums.YES.getId());
  1283 + query.setCertificateNum(cardNo);
  1284 + System.out.println(query.convertToQuery().convertToMongoQuery().toString());
  1285 + List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
  1286 + if(CollectionUtils.isNotEmpty(modelList)){
  1287 + return "true";
  1288 + }
  1289 + return "false";
1250 1290 }
1251 1291 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java View file @ 02a6883
... ... @@ -972,5 +972,23 @@
972 972 mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(param.getId())), update, MaternalDeliverModel.class);
973 973 return new BaseListResponse();
974 974 }
  975 +
  976 + public BaseResponse updateByCardNo(String[] array) {
  977 + List<Patients> models = mongoTemplate.find(Query.query(Criteria.where("cardNo").in(Arrays.asList(array))), Patients.class);
  978 + System.out.println(models.size());
  979 + if(CollectionUtils.isNotEmpty(models)){
  980 + for(Patients pat : models){
  981 + Update update = new Update();
  982 + update.set("makeType", 2);
  983 + mongoTemplate.updateFirst(Query.query(Criteria.where("pid").is(pat.getPid())),
  984 + update, MaternalDeliverModel.class);
  985 + mongoTemplate.updateFirst(Query.query(Criteria.where("pid").is(pat.getPid())),
  986 + update, MatdeliverFollowModel.class);
  987 + System.out.println("cardno="+pat.getCardNo());
  988 + }
  989 + }
  990 + return new BaseListResponse();
  991 +
  992 + }
975 993 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 02a6883
... ... @@ -1106,5 +1106,38 @@
1106 1106 mongoTemplate.remove(query, CervicalCancerModel.class);
1107 1107 return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
1108 1108 }
  1109 +
  1110 + public String queryByCardNo(String cardNo) {
  1111 + Query query = new Query();
  1112 + query.addCriteria(Criteria.where("idCardNo").is(cardNo));
  1113 + List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class);
  1114 + if(CollectionUtils.isNotEmpty(cervicalCancerModels)){
  1115 + return "true";
  1116 + }
  1117 + return "false";
  1118 +
  1119 + }
  1120 +
  1121 + public BaseResponse handleHistry() {
  1122 + Query query = new Query();
  1123 + Criteria c = Criteria.where("hospitalId").is("2100001605");
  1124 + query.addCriteria(c);
  1125 + query.addCriteria(Criteria.where("created").gte(DateUtil.parseYMD("2023-01-01"))
  1126 + .lte(new Date(DateUtil.parseYMD("2023-05-27").getTime() + 24 * 60 * 60 * 1000 - 1)));
  1127 + List<CervicalCancerModel> cervicalCancerModels = mongoTemplate.find(query, CervicalCancerModel.class);
  1128 + if(CollectionUtils.isNotEmpty(cervicalCancerModels)){
  1129 + for(CervicalCancerModel model : cervicalCancerModels){
  1130 + String result = HttpClientUtil.doGet("https://area-chengde-api.healthbaby.com.cn:12356/cervicalCancer/queryByCardNo/" +
  1131 + ""+model.getIdCardNo(),null,"utf-8",null);
  1132 + if ("false".equals(result)){
  1133 + System.out.println(model.getIdCardNo());
  1134 + String json = JsonUtil.obj2Str1(model);
  1135 + String syncRsult = HttpClientUtil.doPostSSL("https://area-chengde-api.healthbaby.com.cn:12356/cervicalCancer/syncCervicalCancer", json);
  1136 + System.out.println(syncRsult);
  1137 + }
  1138 + }
  1139 + }
  1140 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  1141 + }
1109 1142 }