From eed43d64d4243608835c0c017fb94703d7c09bc2 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Tue, 21 Aug 2018 17:32:26 +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 --- .../java/com/lyms/platform/query/AntExQuery.java | 29 ++++++++ .../lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 82 +++++++++++++++++++++- .../operate/web/controller/QhdJbgwController.java | 22 +++++- 3 files changed, 131 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java index 40b61ca..66811f1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java @@ -44,6 +44,26 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { private Date createdTimeStart; + 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; + } + public Date getCreatedTimeStart() { return createdTimeStart; } @@ -224,6 +244,15 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { isAddStart = Boolean.TRUE; } + if (null != modifiedStart && modifiedEnd != null) { + if (null != c) { + c = c.where("modified").gte(modifiedStart).lte(modifiedEnd); + } else { + c = Criteria.where("modified").gte(modifiedStart).lte(modifiedEnd); + } + isAddStart = Boolean.TRUE; + } + if (null != end) { if (isAddStart) { if(neEnd){ 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 091f495..33e81be 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 @@ -14,12 +14,15 @@ 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.query.AntExChuQuery; +import com.lyms.platform.query.AntExQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -122,9 +125,9 @@ public class QhdJbgwInterface { antExChuQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); List list = antExService.queryAntExChu(antExChuQuery); if(list != null && list.size() > 0){ - Patients patients = patientsService.findOnePatientById(list.get(0).getParentId()); for(AntExChuModel antExChuModel : list){ try{ + Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), antExChuModel.getCheckTime()); int week = Integer.parseInt(cDueWeek.substring(1, cDueWeek.indexOf("周"))); int day = Integer.parseInt(cDueWeek.substring(cDueWeek.indexOf("+")+1, cDueWeek.indexOf("天"))); @@ -319,6 +322,83 @@ public class QhdJbgwInterface { + /** + * 复诊 + * @param startDate + * @param endDate + * @return + */ + public List> getFuZhen(String startDate,String endDate){ + List> mList = new ArrayList>(); + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); + antExQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); + List list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + if(list != null && list.size() > 0){ + for(AntenatalExaminationModel data : list){ + try{ + Patients patients = patientsService.findOnePatientById(data.getParentId()); + String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate()); + 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("MATERNALFOLLOWUPID",data.getId()); + map.put("MATERNALINFOID",patients.getId()); + map.put("NAME",patients.getUsername()); + map.put("FOLLOWUPDATE",DateUtil.getyyyy_MM_dd(data.getCheckDate())); + map.put("GESTWEEKS",String.valueOf(week)); + map.put("GESTDAYS",String.valueOf(day)); + map.put("WEIGHT",String.valueOf(data.getWeight())); + map.put("CHIEFCOMPLAINT",data.getChiefComplaint()); + map.put("FUNDUSHEIGHT",data.getGongGao()); + map.put("ABDOMEN_CIRCUM",data.getAbdominalCircumference()); + map.put("FETUSPOSITIONVALUE",null); + String ssy = ""; + String szy = ""; + Map chBpMap = JsonUtil.getMap(data.getBp()); + if (MapUtils.isNotEmpty(chBpMap)) { + ssy = chBpMap.get("ssy"); + szy = chBpMap.get("szy"); + } + map.put("SBP",ssy); + map.put("DBP",szy); + map.put("HGB",data.getHemoglobin()); + map.put("PROQUANTESTVALUE",data.getUrineProtein()); + map.put("NEXTFOLLOWUPDATE",DateUtil.getyyyy_MM_dd(data.getNextCheckTime())); + map.put("FOLLOWUPDOCTORID",data.getCheckDoctor()); + String checkDoctor = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getCheckDoctor())) { + Users users = usersService.getUsers(Integer.parseInt(data.getCheckDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + checkDoctor = users.getName(); + } + } + map.put("FOLLOWUPDOCTORNAME",checkDoctor); + 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); + + mList.add(map); + }catch (Exception e){ + e.printStackTrace(); + continue; + } + } + + } + + return mList; + } + + + + //民族查询 private String getBasicConfig(String id) { if (com.lyms.platform.common.utils.StringUtils.isEmpty(id)) { 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 915f903..4758694 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 @@ -38,11 +38,31 @@ public class QhdJbgwController { @ResponseBody public List> qhdChuZhen(@RequestBody Map map){ if(StringUtils.isNotEmpty(map.get("startDate")) && StringUtils.isNotEmpty(map.get("endDate"))){ - return qhdJbgwInterface.getChuZhen(map.get("startDate"),map.get("endDate")); + return qhdJbgwInterface.getChuZhen(map.get("startDate"), map.get("endDate")); } return null; } + @RequestMapping(method = RequestMethod.POST,value = "/qhd/fz") + @ResponseBody + public List> qhdFuZhen(@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 + public List> qhdCZ(String startDate,String endDate){ + if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){ + return qhdJbgwInterface.getChuZhen(startDate,endDate); + } + return null; + } + } -- 1.8.3.1