liquanyu / regional-platform

Download as
Browse Code »

Commit 1bf0861f23ac1f08747610787f22909344a1e055

Authored by yangfei
1 parent 815b52634c
Exists in master and in 1 other branch dev

孕妇分娩记录根据出血量查询

Showing 3 changed files with 24 additions and 23 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java View file @ 1bf0861
... ... @@ -149,7 +149,7 @@
149 149 * @discription 获取map，处理总产程类似使用-"{\"h\":5,\"m\":0}"，不按规则使用则返回null
150 150 */
151 151 public static Map<String, String> getMap(String str) {
152   - if (StringUtils.isEmpty(str)) {
  152 + if (StringUtils.isEmpty(str)||"null".equals(str)) {
153 153 return null;
154 154 }
155 155 try {
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java View file @ 1bf0861
... ... @@ -244,7 +244,7 @@
244 244 condition = condition.and("rHloseBloodL", 500, MongoOper.LT);
245 245 break;
246 246 case 3:
247   - condition = condition.and("tHloseBloodL", 500, MongoOper.GTE);
  247 + condition = condition.and("rHloseBloodL", 500, MongoOper.GTE);
248 248 break;
249 249 case 4:
250 250 condition = condition.and("rHloseBloodL", 1000, MongoOper.LT);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 1bf0861
... ... @@ -26,6 +26,7 @@
26 26 import com.lyms.platform.query.*;
27 27 import org.apache.commons.collections.CollectionUtils;
28 28 import org.apache.commons.collections.MapUtils;
  29 +import org.apache.commons.collections.map.HashedMap;
29 30 import org.apache.commons.lang.StringUtils;
30 31 import org.apache.commons.lang.math.NumberUtils;
31 32 import org.slf4j.Logger;
... ... @@ -984,8 +985,8 @@
984 985 }
985 986  
986 987 if (CollectionUtils.isNotEmpty(antExChuModels)) {
987   - matDeliverListResult.setDueCount(antExChuModels.get(0).getProdTime() == null ? 1 : antExChuModels.get(0).getProdTime()+1);
988   - }else{
  988 + matDeliverListResult.setDueCount(antExChuModels.get(0).getProdTime() == null ? 1 : antExChuModels.get(0).getProdTime() + 1);
  989 + } else {
989 990 matDeliverListResult.setDueCount(1);
990 991 }
991 992  
... ... @@ -1621,7 +1622,7 @@
1621 1622 }
1622 1623 }
1623 1624 }
1624   - if (!childbirthManagerRequest.isExcel()||childbirthManagerRequest.getHloseBloodType()!=null) {//导出excel和根据出血量查询
  1625 + if (!childbirthManagerRequest.isExcel() && childbirthManagerRequest.getHloseBloodType() == null && StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode())) {//导出excel和根据出血量查询
1625 1626 patientsQuery.setLimit(childbirthManagerRequest.getLimit());
1626 1627 patientsQuery.setPage(childbirthManagerRequest.getPage());
1627 1628 patientsQuery.setNeed("need");
... ... @@ -1640,8 +1641,8 @@
1640 1641 patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone());
1641 1642 patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo());
1642 1643 patientsQuery.setFmHospitalQueryList(hospitalList);
1643   - String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
1644   - patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
  1644 + // String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
  1645 + // patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
1645 1646 patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge()));
1646 1647 patientsQuery.setFmAgeEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndAge()) ? null : Integer.valueOf(childbirthManagerRequest.getEndAge()));
1647 1648 patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7);
... ... @@ -1649,7 +1650,7 @@
1649 1650 // 分娩方式去另外一张表查
1650 1651 patientsQuery.setDesc("fmDate");
1651 1652 patientsQuery.setSort("fmDate");
1652   - // System.out.println("分娩查询："+patientsQuery.convertToQuery().convertToMongoQuery());
  1653 + // System.out.println("分娩查询：" + patientsQuery.convertToQuery().convertToMongoQuery());
1653 1654 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
1654 1655 // 这里就设置分页内容
1655 1656 childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo());
1656 1657  
1657 1658  
1658 1659  
1659 1660  
1660 1661  
1661 1662  
1662 1663  
... ... @@ -1668,31 +1669,33 @@
1668 1669 matDeliverQuery.setParentIdList(parentIdList);
1669 1670 matDeliverQuery.setYn(YnEnums.YES.getId());
1670 1671 matDeliverQuery.setHloseBloodType(childbirthManagerRequest.getHloseBloodType());
  1672 + String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
  1673 + matDeliverQuery.setDeliveryModeQueryJson(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
  1674 +
1671 1675 List<MaternalDeliverModel> maternalDeliverModelList;
1672   - if (childbirthManagerRequest.getHloseBloodType()!=null) {//根据出血量查询继续分页
  1676 + if (!childbirthManagerRequest.isExcel() && (childbirthManagerRequest.getHloseBloodType() != null || StringUtils.isNotEmpty(childbirthManagerRequest.getDeliveryMode()))) {//根据出血量查询继续分页
1673 1677 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
1674 1678 matDeliverQuery.setPage(childbirthManagerRequest.getPage());
1675 1679 matDeliverQuery.setNeed("need");
  1680 + // System.out.println("分娩查询条件：" + matDeliverQuery.convertToQuery().convertToMongoQuery());
1676 1681 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
1677   - }else{//否则按常规查询
  1682 + // 这里就设置分页内容
  1683 + childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
  1684 + } else {//否则按常规查询
1678 1685 maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1679 1686 }
1680 1687 // System.out.println("分娩表查询："+matDeliverQuery.convertToQuery().convertToMongoQuery());
1681 1688  
1682 1689  
1683   -
1684 1690 List<ChildbirthManagerQueryModel> childbirthManagerQueryModelList = new ArrayList<>();
  1691 + Map<String, Patients> patientsMap = new HashedMap();
  1692 +
1685 1693 for (Patients patients : patientsList) {
1686   - MaternalDeliverModel maternalDeliverModel = null;
1687   - for (MaternalDeliverModel each : maternalDeliverModelList) {
1688   - if (each.getParentId().equals(patients.getId())) {
1689   - maternalDeliverModel = each;
1690   - }
1691   - if (maternalDeliverModel == null) {
1692   - maternalDeliverModel = new MaternalDeliverModel();
1693   - }
1694   - }
  1694 + patientsMap.put(patients.getId(), patients);
  1695 + }
1695 1696  
  1697 + for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) {
  1698 + Patients patients = patientsMap.get(maternalDeliverModel.getParentId());
1696 1699 // 开始封装数据
1697 1700 ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel();
1698 1701 if (maternalDeliverModel != null) {
1699 1702  
1700 1703  
1701 1704  
... ... @@ -2078,15 +2081,13 @@
2078 2081 }
2079 2082  
2080 2083 childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
  2084 + // 拼装自定义查询结果结束
2081 2085 }
2082   - // 拼装自定义查询结果结束
2083 2086  
2084   -
2085 2087 childbirthManagerResult.setData(childbirthManagerQueryModelList);
2086 2088 childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
2087 2089 childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
2088 2090 return childbirthManagerResult;
2089   -
2090 2091 }
2091 2092  
2092 2093 public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest) {