From c79ac4861b450e4a0e6ff303ab2bde99c57828cb Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Fri, 2 Nov 2018 14:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=90=E5=B1=B1=E6=BB=A6=E5=8E=BF=E5=AD=95?=
 =?UTF-8?q?=E5=A6=87=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86=E7=99=BB=E8=AE=B0?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/common/utils/ExcelUtil.java  | 21 +++++++-
 .../platform/operate/web/facade/PatientFacade.java | 17 +++++++
 .../operate/web/result/QuanPatientsResult.java     | 58 ++++++++++++++++++++++
 .../operate/web/worker/QuanPatientWorker.java      | 50 +++++++++++++++++++
 4 files changed, 144 insertions(+), 2 deletions(-)

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;i<data.size();i++){
-                                ws.addCell(new Label(k,i+2,""));
-                                k++;
+                                int l = i+1;
+                                ws.addCell(new Label(k,i+2,String.valueOf(l)));
+                                ws.addCell(new Label(k+1,i+2,data.get(i).get("name")==null?"":data.get(i).get("name").toString()));
+                                ws.addCell(new Label(k+2,i+2,data.get(i).get("address")==null?"":data.get(i).get("address").toString()));
+                                ws.addCell(new Label(k+3,i+2,data.get(i).get("phone")==null?"":data.get(i).get("phone").toString()));
+                                ws.addCell(new Label(k+4,i+2,data.get(i).get("lastMenses")==null?"":data.get(i).get("lastMenses").toString()));
+                                ws.addCell(new Label(k+5,i+2,data.get(i).get("yi")==null?"":data.get(i).get("yi").toString()));
+                                ws.addCell(new Label(k+6,i+2,data.get(i).get("er")==null?"":data.get(i).get("er").toString()));
+                                ws.addCell(new Label(k+7,i+2,data.get(i).get("san")==null?"":data.get(i).get("san").toString()));
+                                ws.addCell(new Label(k+8,i+2,data.get(i).get("si")==null?"":data.get(i).get("si").toString()));
+                                ws.addCell(new Label(k+9,i+2,data.get(i).get("wu")==null?"":data.get(i).get("wu").toString()));
+                                ws.addCell(new Label(k+10,i+2,data.get(i).get("total")==null?"":data.get(i).get("total").toString()));
+
+                                ws.addCell(new Label(k+11,i+2,data.get(i).get("total")==null?"":data.get(i).get("total").toString()));
+                                ws.addCell(new Label(k+12,i+2,data.get(i).get("total")==null?"":data.get(i).get("total").toString()));
+                                ws.addCell(new Label(k+13,i+2,data.get(i).get("total")==null?"":data.get(i).get("total").toString()));
+                                ws.addCell(new Label(k+14,i+2,data.get(i).get("total")==null?"":data.get(i).get("total").toString()));
+                                ws.addCell(new Label(k+15,i+2,data.get(i).get("total")==null?"":data.get(i).get("total").toString()));
+
                         }
 
                         wwb.write();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index e4d4ab1..5fbad3c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -1052,6 +1052,23 @@ public class PatientFacade {
                 //全部孕妇
                 listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE);
                 List list = listResponse.getData();
+                if(list != null && list.size()>0){
+                    for(Object obj : list){
+                        Map<String, Object> 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<QuanPatientsResu
     //建档号
     private String fileCode;
 
+    /******唐山滦县导出增加字段*******/
+    private String lastMenses;//末次月经
+    private String yi;
+    private String er;
+    private String san;
+    private String si;
+    private String wu;
+
+
+    public String getLastMenses() {
+        return lastMenses;
+    }
+
+    public void setLastMenses(String lastMenses) {
+        this.lastMenses = lastMenses;
+    }
+
+    public String getYi() {
+        return yi;
+    }
+
+    public void setYi(String yi) {
+        this.yi = yi;
+    }
+
+    public String getEr() {
+        return er;
+    }
+
+    public void setEr(String er) {
+        this.er = er;
+    }
+
+    public String getSan() {
+        return san;
+    }
+
+    public void setSan(String san) {
+        this.san = san;
+    }
+
+    public String getSi() {
+        return si;
+    }
+
+    public void setSi(String si) {
+        this.si = si;
+    }
+
+    public String getWu() {
+        return wu;
+    }
+
+    public void setWu(String wu) {
+        this.wu = wu;
+    }
+
     public String getFileCode() {
         if(null==fileCode){
             return SPIT;
@@ -316,6 +373,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         if(null!=destModel.getLastMenses()){
             int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
             this.dueWeek=StringUtils.dueWeek(days);
+            setLastMenses(DateUtil.getyyyy_MM_dd(destModel.getLastMenses()));
         }
         setRealPhone(destModel.getPhone());
 //        setrLevel(destModel.getRiskLevelId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
index 95b533f..69da213 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
@@ -75,6 +75,11 @@ public class QuanPatientWorker implements Callable<List<QuanPatientsResult>> {
 
             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<QuanPatientsResult>> {
             //复诊次数
             List<AntenatalExaminationModel> 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();
 
-- 
1.8.3.1