jiangjiazhi / regional-platform

Commit 8471a438b816f19e2af3592e2f279e7d4f2b0693

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

中医指导列表

Showing 6 changed files with 91 additions and 26 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

...	...	@@ -709,6 +709,10 @@
709	709	}
710	710	//隆化-妇女健康管理-男女婚检lis检查结果获取
711	711	autoHjInLis();
	712	+
	713	+
	714	+ //同步孕期优生得b超检查到婚检得b超检查
	715	+ syncYcysToHj();
712	716	}
713	717	//隆化-妇女健康管理-男女婚检lis检查结果获取
714	718	public void autoHjInLis()
...	...	@@ -1689,6 +1693,58 @@
1689	1693	}
1690	1694	}
1691	1695	return new BaseObjectResponse();
	1696	+ }
	1697	+
	1698	+ /**
	1699	+ * 同步孕期优生得b超检查到婚检得b超检查
	1700	+ */
	1701	+ private void syncYcysToHj()
	1702	+ {
	1703	+ Date startDate1 = DateUtil.addDay(new Date(),-5);
	1704	+ Date endDate1 = new Date();
	1705	+ Query query = Query.query(Criteria.where("hospitalId").is("2100001605")
	1706	+ .and("wifeBCheck").exists(true).and("fillDate").gte(startDate1).lte(endDate1));
	1707	+ System.out.println("============="+query.toString());
	1708	+ List<PreEugenicsBaseModel> modelList = mongoTemplate.find(query,PreEugenicsBaseModel.class);
	1709	+ if (CollectionUtils.isNotEmpty(modelList))
	1710	+ {
	1711	+ System.out.println("size==="+modelList.size());
	1712	+ for (PreEugenicsBaseModel model : modelList)
	1713	+ {
	1714	+ String cardNo = model.getWifeCardNo();
	1715	+ if (org.apache.commons.lang.StringUtils.isEmpty(cardNo))
	1716	+ {
	1717	+ continue;
	1718	+ }
	1719	+ Query query1 = Query.query(Criteria.where("certificateNum").is(cardNo).and("xRay").exists(true));
	1720	+ List<PremaritalCheckup> checkupList = mongoTemplate.find(query1,PremaritalCheckup.class);
	1721	+ if (CollectionUtils.isNotEmpty(checkupList))
	1722	+ {
	1723	+ PremaritalCheckup checkup = checkupList.get(0);
	1724	+ if (model.getWifeBCheck() != null && model.getWifeBCheck().size() > 0 && model.getWifeBCheck().get("bcjc") != null)
	1725	+ {
	1726	+ Object obj = model.getWifeBCheck().get("bcjc");
	1727	+ List<Object> list = (ArrayList)obj;
	1728	+ if (CollectionUtils.isNotEmpty(list))
	1729	+ {
	1730	+ Integer status = (Integer)list.get(0);
	1731	+ String content = (String)list.get(1);
	1732	+ checkup.setLhbc(String.valueOf(status+1));
	1733	+ checkup.setLhbcms(content);
	1734	+ if (list.size() == 3)
	1735	+ {
	1736	+ String code = (String)list.get(2);
	1737	+ checkup.setLhbcjch(code);
	1738	+ }
	1739	+ System.out.println("id==="+checkup.getId());
	1740	+ Update update = MongoConvertHelper
	1741	+ .convertToNativeUpdate(ReflectionUtils.getUpdateField(checkup));
	1742	+ mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(checkup.getId())), update, PremaritalCheckup.class);
	1743	+ }
	1744	+ }
	1745	+ }
	1746	+ }
	1747	+ }
1692	1748	}
1693	1749	}

1	1	package com.lyms.platform.operate.web.controller;
2	2
3	3
	4	+import com.fasterxml.jackson.annotation.JsonAlias;
