From bbadac7f5872a40e52b9dcf6faf0af0fd0bcc2a3 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 27 Sep 2017 16:02:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/utils/DateUtil.java | 5 ++- .../com/lyms/hospitalapi/pojo/PieReportModel.java | 41 ++++++++++++++++++++-- .../web/controller/HearingDiagnoseController.java | 4 +-- .../platform/operate/web/facade/BabyEarFacade.java | 10 +++--- .../web/facade/PatientMarkHospServiceFacade.java | 33 +++++++++++++---- 5 files changed, 73 insertions(+), 20 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index e72b585..305e35f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -2,7 +2,6 @@ package com.lyms.platform.common.utils; import org.joda.time.DateTime; -import java.text.Format; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -964,14 +963,14 @@ public class DateUtil { * @param end * @return */ - public static String getWeekDesc(Date start, Date end) { + public static String getWeekDesc(Date start, Date end) { if(start == null || end == null) { return "孕0周+0天"; } Integer betweenDay = DateUtil.getDays(start, end); Integer week = betweenDay / 7; Integer day = betweenDay % 7; - return "孕" + week + "周+" + day + "天"; + return "孕" + week + "周+" + (day > 0 ? "+" + day + "天" : ""); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java index d4254c8..700d2eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java @@ -6,14 +6,51 @@ import java.util.Map; /** * @auther yangfei * @createTime 2017年09月27日 11时59分 - * @discription + * @discription 饼状图统计 */ public class PieReportModel { /** - * + * 列数据 */ public List legendData; /** 数据列表 */ private List> seriesData; + /** 报表数据 */ + private Object data; + /** + * 其他数据 + */ + private Map otherMap; + + public Map getOtherMap() { + return otherMap; + } + + public void setOtherMap(Map otherMap) { + this.otherMap = otherMap; + } + + public List getLegendData() { + return legendData; + } + + public void setLegendData(List legendData) { + this.legendData = legendData; + } + + public List> getSeriesData() { + return seriesData; + } + + public void setSeriesData(List> seriesData) { + this.seriesData = seriesData; + } + + public Object getData() { + return data; + } + public void setData(Object data) { + this.data = data; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java index f7b6206..5f46184 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java @@ -806,9 +806,9 @@ public class HearingDiagnoseController extends BaseController { //医院id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); - //确诊 加入确诊时间 + //确诊 加入确诊时间未诊断时间 if(obj.getIsconfirm()==1){ - obj.setConfirmTime(new Date()); + obj.setConfirmTime(obj.getDiagnoseTime()); } String pid = babyModel.getPid(); obj.setPid(pid); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index e729ad9..692abee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1309,14 +1309,12 @@ public class BabyEarFacade { } babyEarBirthView.setFetuEmbarras(fetuStr); - String apgarScore = (babyPatientExtendEarBirth.getApgarScoreOne() == null ? "" : babyPatientExtendEarBirth.getApgarScoreOne()) + "-" + (babyPatientExtendEarBirth.getApgarScoreFive() == null ? "" : babyPatientExtendEarBirth.getApgarScoreFive()) + "-" + (babyPatientExtendEarBirth.getApgarScoreTen() == null ? "" : babyPatientExtendEarBirth.getApgarScoreTen()); - - if (babyPatientExtendEarBirth.getFetuEmbarras() != null && babyPatientExtendEarBirth.getFetuEmbarras() == 1) { - apgarScore += "不详"; + String apgarScore =""; + if (babyPatientExtendEarBirth.getApgarScoreOne() != null && babyPatientExtendEarBirth.getApgarScoreFive() != null && babyPatientExtendEarBirth.getApgarScoreTen() != null) { + apgarScore = babyPatientExtendEarBirth.getApgarScoreOne() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreFive() + UnitConstants.FEN + " - " + babyPatientExtendEarBirth.getApgarScoreTen() + UnitConstants.FEN; } babyEarBirthView.setApgarScore(apgarScore); - String deformity = ""; if (babyPatientExtendEarBirth.getDeformityType() != null && babyPatientExtendEarBirth.getDeformityType() == 1) { deformity = "有"; @@ -1814,7 +1812,7 @@ public class BabyEarFacade { screenQuery.setStatus(0); screenQuery.setSort("screen_date"); screenQuery.setNeed("y"); - screenQuery.setOffset((earScreenListRequest.getPage()-1)*earScreenListRequest.getLimit()); + screenQuery.setOffset((earScreenListRequest.getPage() - 1) * earScreenListRequest.getLimit()); screenQuery.setLimit(earScreenListRequest.getLimit()); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index b55f09a..73963a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.llfy.LlfyHisService; +import com.lyms.hospitalapi.pojo.PieReportModel; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.MakeHospitalEnums; @@ -17,6 +18,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -50,7 +52,7 @@ public class PatientMarkHospServiceFacade { * @param id * @return */ - public BaseListResponse reportHospit(PatientMarkRequest patientMarkRequest, Integer id){ + public BaseResponse reportHospit(PatientMarkRequest patientMarkRequest, Integer id){ PatientMarkHospitalQuery query = new PatientMarkHospitalQuery(); //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); @@ -72,19 +74,36 @@ public class PatientMarkHospServiceFacade { List reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByMakeDoctor(query); //总数据 int count = patientMarkHospitalService.queryPatientMarkHospitalCount(query); + + + //列数据 + List legendData = new ArrayList<>(); + List> serData = new ArrayList<>(); + Map otherMap = new HashedMap(); + otherMap.put("count",count); + for(ReportMakeHosptail rm:reportMakeHosptails){ + Map map = new HashedMap(); Users users = usersService.getUsers(Integer.parseInt(rm.getDoctorId())); if (users != null) { rm.setDoctorName(users.getName()); } else { rm.setDoctorName("产检医生"); } - } - - - - - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(reportMakeHosptails); + legendData.add(rm.getDoctorName()); + map.put("value",rm.getNum()); + map.put("name",rm.getDoctorName()); + serData.add(map); + } + PieReportModel pieReportModel = new PieReportModel(); + pieReportModel.setLegendData(legendData); + pieReportModel.setSeriesData(serData); + pieReportModel.setData(reportMakeHosptails); + pieReportModel.setOtherMap(otherMap); + BaseResponse result = new BaseResponse(); + result.setObject(pieReportModel); + result.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + return result; } /** -- 1.8.3.1