jiangjiazhi / regional-platform

Commit 61fdf3ca5a6f0f379393592ae85ccd1a9c37c202

Authored by Administrator over 6 years ago

Exists in master and in 6 other branches

修改

Showing 4 changed files with 129 additions and 2 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyDiagnoseMapper.xml
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/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java

...	...	@@ -119,7 +119,7 @@
119	119	and blh = #{hospitalizationNo}
120	120	</if>
121	121	<if test="babyName != null and babyName!=''">
122		- and hzxm =#{babyName}
	122	+ and hzxm =#{babyName} or lxrdh=#{babyName}
123	123	</if>
124	124	<if test="finalDiagnosis != null and finalDiagnosis!= '' ">
125	125	and cyzddm like CONCAT(#{finalDiagnosis},'%')

...	...	@@ -166,6 +166,31 @@
166	166	return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, getUserId(request));
167	167	}
168	168
	169	+ /**
	170	+ * 区域儿保检查
	171	+ *
	172	+ * @param
	173	+ */
	174	+
	175	+ @RequestMapping(value = "/queryRegionBabyCheckAll", method = RequestMethod.GET)
	176	+ @ResponseBody
	177	+ @TokenRequired
	178	+ public BaseResponse lists(
	179	+ @RequestParam(value = "checkTime", required = false) String checkTime,
	180	+ @RequestParam(value = "queryNo", required = false) String queryNo,
	181	+ @RequestParam(value = "startCheckMonthAge", required = false) Integer startCheckMonthAge,
	182	+ @RequestParam(value = "endCheckMonthAge", required = false) Integer endCheckMonthAge,
	183	+ @RequestParam(value = "nextDate", required = false) String nextDate,
	184	+ @RequestParam(value = "highRisk", required = false) String highRisk,
	185	+ @RequestParam(value = "waskSon", required = false) String waskSon,
	186	+ @RequestParam(value = "hospitalId", required = false) String hospitalId,
	187	+ @RequestParam(required = false) String proviceId,
	188	+ @RequestParam(required = false) String cityId,
	189	+ @RequestParam(required = false) String areaId,
	190	+ Integer page, Integer limit, HttpServletRequest request) {
	191	+ return babyCheckFacade.babyRegionCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, hospitalId, getUserId(request),proviceId,cityId,areaId);
	192	+ }
	193	+
