From a1a69fde7b663133f92c5c64ee771796134241b8 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 4 Nov 2022 10:00:55 +0800 Subject: [PATCH] update --- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 47 ++++++++-------- .../operate/web/controller/SmnController.java | 14 +++++ .../operate/web/controller/TestController.java | 62 +++++++++++++++++++++- .../operate/web/facade/PatientSyncMysqlFacade.java | 42 +++++++++++++++ .../platform/operate/web/facade/SmnFacade.java | 16 ++++++ 5 files changed, 157 insertions(+), 24 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index acee499..d0d6e1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -904,24 +904,24 @@ public class LhxfyService { } } break; - case "PH02": - if (StringUtils.isNotEmpty(result)) - { - try { - Double ph = Double.parseDouble(result); - premaritalCheckup.setPh( ph < 4 ? "1" : "2"); - }catch (Exception e){} - } - break; - case "PH02_G": - if (StringUtils.isNotEmpty(result) && !StringUtils.isNotEmpty(premaritalCheckup.getPh())) - { - try { - Double ph = Double.parseDouble(result); - premaritalCheckup.setPh( ph < 4 ? "1" : "2"); - }catch (Exception e){} - } - break; +// case "PH02": +// if (StringUtils.isNotEmpty(result)) +// { +// try { +// Double ph = Double.parseDouble(result); +// premaritalCheckup.setPh( ph < 4 ? "1" : "2"); +// }catch (Exception e){} +// } +// break; +// case "PH02_G": +// if (StringUtils.isNotEmpty(result) && !StringUtils.isNotEmpty(premaritalCheckup.getPh())) +// { +// try { +// Double ph = Double.parseDouble(result); +// premaritalCheckup.setPh( ph < 4 ? "1" : "2"); +// }catch (Exception e){} +// } +// break; case "NZJ": if(StringUtils.isEmpty(premaritalCheckup.getNzj())) { if(result.contains("阳性")) { @@ -973,16 +973,19 @@ public class LhxfyService { premaritalCheckup.setLhHiv("2"); } - /***乙肝表面抗原***/ - if (StringUtils.isEmpty(premaritalCheckup.getHbsag())) { - premaritalCheckup.setHbsag("2"); - } +// /***乙肝表面抗原***/ +// if (StringUtils.isEmpty(premaritalCheckup.getHbsag())) { +// premaritalCheckup.setHbsag("2"); +// } //尿常规 if (StringUtils.isEmpty(premaritalCheckup.getGlu())) { premaritalCheckup.setGlu("阴性"); } + //PH + premaritalCheckup.setPh("1"); + //检查结果更新到个人档案 Query query2 = Query.query(Criteria.where("id").is(premaritalCheckup.getId())); Update update2 = MongoConvertHelper diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java index 35f4bb1..afce220 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java @@ -205,4 +205,18 @@ public class SmnController extends BaseController { } + /** + * 撤销申请 + * @param id + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/cacnelApply/{id}") + @ResponseBody + @TokenRequired + public BaseResponse cacnelApply(@PathVariable String id, HttpServletRequest request) { + return smnFacade.cacnelApply(id, getUserId(request)); + } + + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index ab7d1e4..a3084f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -23,6 +23,7 @@ import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.request.AntExListQueryRequest; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.MaternalDeliverResult; +import com.lyms.platform.operate.web.result.SmnResult; import com.lyms.platform.operate.web.service.*; import com.lyms.platform.operate.web.service.impl.CervicalCancerServiceImpl; import com.lyms.platform.operate.web.worker.AntexOtherHighRiskWorker; @@ -5270,6 +5271,8 @@ public class TestController extends BaseController { } return "success"; } + + @RequestMapping(value = "/handleFmData", method = RequestMethod.GET) @ResponseBody public String handleFmData(String start,String end) @@ -5279,8 +5282,8 @@ public class TestController extends BaseController { matDeliverQuery.setYn(YnEnums.YES.getId()); Date startDate1 = DateUtil.parseYMD(start); Date endDate1 = DateUtil.getDayLastSecond(DateUtil.parseYMD(end)); - matDeliverQuery.setCreatedTimeStart(startDate1); - matDeliverQuery.setCreatedTimeEnd(endDate1); + matDeliverQuery.setCreatedStart(startDate1); + matDeliverQuery.setEndStart(endDate1); List maternalDeliverModels = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(maternalDeliverModels)) { @@ -5297,4 +5300,59 @@ public class TestController extends BaseController { return sb.toString(); } + + @RequestMapping(value = "/exportHandleFmData", method = RequestMethod.GET) + @ResponseBody + public void exportHandleFmData(HttpServletResponse response,String start,String end) + { + StringBuffer sb = new StringBuffer(); + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setYn(YnEnums.YES.getId()); + Date startDate1 = DateUtil.parseYMD(start); + Date endDate1 = DateUtil.getDayLastSecond(DateUtil.parseYMD(end)); + matDeliverQuery.setCreatedStart(startDate1); + matDeliverQuery.setEndStart(endDate1); + List> datas = new ArrayList<>(); + List maternalDeliverModels = matDeliverService.query(matDeliverQuery); + if (CollectionUtils.isNotEmpty(maternalDeliverModels)) + { + for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModels) + { + Map data = new HashMap<>(); + Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId()); + if (patients == null) + { + continue; + } + if(StringUtils.isNotEmpty(patients.getSource())) + { + patients = patientsService.findOnePatientById(patients.getSource()); + } + data.put("name",patients.getUsername()); + data.put("cardNo",patients.getCardNo()); + data.put("fmDate",maternalDeliverModel.getDueDate()); + data.put("buildDate",DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); + data.put("buildHospital",organizationService.getOrganization(Integer.parseInt(patients.getHospitalId())).getName()); + datas.add(data); + } + } + + OutputStream out = null; + try { + out = response.getOutputStream(); + Map cnames = new LinkedHashMap <>(); + cnames.put("name", "姓名"); + cnames.put("cardNo", "身份证号"); + cnames.put("fmDate", "分娩时间"); + cnames.put("buildDate", "建档时间"); + cnames.put("buildHospital", "建档机构"); + response.setContentType("application/octet-stream"); + response.setCharacterEncoding("UTF-8"); + response.setHeader("Content-Disposition", "attachment;fileName=" + "分娩.xls"); + ExcelUtil.toExcel(out, datas, cnames); + } catch (IOException e) { + e.printStackTrace(); + } + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 3ab11f7..1464ac2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -3436,6 +3436,48 @@ public class PatientSyncMysqlFacade { hospitalDate.put("data21",data19); //孕产妇系统管理率% hospitalDate.put("data22",data19_data2+"%"); + + Date currentDate = new Date(); + Date start = DateUtil.addMonth(currentDate, 0); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -37), 1); + //年度内儿童接收儿童中医指导的人数 + int data23=0; + AggregationOperation match23 = Aggregation.match(Criteria.where("hospitalId").is(hospitalId) + .and("articleTypes").in(Arrays.asList(1,2,3,4,5)).and("yn") + .is(YnEnums.YES.getId()).and("birth").gte(end).lte(start)); + AggregationOperation group23 = Aggregation.group("buildId"); + Aggregation aggregation23= Aggregation.newAggregation(match23, group23); + AggregationResults result23 = mongoTemplate.aggregate(aggregation23,"lyms_babycheck", HashMap.class); + data23=result23.getMappedResults().size(); + int lastDate23= null==hospitalDate.get("data23")?0:Integer.parseInt(hospitalDate.get("data23").toString()); + hospitalDate.put("data23",data23+lastDate23); + + + //年度内儿童接收儿童中医指导的人数 + int data24=0; + AggregationOperation match24 = Aggregation.match(Criteria.where("hospitalId").is(hospitalId) + .and("yn") + .is(YnEnums.YES.getId()).and("birth").gte(end).lte(start)); + AggregationOperation group24 = Aggregation.group("buildId"); + Aggregation aggregation24= Aggregation.newAggregation(match24, group24); + AggregationResults result24 = mongoTemplate.aggregate(aggregation24,"lyms_babycheck", HashMap.class); + data24=result24.getMappedResults().size(); + int lastDate24= null==hospitalDate.get("data24")?0:Integer.parseInt(hospitalDate.get("data24").toString()); + hospitalDate.put("data24",data24+lastDate24); + + + //儿童中医指导率% + String data23_data24="0.00"; + if(Integer.parseInt(hospitalDate.get("data24").toString())!=0){ + float v = (float) Integer.parseInt(hospitalDate.get("data23").toString()) / Integer.parseInt(hospitalDate.get("data24").toString()); + if(v>=1){ + data23_data24="100.00"; + }else { + data23_data24 = df.format(v * 100); + } + } + hospitalDate.put("data25",data23_data24+"%"); + } public void getPublicHygieneServiceCountExport(String provinceId, String cityId, String areaId, String streetId, Date dateTime, HttpServletResponse response) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java index 0ac4db6..fbd0e65 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java @@ -677,4 +677,20 @@ public class SmnFacade { } } + + public BaseResponse cacnelApply(String id, Integer userId) { + Query query = Query.query(Criteria.where("id").is(id)); + SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class); + mongoTemplate.remove(query, SmnModel.class); + smnModel.setStatus(1); + smnModel.setSendDate(null); + smnModel.setSendDoctor(null); + smnModel.setSendHospitalId(null); + smnModel.setMarriage(null); + smnModel.setYbNum(null); + smnModel.setYbType(null); + smnModel.setDiagnose(null); + mongoTemplate.save(smnModel); + return new BaseResponse(); + } } -- 1.8.3.1