4	5	import com.lyms.platform.common.annotation.TokenRequired;
5	6	import com.lyms.platform.common.base.BaseController;
6	7	import com.lyms.platform.common.base.LoginContext;
7	8
...	...	@@ -194,10 +195,11 @@
194	195	@RequestParam(value = "highRisk", required = false) Integer highRisk,
195	196	@RequestParam(value = "waskSon", required = false) Integer waskSon,
196	197	@RequestParam(value = "checkDoctorId", required = false) String checkDoctorId,
	198	+ @RequestParam(value = "articleTypes", required = false) Integer articleTypes,//中医指导类型,
197	199	@RequestParam(value = "level", required = false) String level,
198	200	Integer page, Integer limit, HttpServletRequest request) {
199	201	return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge,
200		- nextDate, highRisk, waskSon, checkDoctorId, page, limit, getUserId(request), level);
	202	+ nextDate, highRisk, waskSon, checkDoctorId,articleTypes, page, limit, getUserId(request), level);
201	203	}
202	204
203	205	/**
...	...	@@ -732,6 +734,12 @@
732	734	}
733	735
734	736
	737	+ /**
	738	+ * 儿童中医指导统计人数
	739	+ * @param checkDate
	740	+ * @param request
	741	+ * @return
	742	+ */
735	743	@RequestMapping(value = "/getbabyZyzdCount", method = RequestMethod.GET)
736	744	@ResponseBody
737	745	@TokenRequired

...	...	@@ -5223,20 +5223,16 @@
5223	5223	// }
5224	5224
5225	5225
	5226	+ /**
	5227	+ * 同步孕期优生得b超检查到婚检得b超检查
	5228	+ * @return
	5229	+ */
5226	5230	@RequestMapping(value = "/syncPreEugebicsToHj", method = RequestMethod.GET)
5227	5231	@ResponseBody
5228		- public String syncPreEugebicsToHj() {
	5232	+ public String syncPreEugebicsToHj(String startDate,String endDate) {
5229	5233
5230		- String startDate1 = "";
5231		- String endDate1 = "";
5232		- Date date1 = DateUtil.parseYMD("2021-09-01");
5233		- for(int i=1 ;i < 15;i++)
5234		- {
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"));
	5234	+ Query query = Query.query(Criteria.where("hospitalId").is("2100001605").and("wifeBCheck").exists(true).
	5235	+ and("fillDate").gte(DateUtil.parseYMD(startDate)).lte(DateUtil.parseYMD(endDate)));
5240	5236	System.out.println("============="+query.toString());
5241	5237	List<PreEugenicsBaseModel> modelList = mongoTemplate.find(query,PreEugenicsBaseModel.class);
5242	5238	if (CollectionUtils.isNotEmpty(modelList))
...	...	@@ -5278,7 +5274,6 @@
5278	5274	}
5279	5275	}
5280	5276	}
5281		- }
5282	5277	return "success";
5283	5278	}
5284	5279	@RequestMapping(value = "/handleFmData", method = RequestMethod.GET)

...	...	@@ -1457,7 +1457,7 @@
1457	1457	}
1458	1458
1459	1459	public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate,
1460		- Integer highRisk, Integer waskSon, String checkDoctorId,Integer page, Integer limit, Integer userId,String level) {
	1460	+ Integer highRisk, Integer waskSon, String checkDoctorId,Integer articleTypes,Integer page, Integer limit, Integer userId,String level) {
1461	1461	boolean flag = false;
1462	1462	// List<String> hospital = groupsFacade.findGroupHospital(userId, false);
1463	1463	String hospitalId = autoMatchFacade.getHospitalId(userId);
...	...	@@ -1511,6 +1511,19 @@
1511	1511	if (null != checkMonthAge && null != endCheckMonthAge) {
1512	1512	criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge);
1513	1513	}
	1514	+ if (articleTypes != null)
	1515	+ {
	1516	+ if (articleTypes == 0)
	1517	+ {
	1518	+ criteria.and("articleTypes").exists(true);
	1519	+ }
	1520	+ else
	1521	+ {
	1522	+ criteria.and("articleTypes").in(Arrays.asList(articleTypes));
	1523	+ }
	1524	+ }
	1525	+
	1526	+
