Commit 223060e1c6632f410e70ea39cc4b278f8a225cdd
1 parent
f78ab79a29
Exists in
master
and in
6 other branches
隆化婚检同步
Showing 2 changed files with 78 additions and 64 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
View file @
223060e
| ... | ... | @@ -721,7 +721,7 @@ |
| 721 | 721 | if (CollectionUtils.isNotEmpty(premaritalCheckupList)) |
| 722 | 722 | { |
| 723 | 723 | for (PremaritalCheckup premaritalCheckup : premaritalCheckupList) { |
| 724 | - premaritalCheckup.setLhHiv("2"); | |
| 724 | + // premaritalCheckup.setLhHiv("2"); | |
| 725 | 725 | //获取lis检查数据 |
| 726 | 726 | List<LisReportModel> lisReportModels = getLhxfyLis(premaritalCheckup.getCertificateNum()); |
| 727 | 727 | if(CollectionUtils.isNotEmpty(lisReportModels)){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
223060e
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | import com.lyms.hospitalapi.lhxfy.LhxfyZjkService; |
| 8 | 8 | import com.lyms.hospitalapi.qhdfy.QhdfyFmService; |
| 9 | 9 | import com.lyms.hospitalapi.qhdfy.QhdfyHisService; |
| 10 | -import com.lyms.hospitalapi.qhdfy.QhdfyZyFmService; | |
| 10 | +//import com.lyms.hospitalapi.qhdfy.QhdfyZyFmService; | |
| 11 | 11 | import com.lyms.hospitalapi.qhdfy.SyncQhdBaseInfoService; |
| 12 | 12 | import com.lyms.hospitalapi.rcfy.RcGlxtService; |
| 13 | 13 | import com.lyms.hospitalapi.zcfy.ZcPrenatalService; |
| 14 | 14 | |
| ... | ... | @@ -163,9 +163,9 @@ |
| 163 | 163 | |
| 164 | 164 | @Autowired |
| 165 | 165 | private PatientFacade patientFacade; |
| 166 | +// @Autowired | |
| 167 | +// private QhdfyZyFmService qhdfyZyFmService; | |
| 166 | 168 | @Autowired |
| 167 | - private QhdfyZyFmService qhdfyZyFmService; | |
| 168 | - @Autowired | |
| 169 | 169 | private BabySieveFacede babySieveFacede; |
| 170 | 170 | |
| 171 | 171 | @Autowired |
| 172 | 172 | |
| 173 | 173 | |
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | |
| 177 | 177 | |
| 178 | 178 | |
| 179 | 179 | |
| 180 | 180 | |
| 181 | 181 | |
| 182 | 182 | |
| ... | ... | @@ -5187,84 +5187,98 @@ |
| 5187 | 5187 | ExcelUtil.toExcel(out, list, cnames); |
| 5188 | 5188 | |
| 5189 | 5189 | } |
| 5190 | - /** | |
| 5191 | - * 隆化-儿童眼保套餐历史数据处理 | |
| 5192 | - * 把之前 1-3岁 套餐值12；4-6岁 套餐值48； 改为各个月龄套餐值参考EyeCheckMonthEnums类, | |
| 5193 | - * 根据眼保健操检查表中的检查时间和生日推算出当时月龄匹配相应套餐 | |
| 5194 | - * @param hospitalId 地区id 必填 | |
| 5195 | - * @param checkMonthId 套餐值 | |
| 5196 | - * @return | |
| 5197 | - */ | |
| 5198 | - @RequestMapping(value = "/syncBabyEyeCheckMonthId", method = RequestMethod.GET) | |
| 5199 | - @ResponseBody | |
| 5200 | - @TokenRequired | |
| 5201 | - public BaseObjectResponse syncBabyEyeCheckMonthId(@RequestParam(required = false) String hospitalId, | |
| 5202 | - @RequestParam(required = false) String checkMonthId) { | |
| 5203 | - return babySieveFacede.syncBabyEyeCheckMonthId(hospitalId,checkMonthId); | |
| 5204 | - } | |
| 5190 | +// /** | |
| 5191 | +// * 隆化-儿童眼保套餐历史数据处理 | |
| 5192 | +// * 把之前 1-3岁 套餐值12；4-6岁 套餐值48； 改为各个月龄套餐值参考EyeCheckMonthEnums类, | |
| 5193 | +// * 根据眼保健操检查表中的检查时间和生日推算出当时月龄匹配相应套餐 | |
| 5194 | +// * @param hospitalId 地区id 必填 | |
| 5195 | +// * @param checkMonthId 套餐值 | |
| 5196 | +// * @return | |
| 5197 | +// */ | |
| 5198 | +// @RequestMapping(value = "/syncBabyEyeCheckMonthId", method = RequestMethod.GET) | |
| 5199 | +// @ResponseBody | |
| 5200 | +// @TokenRequired | |
| 5201 | +// public BaseObjectResponse syncBabyEyeCheckMonthId(@RequestParam(required = false) String hospitalId, | |
| 5202 | +// @RequestParam(required = false) String checkMonthId) { | |
| 5203 | +// return babySieveFacede.syncBabyEyeCheckMonthId(hospitalId,checkMonthId); | |
| 5204 | +// } | |
| 5205 | +// | |
| 5206 | +// /** | |
| 5207 | +// * 隆化眼保健异常的增加global字段为2。新需求异常字段 | |
| 5208 | +// * @return | |
| 5209 | +// */ | |
| 5210 | +// @RequestMapping(value = "/syncBabyEyeGlobal", method = RequestMethod.GET) | |
| 5211 | +// @ResponseBody | |
| 5212 | +// @TokenRequired | |
| 5213 | +// public BaseObjectResponse syncBabyEyeGlobal() { | |
| 5214 | +// return babySieveFacede.syncBabyEyeGlobal(); | |
| 5215 | +// } | |
| 5216 | +// | |
| 5217 | +// | |
| 5218 | +// @RequestMapping(value = "/qhdfyZyFmService", method = RequestMethod.GET) | |
| 5219 | +// @ResponseBody | |
| 5220 | +// public String qhdfyZyFmService(String start,String end,@RequestParam(required = false)String cardNo) { | |
| 5221 | +// qhdfyZyFmService.queryZyfmPatient(start,end,cardNo); | |
| 5222 | +// return "success"; | |
| 5223 | +// } | |
| 5205 | 5224 | |
| 5206 | - /** | |
| 5207 | - * 隆化眼保健异常的增加global字段为2。新需求异常字段 | |
| 5208 | - * @return | |
| 5209 | - */ | |
| 5210 | - @RequestMapping(value = "/syncBabyEyeGlobal", method = RequestMethod.GET) | |
| 5211 | - @ResponseBody | |
| 5212 | - @TokenRequired | |
| 5213 | - public BaseObjectResponse syncBabyEyeGlobal() { | |
| 5214 | - return babySieveFacede.syncBabyEyeGlobal(); | |
| 5215 | - } | |
| 5216 | 5225 | |
| 5217 | - | |
| 5218 | - @RequestMapping(value = "/qhdfyZyFmService", method = RequestMethod.GET) | |
| 5219 | - @ResponseBody | |
| 5220 | - public String qhdfyZyFmService(String start,String end,@RequestParam(required = false)String cardNo) { | |
| 5221 | - qhdfyZyFmService.queryZyfmPatient(start,end,cardNo); | |
| 5222 | - return "success"; | |
| 5223 | - } | |
| 5224 | - | |
| 5225 | - | |
| 5226 | 5226 | @RequestMapping(value = "/syncPreEugebicsToHj", method = RequestMethod.GET) |
| 5227 | 5227 | @ResponseBody |
| 5228 | 5228 | public String syncPreEugebicsToHj() { |
| 5229 | 5229 | |
| 5230 | - Query query = Query.query(Criteria.where("hospitalId").is("2100001605").and("wifeBCheck").exists(true)); | |
| 5231 | - //query.addCriteria(Criteria.where("id").is("62e874db9932b2eeb3fe9a6c")); | |
| 5232 | - List<PreEugenicsBaseModel> modelList = mongoTemplate.find(query,PreEugenicsBaseModel.class); | |
| 5233 | - if (CollectionUtils.isNotEmpty(modelList)) | |
| 5230 | + String startDate1 = ""; | |
| 5231 | + String endDate1 = ""; | |
| 5232 | + Date date1 = DateUtil.parseYMD("2021-09-01"); | |
| 5233 | + for(int i=1 ;i < 15;i++) | |
| 5234 | 5234 | { |
| 5235 | - System.out.println("size==="+modelList.size()); | |
| 5236 | - for (PreEugenicsBaseModel model : modelList) | |
| 5235 | + startDate1 = DateUtil.getyyyy_MM_dd(date1); | |
| 5236 | + date1 = DateUtil.addMonth(date1,1); | |
| 5237 | + endDate1 = DateUtil.getyyyy_MM_dd(date1); | |
| 5238 | + Query query = Query.query(Criteria.where("hospitalId").is("2100001605").and("wifeBCheck").exists(true).and("fillDate").gte(DateUtil.parseYMD(startDate1)).lte(DateUtil.parseYMD(endDate1))); | |
| 5239 | + //query.addCriteria(Criteria.where("id").is("62e874db9932b2eeb3fe9a6c")); | |
| 5240 | + System.out.println("============="+query.toString()); | |
| 5241 | + List<PreEugenicsBaseModel> modelList = mongoTemplate.find(query,PreEugenicsBaseModel.class); | |
| 5242 | + if (CollectionUtils.isNotEmpty(modelList)) | |
| 5237 | 5243 | { |
| 5238 | - String cardNo = model.getWifeCardNo(); | |
| 5239 | - Query query1 = Query.query(Criteria.where("certificateNum").is(cardNo).and("xRay").exists(true)); | |
| 5240 | - List<PremaritalCheckup> checkupList = mongoTemplate.find(query1,PremaritalCheckup.class); | |
| 5241 | - if (CollectionUtils.isNotEmpty(checkupList)) | |
| 5244 | + System.out.println("size==="+modelList.size()); | |
| 5245 | + for (PreEugenicsBaseModel model : modelList) | |
| 5242 | 5246 | { |
| 5243 | - PremaritalCheckup checkup = checkupList.get(0); | |
| 5244 | - if (model.getWifeBCheck() != null && model.getWifeBCheck().size() > 0 && model.getWifeBCheck().get("bcjc") != null) | |
| 5247 | + String cardNo = model.getWifeCardNo(); | |
| 5248 | + if (StringUtils.isEmpty(cardNo)) | |
| 5245 | 5249 | { |
| 5246 | - Object obj = model.getWifeBCheck().get("bcjc"); | |
| 5247 | - List<Object> list = (ArrayList)obj; | |
| 5248 | - if (CollectionUtils.isNotEmpty(list)) | |
| 5250 | + continue; | |
| 5251 | + } | |
| 5252 | + Query query1 = Query.query(Criteria.where("certificateNum").is(cardNo).and("xRay").exists(true)); | |
| 5253 | + List<PremaritalCheckup> checkupList = mongoTemplate.find(query1,PremaritalCheckup.class); | |
| 5254 | + if (CollectionUtils.isNotEmpty(checkupList)) | |
| 5255 | + { | |
| 5256 | + PremaritalCheckup checkup = checkupList.get(0); | |
| 5257 | + if (model.getWifeBCheck() != null && model.getWifeBCheck().size() > 0 && model.getWifeBCheck().get("bcjc") != null) | |
| 5249 | 5258 | { |
| 5250 | - Integer status = (Integer)list.get(0); | |
| 5251 | - String content = (String)list.get(1); | |
| 5252 | - checkup.setLhbc(String.valueOf(status+1)); | |
| 5253 | - checkup.setLhbcms(content); | |
| 5254 | - if (list.size() == 3) | |
| 5259 | + Object obj = model.getWifeBCheck().get("bcjc"); | |
| 5260 | + List<Object> list = (ArrayList)obj; | |
| 5261 | + if (CollectionUtils.isNotEmpty(list)) | |
| 5255 | 5262 | { |
| 5256 | - String code = (String)list.get(2); | |
| 5257 | - checkup.setLhbcjch(code); | |
| 5263 | + Integer status = (Integer)list.get(0); | |
| 5264 | + String content = (String)list.get(1); | |
| 5265 | + checkup.setLhbc(String.valueOf(status+1)); | |
| 5266 | + checkup.setLhbcms(content); | |
| 5267 | + if (list.size() == 3) | |
| 5268 | + { | |
| 5269 | + String code = (String)list.get(2); | |
| 5270 | + checkup.setLhbcjch(code); | |
| 5271 | + } | |
| 5272 | + System.out.println("id==="+checkup.getId()); | |
| 5273 | + Update update = MongoConvertHelper | |
| 5274 | + .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkup)); | |
| 5275 | + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkup.getId())), update, PremaritalCheckup.class); | |
| 5258 | 5276 | } |
| 5259 | - Update update = MongoConvertHelper | |
| 5260 | - .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkup)); | |
| 5261 | - mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkup.getId())), update, PremaritalCheckup.class); | |
| 5262 | 5277 | } |
| 5263 | 5278 | } |
| 5264 | 5279 | } |
| 5265 | 5280 | } |
| 5266 | 5281 | } |
| 5267 | - | |
| 5268 | 5282 | return "success"; |
| 5269 | 5283 | } |
| 5270 | 5284 | } |