COMMIT

DataFusion/res/config.properties

@@ -5,10 +5,10 @@ user_connected 	   = cloud
 password_connected = cloud
 
 #DB-connected partners
-jdbcUrl_print  = jdbc:sqlserver://200.200.200.163:1433;DatabaseName=DICOMSOFT
+jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/jcjyhr?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
-user_print 	   = zskk
-password_print = zskk
+user_local 	   = cmcc
+password_local = Cmcc@1234
 
 #DATA-Parms
 institution_id     = 12140300MB0351839N

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -69,9 +69,9 @@ public class ZskkConfig extends JFinalConfig {
 		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
 	}
 	
-	public static DruidPlugin createPrintDruidPlugin() {
+	public static DruidPlugin createLocalDruidPlugin() {
 
-		return new DruidPlugin(PropKit.get("jdbcUrl_print"), PropKit.get("user_print"),PropKit.get("password_print").trim());
+		return new DruidPlugin(PropKit.get("jdbcUrl_local"), PropKit.get("user_local"),PropKit.get("password_local").trim());
 	}
 
 	@Override
@@ -85,14 +85,14 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new MysqlDialect());
 		me.add(arpConnected);
 		
-//		// 配置数据库连接池插件
-//		DruidPlugin druidPluginPrint = createPrintDruidPlugin();
-//		me.add(druidPluginPrint);
-//		
-//		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpPrint = new ActiveRecordPlugin("print", druidPluginPrint);
-//		arpPrint.setDialect(new SqlServerDialect());
-//		me.add(arpPrint);
+		// 配置数据库连接池插件
+		DruidPlugin druidPluginPrint = createLocalDruidPlugin();
+		me.add(druidPluginPrint);
+		
+		// 配置ActiveRecord插件
+		ActiveRecordPlugin arpPrint = new ActiveRecordPlugin("local", druidPluginPrint);
+		arpPrint.setDialect(new MysqlDialect());
+		me.add(arpPrint);
 //
 		//匹配报告
 //		Cron4jPlugin cpData = new Cron4jPlugin();