1514	1527	Query query = new Query(criteria);
1515	1528	System.out.println(query.toString());
1516	1529	PageResult pageResult = findMongoPage(BabyCheckModel.class, query.with(new Sort(Sort.Direction.DESC, "created")), page, limit);
...	...	@@ -1590,6 +1603,7 @@
1590	1603	map.put("weight", babyCheckModel.getWeight());
1591	1604	//秦皇岛需求，查询最后一次检查的高危详情
1592	1605	map.put("qhdHighRiskInfo",babyCheckModel.getQhdHighRiskInfo());
	1606	+ map.put("articleTypes", babyCheckModel.getArticleTypes());
1593	1607
1594	1608	List<BabyCheckModel> ckLst=mongoTemplate.find(Query.query(Criteria.where("buildId").is(babyCheckModel.getBuildId()).and("yn").is(YnEnums.YES.getId())).with(new Sort(Sort.Direction.ASC, "created")), BabyCheckModel.class);
1595	1609	for (int i = 0; i < ckLst.size(); i++) {
...	...	@@ -5603,16 +5617,7 @@
5603	5617	String[] checkDates = checkDate.split(" - ");
5604	5618	Date start = DateUtil.parseYMD(checkDates[0]);
5605	5619	Date end = DateUtil.parseYMD(checkDates[1]);
5606		-
5607		-// Aggregation aggregation4 =
5608		-// Aggregation.newAggregation(
5609		-// Aggregation.match(Criteria.where("hospitalId").is(hospitalId).and("tcmGuide").exists(true).and("yn")
5610		-// .is(YnEnums.YES.getId()).and("checkDate").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))),
5611		-// Aggregation.group("buildId").count().as("总人数"));
5612		-// AggregationResults <BasicDBObject> results =
5613		-// mongoTemplate.aggregate(aggregation4, "lyms_babycheck", BasicDBObject.class);
5614		-// int count = results.getMappedResults().size();
5615		- int count = (int)mongoTemplate.count(new Query().addCriteria(Criteria.where("hospitalId").is(hospitalId).and("tcmGuide").exists(true).and("yn")
	5620	+ int count = (int)mongoTemplate.count(new Query().addCriteria(Criteria.where("hospitalId").is(hospitalId).and("articleTypes").exists(true).and("yn")
5616	5621	.is(YnEnums.YES.getId()).and("checkDate").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))),BabyCheckModel.class);
5617	5622	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(count).setErrormsg("成功");
5618	5623	}

...	...	@@ -259,6 +259,7 @@
259	259
260	260	if (yunRequest.getPregnantCertificateNum() != null) {
261	261	patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum());
	262	+ patientsQuery.setHospitalId(null);
262	263	//判断该身份证号码是否有孕妇建档在该医院
263	264	List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
264	265	if (yunRequest.getLastMenstrualPeriod() != null && !yunRequest.getLastMenstrualPeriod().equals("")) {//todowtt

...	...	@@ -1625,11 +1625,11 @@
1625	1625	String cjzxjs=null!=model.getWifeClinicalCheck().get("cjzxjs")?model.getWifeClinicalCheck().get("cjzxjs").toString():null;
1626	1626	if(StringUtils.isNotEmpty(cjzxjs)){
1627	1627	double js=Double.parseDouble(cjzxjs);
1628		- if(js>50){//偏高
	1628	+ if(js>5.1){//偏高
1629	1629	abnormityList.add("促甲状腺激素(TSH):女方: "+js+" u IU/ml");
1630	1630	abnormityProposal.add("常见于原发性甲减，亚临床甲减，地方性甲状腺肿，亚急性甲状腺炎或慢性淋巴细胞性甲状腺炎。" +
1631	1631	"建议明确诊断，由产科医生和内分泌科医生评估是否适合妊娠。");
1632		- }else if(js<30){//偏低
	1632	+ }else if(js<0.35){//偏低
1633	1633	abnormityList.add("促甲状腺激素(TSH):女方: "+js+" u IU/ml");
1634	1634	abnormityProposal.add("常见于甲亢，亚临床甲亢。建议明确诊断，由产科医生和内分泌科医生评估是否适合妊娠。");
1635	1635	}