169	194
170	195	/**
171	196	* 查询身长别体重值

...	...	@@ -4058,7 +4058,6 @@
4058	4058	babyDiagnoseQuery.setStartBirthDate(babyDiagnoseQuery.getStartBirthDate() + " 00:00:00");
4059	4059	babyDiagnoseQuery.setEndBirthDate(babyDiagnoseQuery.getEndBirthDate() + " 23:59:59");
4060	4060	}
4061		-
4062	4061	List<BabyDiagnoseModel> babyDiagnoseModels = babyDiagnoseService.queryBabyDiagnosesList(babyDiagnoseQuery);
4063	4062	if (babyDiagnoseModels.size() > 0) {
4064	4063	for (BabyDiagnoseModel info : babyDiagnoseModels) {
...	...	@@ -4073,6 +4072,9 @@
4073	4072	map.put("sex", info.getSex());
4074	4073	map.put("hospitalizationNo", info.getBlh());
4075	4074	map.put("dischargeDiagnosis", info.getCyzdmc());
	4075	+ map.put("contactsPhone", info.getLxrdh());
	4076	+ map.put("contactPhone", info.getLxdh());
	4077	+ map.put("contacts", info.getLxr());
4076	4078	result.add(map);
4077	4079	}
4078	4080	}

...	...	@@ -844,6 +844,106 @@
844	844
845	845	}
846	846
	847	+ /**
	848	+ * 区域查询
	849	+ */
	850	+ public BaseResponse babyRegionCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge,
	851	+ String nextDate, String highRisk, String waskSon, Integer page, Integer limit, String hospitalId, Integer userId, String proviceId, String cityId, String areaId) {
	852	+ boolean flag = false;
	853	+ List<String> hospitalIds = new ArrayList<>();
	854	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospitalId)) {
	855	+ hospitalIds.add(hospitalId);
	856	+ } else {
	857	+ //获取用户拥有的权限医院和条件筛选的医院交集
	858	+ hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, proviceId,
	859	+ cityId, areaId);
	860	+ }
	861	+ Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds);
	862	+ Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds);
	863	+ if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) {
	864	+ pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo),
	865	+ Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo));
	866	+ flag = true;
	867	+ }
	868	+ if (flag) {
	869	+ List<BabyModel> babykModelsList = mongoTemplate.find(Query.query(pCriteria), BabyModel.class);
	870	+ List<String> ids = new ArrayList<>();
	871	+ if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(babykModelsList)) {
	872	+ for (BabyModel babyModel : babykModelsList) {
	873	+ ids.add(babyModel.getId());
	874	+ }
	875	+ }
	876	+ criteria.and("buildId").in(ids);
	877	+ }
	878	+ if (null != checkTime) {
	879	+ try {
	880	+ Date start = (DateUtil.getSNDate(checkTime)[0]);
	881	+ Date end = (DateUtil.getSNDate(checkTime)[1]);
	882	+ criteria.and("checkDate").gte(start).lte(end);
	883	+ } catch (Exception e) {
	884	+ }
	885	+ }
	886	+ if (null != checkTime) {
	887	+ try {
	888	+ Date start = (DateUtil.getSNDate(nextDate)[0]);
	889	+ Date end = (DateUtil.getSNDate(nextDate)[1]);
	890	+ criteria.and("nextDate").gte(start).lte(end);
	891	+ } catch (Exception e) {
	892	+ }
	893	+ }
	894	+ if (StringUtils.isNotEmpty(highRisk)) {
	895	+ criteria.and("highRisk").is(highRisk);
	896	+ }
	897	+ if (StringUtils.isNotEmpty(waskSon)) {
	898	+ criteria.and("waskSon").and(waskSon);
	899	+ }
	900	+ PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
	901	+ List<BabyCheckModel> babyCheckModelList = (List<BabyCheckModel>) pageResult.getGrid();
	902	+ List<Map<String, Object>> list = new ArrayList();
	903	+ for (BabyCheckModel babyCheckModel : babyCheckModelList) {
	904	+ Map<String, Object> map = new HashMap<>();
	905	+ if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) {
	906	+ BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class);
	907	+ map.put("id", babyModel.getId());
	908	+ map.put("babyName", babyModel.getName());
	909	+ map.put("sex", babyModel.getSex() != 0 ? "男" : "女");
	910	+ map.put("mName", babyModel.getMname());
	911	+ map.put("mCardNo", babyModel.getCardNo());
	912	+ map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate()));
	913	+ map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate()));
	914	+ }
	915	+ map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate()));
	916	+ map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate()));
	917	+ if (null != babyCheckModel.getHighRisk()) {
	918	+ map.put("highRisk", babyCheckModel.getHighRisk() == 1 ? "高危儿" : "-");
	919	+ } else {
	920	+ map.put("highRisk", "-");
	921	+ }
	922	+ if (null != babyCheckModel.getWaskSon()) {
	923	+ map.put("waskSon", babyCheckModel.getWaskSon() == 1 ? "低弱儿" : "-");
	924	+ } else {
	925	+ map.put("waskSon", "-");
	926	+ }
	927	+ map.put("height", babyCheckModel.getHeight());
	928	+ map.put("weight", babyCheckModel.getWeight());
	929	+ list.add(map);
	930	+ }
	931	+ if (null != checkMonthAge && null != endCheckMonthAge) {
	932	+ List<Map<String, Object>> list1 = new ArrayList<>();
	933	+ for (Map<String, Object> mapList : list) {
	934	+ if ((int) mapList.get("monthAge") >= checkMonthAge && (int) mapList.get("monthAge") <= endCheckMonthAge) {
	935	+ list1.add(mapList);
	936	+ }
	937	+ }
	938	+ pageResult.setGrid(list1);
	939	+ return RespBuilder.buildSuccess(pageResult);
	940	+ } else {
	941	+ pageResult.setGrid(list);
	942	+ return RespBuilder.buildSuccess(pageResult);
	943	+ }
	944	+
	945	+ }
	946	+
847	947	public void getBabyCheckList(String[] ids, PersonModel personModel, List<Map<String, String>> list) {
848	948	List<BabyCheckModel> checkModels;
849	949	if (personModel != null) {