@@ -109,11 +109,11 @@ public class ZskkConfig extends JFinalConfig {
 		pifData.addTask("*/7 * * * *", new JCBGTask());
 		me.add(pifData);
 		
-//		//上传检验信息
-//	    Cron4jPlugin bdData = new Cron4jPlugin();
-//	    bdData.addTask("*/9 * * * *", new JYTask());
-//		me.add(bdData);
-//		
+		//上传检验信息
+	    Cron4jPlugin bdData = new Cron4jPlugin();
+	    bdData.addTask("*/9 * * * *", new JYTask());
+		me.add(bdData);
+		
 //		//将打印png上传云端
 //	    Cron4jPlugin prData = new Cron4jPlugin();
 //	    prData.addTask("*/2 * * * *", new PrintTask());

DataFusion/src/com/zskk/service/DataService.java

@@ -200,65 +200,67 @@ public class DataService {
 		params.put("request_time", "1");
 		params.put("request_no", "4");
 		
+		String ins_id = checkStr(record.getStr("BJ"));
+		
 		JSONObject jsonObject = new JSONObject();
 		
 		JSONObject jsonObjectA = new JSONObject();
-		jsonObjectA.put("AA", checkStr(record.getStr("姓名")));
-		jsonObjectA.put("AB", checkStr(record.getStr("证件类型编码")));
-		jsonObjectA.put("AC", checkStr(record.getStr("证件号码")));
-		jsonObjectA.put("AD", checkStr(record.getStr("性别编码")));
-		jsonObjectA.put("AE", checkStr(record.getStr("出生日期")));
-		jsonObjectA.put("AF", checkStr(record.getStr("联系电话")));
-		jsonObjectA.put("AG", checkStr(record.getStr("电子健康卡号")));
+		jsonObjectA.put("AA", checkStr(record.getStr("AA")));
+		jsonObjectA.put("AB", checkStr(record.getStr("AB")));
+		jsonObjectA.put("AC", checkStr(record.getStr("AC")));
+		jsonObjectA.put("AD", checkStr(record.getStr("AD")));
+		jsonObjectA.put("AE", checkStr(record.getStr("AE")));
+		jsonObjectA.put("AF", checkStr(record.getStr("AF")));
+		jsonObjectA.put("AG", checkStr(record.getStr("AG")));
 
 		JSONObject jsonObjectB = new JSONObject();
-		jsonObjectB.put("BA", checkStr(record.getStr("就诊类型编码")));
-		jsonObjectB.put("BB", checkStr(record.getStr("就诊卡号")));
-		jsonObjectB.put("BC", checkStr(record.getStr("患者编号")));
-		jsonObjectB.put("BD", checkStr(record.getStr("就诊时间")));
-		jsonObjectB.put("BE", checkStr(record.getStr("就诊科室名称")));
-		jsonObjectB.put("BF", checkStr(record.getStr("申请医师名称")));
-		jsonObjectB.put("BG", checkStr(record.getStr("申请医生编码")));
-		jsonObjectB.put("BH", checkStr(record.getStr("主诉")));
-		jsonObjectB.put("BI", checkStr(record.getStr("年龄")));
-		jsonObjectB.put("BJ", "121403004061412685");
-		jsonObjectB.put("BK", "阳泉市第一人民医院");
-		jsonObjectB.put("BL", checkStr(record.getStr("临床诊断名称")));
-		jsonObjectB.put("BM", checkStr(record.getStr("临床诊断代码")));
+		jsonObjectB.put("BA", checkStr(record.getStr("BA")));
+		jsonObjectB.put("BB", checkStr(record.getStr("BB")));
+		jsonObjectB.put("BC", checkStr(record.getStr("BC")));
+		jsonObjectB.put("BD", checkStr(record.getStr("BD")));
+		jsonObjectB.put("BE", checkStr(record.getStr("BE")));
+		jsonObjectB.put("BF", checkStr(record.getStr("BF")));
+		jsonObjectB.put("BG", checkStr(record.getStr("BG")));
+		jsonObjectB.put("BH", checkStr(record.getStr("BH")));
+		jsonObjectB.put("BI", checkStr(record.getStr("BI")));
+		jsonObjectB.put("BJ", checkStr(record.getStr("BJ")));
+		jsonObjectB.put("BK", checkStr(record.getStr("BK")));
+		jsonObjectB.put("BL", checkStr(record.getStr("BL")));
+		jsonObjectB.put("BM", checkStr(record.getStr("BM")));
 
 		JSONObject jsonObjectC = new JSONObject();
-		jsonObjectC.put("CA", checkStr(record.getStr("报告单编号")));
-		jsonObjectC.put("CB", checkStr(record.getStr("标本类型")));
-		jsonObjectC.put("CC", checkStr(record.getStr("检验项目名称")));
-		jsonObjectC.put("CD", checkStr(record.getStr("检测项目类型")));
-		jsonObjectC.put("CE", checkStr(record.getStr("报告医生姓名")));
-		jsonObjectC.put("CF", checkStr(record.getStr("报告医生编码")));
-		jsonObjectC.put("CG", checkStr(record.getStr("审核医师姓名")));
-		jsonObjectC.put("CH", checkStr(record.getStr("审核医师编码")));
-		jsonObjectC.put("CI", checkStr(record.getStr("报告科室名称")));
-		jsonObjectC.put("CJ", checkStr(record.getStr("报告评语")));
-		jsonObjectC.put("CK", checkStr(record.getStr("报告时间")));
-		jsonObjectC.put("CL", checkStr(record.getStr("互认项目编码")));
-		jsonObjectC.put("CM", checkStr(record.getStr("互认项目名称")));
-		jsonObjectC.put("CN", checkStr(record.getStr("报告单")));
+		jsonObjectC.put("CA", checkStr(record.getStr("CA")));
+		jsonObjectC.put("CB", checkStr(record.getStr("CB")));
+		jsonObjectC.put("CC", checkStr(record.getStr("CC")));
+		jsonObjectC.put("CD", checkStr(record.getStr("CD")));
+		jsonObjectC.put("CE", checkStr(record.getStr("CE")));
+		jsonObjectC.put("CF", checkStr(record.getStr("CF")));
+		jsonObjectC.put("CG", checkStr(record.getStr("CG")));
+		jsonObjectC.put("CH", checkStr(record.getStr("CH")));
+		jsonObjectC.put("CI", checkStr(record.getStr("CI")));
+		jsonObjectC.put("CJ", checkStr(record.getStr("CJ")));
+		jsonObjectC.put("CK", checkStr(record.getStr("CK")));
+		jsonObjectC.put("CL", checkStr(record.getStr("CL")));
+		jsonObjectC.put("CM", checkStr(record.getStr("CM")));
+		jsonObjectC.put("CN", checkStr(record.getStr("CN")));
 				
 		JSONArray jsonArrayD = new JSONArray();
 		for (Record itemrecord : items) {
 			JSONObject jsonObjectE = new JSONObject();
-			jsonObjectE.put("EA", checkStr(itemrecord.getStr("检验细项名称中文")));
-			jsonObjectE.put("EB", checkStr(itemrecord.getStr("检验细项缩写")));
-			jsonObjectE.put("EC", checkStr(itemrecord.getStr("检验细项序号")));
-			jsonObjectE.put("ED", checkStr(itemrecord.getStr("检验细项测量值")));
-			jsonObjectE.put("EE", checkStr(itemrecord.getStr("检验细项结果计量单位")));
-			jsonObjectE.put("EF", checkStr(itemrecord.getStr("检验细项结果")));
-			jsonObjectE.put("EG", checkStr(itemrecord.getStr("药敏结果")));
-			jsonObjectE.put("EH", checkStr(itemrecord.getStr("参考范围")));
-			jsonObjectE.put("EI", checkStr(itemrecord.getStr("检测方法")));
-			jsonObjectE.put("EJ", checkStr(itemrecord.getStr("KB")));
-			jsonObjectE.put("EK", checkStr(itemrecord.getStr("MIC")));
-			jsonObjectE.put("EL", checkStr(itemrecord.getStr("敏感度")));
-			jsonObjectE.put("EM", checkStr(itemrecord.getStr("互认项目编码")));
-			jsonObjectE.put("EN", checkStr(itemrecord.getStr("互认项目名称")));
+			jsonObjectE.put("EA", checkStr(itemrecord.getStr("EA")));
+			jsonObjectE.put("EB", checkStr(itemrecord.getStr("EB")));
+			jsonObjectE.put("EC", checkStr(itemrecord.getStr("EC")));
+			jsonObjectE.put("ED", checkStr(itemrecord.getStr("ED")));
+			jsonObjectE.put("EE", checkStr(itemrecord.getStr("EE")));
+			jsonObjectE.put("EF", checkStr(itemrecord.getStr("EF")));
+			jsonObjectE.put("EG", checkStr(itemrecord.getStr("EG")));
+			jsonObjectE.put("EH", checkStr(itemrecord.getStr("EH")));
+			jsonObjectE.put("EI", checkStr(itemrecord.getStr("EI")));
+			jsonObjectE.put("EJ", checkStr(itemrecord.getStr("EJ")));
+			jsonObjectE.put("EK", checkStr(itemrecord.getStr("EK")));
+			jsonObjectE.put("EL", checkStr(itemrecord.getStr("EL")));
+			jsonObjectE.put("EM", checkStr(itemrecord.getStr("EM")));
+			jsonObjectE.put("EN", checkStr(itemrecord.getStr("EN")));
 			jsonArrayD.add(jsonObjectE);
 		}
 		jsonObject.put("A", jsonObjectA);
@@ -274,7 +276,7 @@ public class DataService {
 			e.printStackTrace();
 		}
 
-		String content = postWithParameters(SAVE_LABREPORT_URL, params);
+		String content = postWithParameters(SAVE_LABREPORT_URL, params, ins_id);
 		return content;
 
 	}
@@ -393,6 +395,12 @@ public class DataService {
 		
 	}
 	
+	/**
+	 * 检查post
+	 * @param url
+	 * @param map
+	 * @return
+	 */
 	public static String postWithParameters(String url, Map<String, String> map) {
 
 		FormBody.Builder formbody = new FormBody.Builder();
@@ -416,6 +424,55 @@ public class DataService {
 		}
 	}
 
+	/**
+	 * 检验post
+	 * @param url
+	 * @param map
+	 * @param ins_id
+	 * @return
+	 */
+	public static String postWithParameters(String url, Map<String, String> map,String ins_id) {
+
+		FormBody.Builder formbody = new FormBody.Builder();
+
+		for (Map.Entry<String, String> entry : map.entrySet()) {
+			formbody.add(entry.getKey(), entry.getValue());
+		}
+		RequestBody requestBody = formbody.build();
+		
+		String tokenString = "";
+		switch (ins_id) {
+		//阳煤总院
+		case "12140300MB0351839N":
+			tokenString = "Bearer Zjc3YmIyODBhNjY4ZWZlMzc5MjdiMzFiNWE3MGExODM=";
+			break;
+//	    阳煤二院
+		case "12140300MB13603318":
+			tokenString = "Bearer MmVjOTdjMzI3NTI2OTdkNTM5ZWY0NzU1YjM5NGU5NmU=";
+			break;
+//			阳煤职业病防治院
+		case "12140300MB01513006":
+			tokenString = "Bearer YTM1NzFlOTk1ZTdmZDM2ZDI0ZDQyMWI5NmI0N2ZhN2Q=";
+			break;
+
+		default:
+			break;
+		}
+
+		Request request = new Request.Builder().url(url).post(requestBody).addHeader("Authorization", tokenString).build();
+
+		try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
+			if (!response.isSuccessful())
+				throw new IOException("Unexpected code " + response);
+			String content = response.body().string();
+			return content;
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return null;
+		}
+	}
+
 	public static String getWithUrl(String url, Map<String, String> map) {
 		for (Map.Entry<String, String> entry : map.entrySet()) {
 			String s = url.contains("?") ? "&" : "?";

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

@@ -24,9 +24,9 @@ public class JYTask implements ITask {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
 
-		List<Record> records = Db.use("connected").find("select * from V_LAB_REPORT where 最后更新时间 > ?",parseStringToDate1());
+		List<Record> records = Db.use("local").find("select * from V_LAB_REPORT where CZ > ?",parseStringToDate1());
 		for (Record record : records) {
-			List<Record> itemrecords = Db.use("connected").find("select * from V_LAB_ITEM where 报告单编号 = ?",record.getStr("报告单编号"));
+			List<Record> itemrecords = Db.use("local").find("select * from V_LAB_ITEM where CA = ?",record.getStr("CA"));
 			dService.postLabReport(record,itemrecords);
 		}