diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index d6de6aa..071ca1f 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -457,8 +457,25 @@ public class ExcelUtil int k = 0; //填充数据 for(int i = 0;i0){ + for(Object obj : list){ + Map data = new HashMap<>(); + QuanPatientsResult rp = (QuanPatientsResult) obj; + data.put("name", rp.getName()); + data.put("address",rp.getAddr()); + data.put("phone",rp.getPhone()); + data.put("lastMenses", rp.getLastMenses()); + data.put("yi",rp.getYi()); + data.put("er",rp.getEr()); + data.put("san",rp.getSan()); + data.put("si",rp.getSi()); + data.put("wu",rp.getWu()); + data.put("total",rp.getcTimes()); + datas.add(data); + } + } }else if(patientsQueryRequest.getQueryType() == 2){ //全部产妇 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java index 06a3ea3..6d5e238 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java @@ -72,6 +72,63 @@ public class QuanPatientsResult implements IBasicResultConvert> { StopWatch stopWatch = new StopWatch("QuanPatientWorker -" + patients.getId()); QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); + quanPatientsResult.setYi("-"); + quanPatientsResult.setEr("-"); + quanPatientsResult.setSan("-"); + quanPatientsResult.setSi("-"); + quanPatientsResult.setWu("-"); quanPatientsResult.convertToResult(patients); antExQuery.setPid(patients.getPid()); //增加查询本次产程条数 @@ -103,8 +108,53 @@ public class QuanPatientWorker implements Callable> { //复诊次数 List ant = null; if (CollectionUtils.isNotEmpty(chu)) { + for(AntExChuModel a : chu){//唐山滦县导出判断初诊是否是本院 + if(StringUtils.isNotEmpty(a.getHospitalId())){ + if(a.getHospitalId().equals(hospital)){ + quanPatientsResult.setYi("本院"); + }else{ + quanPatientsResult.setYi("外院"); + } + break; + } + } ant = antExService.queryAntenatalExamination(antExQuery.convertToQuery()); } + + //唐山滦县判断复诊是否是本院 + if(CollectionUtils.isNotEmpty(ant)){ + for(int k = 0;k < ant.size();k++){ + if(k>=4){ + break; + } + if(0==k){ + if(ant.get(k).getHospitalId().equals(hospital)){ + quanPatientsResult.setEr("本院"); + }else{ + quanPatientsResult.setEr("外院"); + } + }else if(1==k){ + if(ant.get(k).getHospitalId().equals(hospital)){ + quanPatientsResult.setSan("本院"); + }else{ + quanPatientsResult.setSan("外院"); + } + }else if(2==k){ + if(ant.get(k).getHospitalId().equals(hospital)){ + quanPatientsResult.setSi("本院"); + }else{ + quanPatientsResult.setSi("外院"); + } + }else if(3==k){ + if(ant.get(k).getHospitalId().equals(hospital)){ + quanPatientsResult.setWu("本院"); + }else{ + quanPatientsResult.setWu("外院"); + } + } + } + } + //系统初诊次数 int ichu = CollectionUtils.isEmpty(chu) ? 0 : chu.size();