加载病案首页的读取

kernel/src/test/java/com/lantone/qc/kernel/DataTest.java

@@ -21,11 +21,11 @@ public class DataTest {
 
     }
 
-    public static String loadHomePage(String patientId) {
+    public static JSONArray loadHomePage(String patientId) {
         Connection conn = null;
         Statement stmt = null;
         ResultSet rs = null;
-        String js = null;
+        JSONArray js = null;
         try {
             PropertiesUtil propertiesUtil = new PropertiesUtil("kernel.properties");
             Class.forName(propertiesUtil.getProperty("oracle.test.driver"));
@@ -80,7 +80,7 @@ public class DataTest {
         return js;
     }
 
-    public static String resultSetToJson(ResultSet rs, Map<String, String> map) throws SQLException, JSONException {
+    public static JSONArray resultSetToJson(ResultSet rs, Map<String, String> map) throws SQLException, JSONException {
         // json数组
         JSONArray array = new JSONArray();
         // 获取列数
@@ -98,7 +98,7 @@ public class DataTest {
             array.add(jsonObj);
         }
 
-        return array.toString();
+        return array;
     }
 
 }

kernel/src/test/java/com/lantone/qc/kernel/TaizDataImportApiTest.java

@@ -1,5 +1,7 @@
 package com.lantone.qc.kernel;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.google.gson.JsonObject;
 import com.lantone.qc.pub.jdbc.MysqlJdbc;
 import com.lantone.qc.pub.util.FastJsonUtils;
@@ -66,13 +68,20 @@ public class TaizDataImportApiTest {
         for (Map.Entry<String, String> entry : patientMap.entrySet()) {
             List<PatientText> patientTexts = new ArrayList<>();
             //病人的病案首页内容
-            String firstPageJson = DataTest.loadHomePage(entry.getKey());
+            JSONArray firstPageJsonArray = DataTest.loadHomePage(entry.getKey());
             Map<String, Object> firstPageTextMap = new HashMap<>();
             firstPageTextMap.put("case_number", entry.getKey());
             firstPageTextMap.put("case_number_id", patientMap.get(entry.getKey()));
             firstPageTextMap.put("hospital_id", hospitalId);
             firstPageTextMap.put("mode_id", 6);
-            firstPageTextMap.put("text", firstPageJson);
+            firstPageTextMap.put("origin_text", firstPageJsonArray.toString());
+            JSONObject jsonObject = firstPageJsonArray.getJSONObject(0);
+            Map<String, Object> innerMap = jsonObject.getInnerMap();
+            String pagetext = "";
+            for (Map.Entry<String, Object> e : innerMap.entrySet()) {
+                pagetext = pagetext + "【" + e.getKey() + "】：" + e.getValue() + "\n";
+            }
+            firstPageTextMap.put("text", pagetext);
             list.add(firstPageTextMap);
 
             if ("changx".equals(cid)) {