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 76b9339..b971360 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
@@ -75,6 +75,9 @@ public class ExcelUtil
                         ws.addCell(new Label(18, 0, "高危因素", wcf));
                         ws.addCell(new Label(19, 0, "高危等级", wcf));
                         ws.addCell(new Label(20, 0, "预产期", wcf));
+                        ws.addCell(new Label(21, 0, "产检日期", wcf));
+                        ws.addCell(new Label(22, 0, "居住地", wcf));
+
                         ws.mergeCells(5, 0, 12, 0);
 
                         ws.addCell(new Label(6, 1, "乙肝表面抗体", title1));
@@ -86,32 +89,24 @@ public class ExcelUtil
                         ws.addCell(new Label(12, 1, "丙肝", title1));
 
 //                        // 填充数据的内容
-//                        Map<String, Object> map;
-//                        for (int i = 0, len = data.size(); i < len; i++)
-//                        {
-//                                map = data.get(i);
-//                                Iterator<String> ite = columName.keySet().iterator();
-//                                int j = 0;
-//                                String keyORvalue = "";
-//                                String keyName = "";
-//                                while (ite.hasNext())
-//                                {
-//                                        keyName = ite.next();
-//                                        if (i > 0)
-//                                        { // 类容数据
-//                                                keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
-//                                        }
-//                                        else
-//                                        {
-//                                                // 第一行列名
-//                                                keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
-//                                                keyName = columName.get(keyName);
-//                                                ws.addCell(new Label(j, 0, keyName, wcf));
-//                                        }
-//                                        ws.addCell(new Label(j, 1 + i, keyORvalue));
-//                                        j++;
-//                                }
-//                        }
+                        Map<String, Object> map;
+                        for (int i = 0, len = data.size(); i < len; i++)
+                        {
+                                map = data.get(i);
+                                Iterator<String> ite = columName.keySet().iterator();
+                                int j = 0;
+                                String keyORvalue = "";
+                                String keyName = "";
+                                while (ite.hasNext())
+                                {
+                                        keyName = ite.next();
+                                        // 第一行列名
+                                        keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
+                                        keyName = columName.get(keyName);
+                                        ws.addCell(new Label(j, 2 + i, keyORvalue));
+                                        j++;
+                                }
+                        }
                         
                         wwb.write();
                         wwb.close();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 23c77ea..8a2d185 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -1236,7 +1236,7 @@ public class BookbuildingFacade {
 		String sql = "SELECT A.EXAMINE_DATE,\n" +
 				"       A.NAME,\n" +
 				"       A.AGE,\n" +
-				"       A.NOW_WEEKS,\n" +
+				"      (CASE WHEN A.NOW_WEEKS_DAY<>0 THEN '孕'||A.NOW_WEEKS|| '周'||A.NOW_WEEKS_DAY||'天' ELSE  '孕'||A.NOW_WEEKS|| '周' END) as NOW_WEEKS,\n" +
 				"       A.NOW_WEEKS_DAY, \n" +
 				"       B.EDD_DATE,\n" +
 				"       A.HBSAG,\n" +
@@ -1334,16 +1334,15 @@ public class BookbuildingFacade {
 		sql+="  order by A.EXAMINE_DATE DESC,A.Name ASC ";
 
 		try {
-//			List<Map<String,Object>> datas = JdbcUtil.getListDataBySql(sql);
-			List<Map<String,Object>> datas = new ArrayList<>();
+			List<Map<String,Object>> datas = JdbcUtil.getListDataBySql(sql);
 			OutputStream out = httpServletResponse.getOutputStream();
 			Map<String,String> cnames = new LinkedHashMap<>();
-			cnames.put("EXAMINE_DATE", "产检日期");
+
 			cnames.put("NAME", "姓名");
 			cnames.put("AGE", "年龄");
 			cnames.put("NOW_WEEKS", "孕周");
-			cnames.put("EDD_DATE", "预产期");
-//			cnames.put("TITLE", "母婴阻断项目检查结果");
+			cnames.put("TEL_NO", "联系方式");
+			cnames.put("SUGGESTION", "处理意见");
 			cnames.put("HBEAG", "乙肝表面抗原");
 			cnames.put("HBSAB", "乙肝表面抗体");
 			cnames.put("HBEAG", "乙肝e抗原");
@@ -1352,15 +1351,15 @@ public class BookbuildingFacade {
 			cnames.put("SYPHILIS", "梅毒");
 			cnames.put("HIV", "HIV");
 			cnames.put("HCV", "丙肝");
-			cnames.put("HIGH_RISK_GRADE", "高危等级");
-			cnames.put("HIGH_RISK_FACTOR", "高危因素");
 			cnames.put("NEXT_EXAMINE_DATE", "预约产检日期");
 			cnames.put("EXAMINE_HISTORY_NUM", "本院产检次数");
 			cnames.put("DOCTOR_NAME", "产检医生");
 			cnames.put("BOOKER", "登记人");
 			cnames.put("SERVICE_STATUS", "服务类型");
-			cnames.put("SUGGESTION", "处理意见");
-			cnames.put("TEL_NO", "联系方式");
+			cnames.put("HIGH_RISK_FACTOR", "高危因素");
+			cnames.put("HIGH_RISK_GRADE", "高危等级");
+			cnames.put("EDD_DATE", "预产期");
+			cnames.put("EXAMINE_DATE", "产检日期");
 			cnames.put("HOME_ADDR", "居住地");
 			httpServletResponse.setContentType("application/octet-stream");
 			httpServletResponse.setCharacterEncoding("UTF-8");