From cf715a283b83f3af31559e0fe385fd7f8e0c2b87 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 22 Aug 2018 13:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=86=A0=E6=96=B0?= =?UTF-8?q?=E5=85=AC=E5=8D=AB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/MatDeliverQuery.java | 26 +++++ .../lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 106 ++++++++++++++++++++- .../operate/web/controller/QhdJbgwController.java | 10 ++ 3 files changed, 138 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 713b5be..5bf2ca7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -39,6 +39,24 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private Date createdTimeStart; private Date createdTimeEnd; + private Date modifiedStart; + private Date modifiedEnd; + + public Date getModifiedStart() { + return modifiedStart; + } + + public void setModifiedStart(Date modifiedStart) { + this.modifiedStart = modifiedStart; + } + + public Date getModifiedEnd() { + return modifiedEnd; + } + + public void setModifiedEnd(Date modifiedEnd) { + this.modifiedEnd = modifiedEnd; + } private boolean neEnd; /** @@ -275,6 +293,14 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery } isAddStart = Boolean.TRUE; } + if(null != modifiedStart && null != modifiedEnd){ + if(null != c){ + c = c.where("modified").gte(modifiedStart).lte(modifiedEnd); + }else{ + c = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd); + } + isAddStart = Boolean.TRUE; + } if (isAddStart) { return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index 33e81be..014c98f 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -2,6 +2,7 @@ package com.lyms.hospitalapi.qhdfy; import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.MatDeliverService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; @@ -13,14 +14,13 @@ import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.AntExChuModel; -import com.lyms.platform.pojo.AntenatalExaminationModel; -import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.AntExQuery; +import com.lyms.platform.query.MatDeliverQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; @@ -48,6 +48,8 @@ public class QhdJbgwInterface { private AntenatalExaminationService antExService; @Autowired private UsersService usersService; + @Autowired + private MatDeliverService matDeliverService; /** *孕产登记 @@ -397,6 +399,102 @@ public class QhdJbgwInterface { } + /** + * 分娩 + * @param startDate + * @param endDate + * @return + */ + public List> getFm(String startDate,String endDate){ + + MatDeliverQuery deliverQuery = new MatDeliverQuery(); + deliverQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + deliverQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); + List list = matDeliverService.query(deliverQuery); + if(list != null && list.size() > 0){ + for(MaternalDeliverModel data : list) { + Patients patients = patientsService.findOnePatientById(data.getParentId()); + try { + String cDueWeek = data.getDueWeek(); + int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); + int day = Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+") + 1, cDueWeek.indexOf("天"))); + Map map = new HashMap(); + map.put("MATERNALCHILDBIRTHID",data.getId()); + map.put("MATERNALINFOID",patients.getId()); + map.put("NAME",patients.getUsername()); + String fmHospital = ""; + + if (StringUtils.isNotEmpty(data.getFmHospital())) { + if (com.lyms.platform.common.utils.StringUtils.isNum(data.getFmHospital())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(data.getFmHospital())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + fmHospital = organization.getName(); + } + } else { + fmHospital = data.getFmHospital(); + } + + } + map.put("LABORPLACEVALUE",fmHospital); + if(data.getDeliveryMode() != null){ + Map m = JsonUtil.str2Obj(data.getDeliveryMode(), Map.class); + Object b = m.get("fmfs"); + if(b != null){ + if("顺产".equals(b.toString())){ + map.put("LABORWAY","1"); + }else if("剖宫产".equals(b.toString())){ + map.put("LABORWAY","2"); + } + + } + } + map.put("LABORTIME",data.getDueDate()); + map.put("GESTTEEKS",String.valueOf(week)); + map.put("GESTDAYS",String.valueOf(day)); + if(data.getPerinealCondition() != null){ + if("full".equals(data.getPerinealCondition())){ + map.put("PERINEUMSITUATION","1"); + } + if("split".equals(data.getPerinealCondition())){ + map.put("PERINEUMSITUATION","2"); + } + } + + if(data.getTireNumber().toString() != null){ + if(1 == data.getTireNumber()){ + map.put("BABYFETUSCOUNTS","1"); + } else if(2 == data.getTireNumber()){ + map.put("BABYFETUSCOUNTS","2"); + } else{ + map.put("BABYFETUSCOUNTS","3"); + } + } + /*if(data.getMaternalInfo() != null){ + if("1".equals(data.getMaternalInfo())){ + + } + }*/ + map.put("ORGCODE",patients.getHospitalId()); + String hospital = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(patients.getHospitalId())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + hospital = organization.getName(); + } + } + map.put("ORGNAME",hospital); + + } catch (Exception e) { + e.printStackTrace(); + continue; + } + } + } + return null; + } + + + //民族查询 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java index 4758694..18ede8b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java @@ -54,6 +54,16 @@ public class QhdJbgwController { } + @RequestMapping(method = RequestMethod.POST,value = "/qhd/fm") + @ResponseBody + public List> qhdFenMian(@RequestBody Map map){ + if(StringUtils.isNotEmpty(map.get("startDate")) && StringUtils.isNotEmpty(map.get("endDate"))){ + return qhdJbgwInterface.getFuZhen(map.get("startDate"), map.get("endDate")); + } + return null; + } + + @RequestMapping(value = "/qhd/chuzhen") @ResponseBody -- 1.8.3.1