commit

DataFusion/src/com/zskk/control/ViewController.java

@@ -96,8 +96,8 @@ public class ViewController extends Controller {
 
 		try {
 			String string = "here";
-			String jString = "{\"birthdate\":\"1962-03-28 00:00:00\",\"modality\":\"CT\",\"patientid\":\"030228612\",\"patientsex\":\"男\",\"reportPaperNum\":737322,\"reportdate\":\"2019-12-30 13:16:34\",\"diagnosis\":\"肺癌\",\"accessionNumber\":\"161191\",\"patientname\":\"黄世光\",\"symptom\":\"肺癌病史二年\",\"clinicaldoctor\":\"康博\",\"phone\":\"13644539072\",\"DESCRIPTION\":\"双侧基底节及侧脑室旁多发低密度影，边界尚清。脑室未见扩张。脑沟增宽、加深。中线结构居中。颅骨骨质结构完整。筛窦内多发高密度。\\r\\n\",\"printreport\":true,\"idcard\":\"231003196203281317\",\"patientage\":\"57岁\",\"impression\":\"1、双脑多发低密度，考虑脑梗死伴软化灶形成。\\r\\n2、脑萎缩。\\r\\n3、筛窦炎症。\\r\\n\",\"regPaperNum\":\"890663\",\"reviewdoctor\":\"李由山\",\"department\":\"肿瘤内一科\",\"studyuid\":\"161191\",\"printfilm\":false,\"reportdoctor\":\"姚文达\"}";
-			List<Exams> exams = Exams.dao.find("SELECT * FROM pacsonline.exams where id='116f51b2313f5fda'");
+			String jString = "{\"birthdate\":\"1976-04-21 00:00:00\",\"modality\":\"MR\",\"patientid\":\"030419456\",\"patientsex\":\"女\",\"reportPaperNum\":740386,\"reportdate\":\"2020-01-08 16:13:06\",\"diagnosis\":\"上颌骨恶性肿瘤\",\"accessionNumber\":\"17822\",\"patientname\":\"王晓艳\",\"symptom\":\"上颌骨恶性肿瘤\",\"clinicaldoctor\":\"周宏\",\"phone\":\"13836302692\",\"DESCRIPTION\":\"    右侧上颌窦呈术后改变，上颌窦窦壁、部分鼻甲及右侧上腭部局部缺如。右侧上颌窦壁及鼻翼旁皮下软组织不均匀增厚，其内信号欠均，T1WI呈等、稍低信号，T2脂肪抑制呈不均匀稍高信号，增强扫描呈不均匀强化。右侧翼外肌内可见片状异常信号影，T1WI及T2脂肪抑制均呈低信号，增强扫描未见明显强化。双侧颈深部Ⅱ-Ⅳ区及咽旁可见多发结节影，T1WI呈低信号，T2脂肪抑制呈高信号，增强扫描呈不均匀中等强化，大者约为1.7*0.9*2.8cm。右侧筛窦及乳突内可见长T1长T2信号影，增强扫描未见强化。\\r\\n\\r\\n\",\"printreport\":false,\"idcard\":\"231003197604211648\",\"patientage\":\"43岁\",\"impression\":\" 1、右侧上颌窦呈术后改变，上颌窦窦壁、部分鼻甲及右侧上腭部局部缺如：右侧上颌窦壁及鼻翼旁皮下软组织不均匀增厚，右侧翼外肌双低信号，考虑术后改变伴周围软组织水肿，请以此为基准片定期复查。\\r\\n2、双侧颈深及左侧咽旁多发淋巴结增大，请追随。\\r\\n3、右侧副鼻窦炎、中耳炎。\\r\\n\",\"regPaperNum\":\"894136\",\"reviewdoctor\":\"杨波\",\"department\":\"放疗三科\",\"studyuid\":\"17822\",\"printfilm\":false,\"reportdoctor\":\"刘媛\"}";
+			List<Exams> exams = Exams.dao.find("SELECT * FROM pacsonline.exams where id='116f84268cc9186a'");
 			for (Exams exams2 : exams) {
 				//Studies studies = Studies.dao.use("zskk").findById(exams2.getStudyId());
 //				Record record = Db.use("connected").findFirst("select * from zskk where accessionNumber=?",exams2.getAccessionNum());
@@ -191,7 +191,13 @@ public class ViewController extends Controller {
 //             System.out.println(ssString);
                 String ssString=JSON.toJSONString(data);
                 System.out.println(ssString);
-                ssString = ssString.replace("\\","");
+                ssString = ssString.replace("\\r\\n","");
+                ssString = ssString.replace(" ","");
+                ssString = ssString.replace("、","，");
+                ssString = ssString.replace("*","乘");
+
+
+
            	 Map maps = (Map)JSON.parse(ssString);  
 
                 post(null, maps);
@@ -350,13 +356,13 @@ public class ViewController extends Controller {
 		        .post(formBody)
 		        .build();
 
-//		    try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
-//		      if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
-//
-//		      System.out.println(response.body().string());
-////			  return response.body().string();
+		    try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
+		      if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
+
+		      System.out.println(response.body().string());
+//			  return response.body().string();
 //
-//		    }
+		    }
 	  }  
 	public static String Ksort(Map<String, String> map){
 		String sb = "";

DataFusion/src/com/zskk/task/DataTask.java

@@ -122,7 +122,8 @@ public class DataTask implements ITask {
 					ThreadPoolService tService = new com.zskk.service.ThreadPoolService();
 					tService.execute(() -> {
 						String dadaString = JSON.toJSONString(data);
-						dadaString = dadaString.replace("\\", "");
+						dadaString = dadaString.replace("\\r\\n", "");
+						dadaString = dadaString.replace("*", "X");
 						Map maps = (Map) JSON.parse(dadaString);
 						try {
 							post(null, maps);