commit

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

@@ -339,8 +339,13 @@ public class ViewController extends Controller {
 	private static void post(String url, Map<String, String> map) throws IOException {
 		RequestBody formBody = new FormBody.Builder().add("timestamp", String.valueOf(getSecondTimestamp(new Date())))
 				.add("signature", Ksort(map)).add("data", JSON.toJSONString(map)).build();
+		System.out.println(String.valueOf(getSecondTimestamp(new Date())));
+		System.out.println(Ksort(map));
 
-		Request request = new Request.Builder().url("http://test99.yunyikang.cn/pacs/zskk/saveWritePatientReport").post(formBody)
+		System.out.println(JSON.toJSONString(map));
+
+
+		Request request = new Request.Builder().url("http://39.106.136.96/pacs/zskk/saveWritePatientReport").post(formBody)
 				.build();
 
 		try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
@@ -386,76 +391,78 @@ public class ViewController extends Controller {
 		Map<String, String> data = new HashMap<String, String>();
 		// 获取data数据
 		// 医院id
-		data.put("hospital_id", "13000003");
+		data.put("hospital_id", "40000003");
 		// 影像所见
-		data.put("description", "测试更新描述");
+		data.put("description", "    PICC置管后，管头位于胸7椎体右上缘，双侧胸廓对称；双肺纹理清晰，肺野透光度正常，双肺未见异常密度影；气管纵隔居中，未见明显增宽；双肺门影正常，心影大小形态正常，胸膜及膈面光整，双肋膈角锐利，双侧肋骨未见明显异常。");
 		// 意见建议
-		data.put("impression", "测试更新印象");
+		data.put("impression", "1.PICC置管后，管头位于胸7椎体右上缘。&#x0D;\n2.心肺X线平片未见明显异常。");
 		// 检查id
-		data.put("exam_id", "116df635fe153209");
-		data.put("study_id", "116df635fde8f635");
+		data.put("exam_id", "1173949237e9be84");
+		data.put("study_id", "11739492370709ea");
 		// 患者id
-		data.put("patient_id", "116df635fdcfa46d");
+		data.put("patient_id", "1173949236f372ab");
 		// 患者姓名
-		data.put("patient_name", "张三");
+		data.put("patient_name", "张会");
 		// 患者性别
-		data.put("patient_sex", "M");
+		data.put("patient_sex", "F");
 		// 身份证号
-		data.put("card_num", "");
+		data.put("card_num", "513525197511098249");
 		// 手机号
-		data.put("phone", "");
+		data.put("phone", "13996955548");
 		// 患者生日
-		data.put("birthday", "19820815");
+		data.put("birthday", "19760728");
 		// 患者检查时年龄
-		data.put("patient_age", "57Y");
+		data.put("patient_age", "044Y");
 		// 阴阳性 1阴性 2阳性
-		data.put("report_result", "1");
+		data.put("report_result", "");
 		// 报告时间 10位时间戳
 		try {
-			data.put("report_datetime", returnSecondTimestamp("2020-07-22 00:00:00"));
+			data.put("report_datetime", returnSecondTimestamp("2020-07-28 17:22:38"));
 		} catch (ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
 		// 报告医生id
-		data.put("report_doctor_id", "李四");
+		data.put("report_doctor_id", "徐芳");
 		// 报告医生姓名
-		data.put("report_doctor_name", "李四");
+		data.put("report_doctor_name", "徐芳");
 		// 审核时间
 		try {
-			data.put("review_datetime", returnSecondTimestamp("2020-07-22 00:00:00"));
+			data.put("review_datetime", returnSecondTimestamp("2020-07-28 17:22:38"));
 		} catch (ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
 		// 审核医生id
-		data.put("review_doctor_id", "王五");
+		data.put("review_doctor_id", "徐芳");
 		// 审核姓名
-		data.put("review_doctor_name", "王五️");
+		data.put("review_doctor_name", "徐芳️");
 		// 确认时间
 		try {
-			data.put("confirm_datetime", returnSecondTimestamp("2020-07-22 00:00:00"));
+			data.put("confirm_datetime", returnSecondTimestamp("2020-07-28 17:22:38"));
 		} catch (ParseException e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
 		// 确认医生id
-		data.put("confirm_doctor_id", "王五");
+		data.put("confirm_doctor_id", "徐芳");
 		// 确认医生姓名
-		data.put("confirm_doctor_name", "王五");
-		data.put("patient_no", "");
+		data.put("confirm_doctor_name", "徐芳");
+		data.put("patient_no", "202002571");
 
 
 		ThreadPoolService tService = new com.zskk.service.ThreadPoolService();
 		tService.execute(() -> {
 			String dadaString = JSON.toJSONString(data);
-			dadaString = dadaString.replace("\\r\\n", "");
+			dadaString = dadaString.replace("\\r", "");
+			dadaString = dadaString.replace("\\n", "");
 			dadaString = dadaString.replace("*", "X");
 			dadaString = dadaString.replace("<p>", "");
 			dadaString = dadaString.replace("<br/>", "");
 			dadaString = dadaString.replace("<p>", "");
 			dadaString = dadaString.replace("/", "-");
 			dadaString = dadaString.replace("&nbsp; ", "");
+			dadaString = dadaString.replace("&#x0D;", "");
 
 
 			Map maps = (Map) JSON.parse(dadaString);