commit

DataFusion/res/config.properties

@@ -1,8 +1,8 @@
 #DB-connected partners
 #jdbcUrl_connected  = jdbc:sqlserver://192.168.17.58:1433;DatabaseName=visionpacs
-jdbcUrl_connected  = jdbc:oracle:thin:@10.10.100.10:1521:orcl
-user_connected 	   = yyxhr
-password_connected = yyxhr
+jdbcUrl_connected  = jdbc:sqlserver://10.167.10.55:3306;DatabaseName=gecris
+user_connected 	   = cloud
+password_connected = cloud
 
 #DB-connected partners
 jdbcUrl_print  = jdbc:sqlserver://200.200.200.163:1433;DatabaseName=DICOMSOFT
@@ -11,8 +11,8 @@ user_print 	   = zskk
 password_print = zskk
 
 #DATA-Parms
-institution_id     = 121403004061412685
-institution_key    = 837ffb03803b72cd99a941770fb6b2be
+institution_id     = 12140300MB0351839N
+institution_key    = ac1a9f0d15758b237c0136216b3ffd3c
 #OSS
 oss_endpoint       = https://oss-cn-beijing.aliyuncs.com
 oss_accessKey      = LTAI5tLyAFqdCs9qxxhHRFwG

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

@@ -82,7 +82,7 @@ public class ZskkConfig extends JFinalConfig {
 
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new OracleDialect());
+		arpConnected.setDialect(new MysqlDialect());
 		me.add(arpConnected);
 		
 //		// 配置数据库连接池插件
@@ -109,10 +109,10 @@ 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();

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

@@ -23,6 +23,7 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
@@ -91,7 +92,7 @@ public class ViewController extends Controller {
             druidPluginConnected.start();
 			// 配置ActiveRecord插件
 			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-			arpConnected.setDialect(new OracleDialect());
+			arpConnected.setDialect(new MysqlDialect());
 			arpConnected.start();
 
 		} catch (Exception e) {

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

@@ -61,94 +61,6 @@ public class DataService {
 
 	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
 	
-	
-	
-//	/**
-//	 * 互认-检查信息
-//	 * 
-//	 * @param instutionId
-//	 * @param number
-//	 */
-//	public static String postExamInfo(com.jfinal.plugin.activerecord.Record record) {
-//		Map<String, String> params = new HashMap<>();
-//		params.put("request_time", "1");
-//		params.put("request_no", "2");
-//		
-//		JSONObject jsonObject = new JSONObject();
-//		JSONObject jsonObjectA = new JSONObject();
-//		jsonObjectA.put("AA", "张治勤");
-//		jsonObjectA.put("AB", "01");
-//		jsonObjectA.put("AC", "140302194905040815");
-//		jsonObjectA.put("AD", "1");
-//		jsonObjectA.put("AE", "1949-05-04 00:00:00");
-//		jsonObjectA.put("AF", "15333038893");
-//		jsonObjectA.put("AG", "");
-//		
-//
-//		JSONObject jsonObjectB = new JSONObject();
-//		jsonObjectB.put("BA", "");
-//		jsonObjectB.put("BB", "1810151251");
-//		jsonObjectB.put("BC", "382346");
-//		jsonObjectB.put("BD", "CT-926658");
-//		jsonObjectB.put("BE", "2025-05-27 17:57:00");
-//		jsonObjectB.put("BF", "急诊科");
-//		jsonObjectB.put("BG", "郭占杰");
-//		jsonObjectB.put("BH", "636");
-//		jsonObjectB.put("BI", "");
-//		jsonObjectB.put("BJ", "76岁");
-//		jsonObjectB.put("BK", "121403004061412685");
-//		jsonObjectB.put("BL", "阳泉市第一人民医院");
-//		jsonObjectB.put("BM", "");
-//		jsonObjectB.put("BN", "");
-//
-//
-//		JSONObject jsonObjectC = new JSONObject();
-//		jsonObjectC.put("CA", "84090050");
-//		jsonObjectC.put("CB", "25004415784");
-//		jsonObjectC.put("CC", "CT");
-//		jsonObjectC.put("CD", "CT检查（首部位）");
-//		jsonObjectC.put("CE", "228929");
-//		jsonObjectC.put("CF", "");
-//		jsonObjectC.put("CG", "头颅CT平扫");
-//		jsonObjectC.put("CH", "B020ZYZZZ-00");
-//		jsonObjectC.put("CI", "2025-05-27 18:04:00");
-//		jsonObjectC.put("CJ", "1");
-//		jsonObjectC.put("CK", "");
-//		jsonObjectC.put("CL", "");
-//		jsonObjectC.put("CM", "84090050");
-//		jsonObjectC.put("CN", "CT-926658");
-//		jsonObjectC.put("CO", "3");
-//
-//		jsonObject.put("A", jsonObjectA);
-//		jsonObject.put("B", jsonObjectB);
-//		jsonObject.put("C", jsonObjectC);
-//		try {
-//			String bbString= jsonObject.toJSONString();
-//	        String encodedString = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
-//
-//			String aaString= SM4Utils.sm4Encrypt("zLxapoeqWYpoeqWY",encodedString);
-//			System.out.println(bbString);
-//            System.out.println(aaString);
-//			
-//
-//		} catch (CryptoException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		try {
-//	        String encodedString = Base64.getEncoder().encodeToString(jsonObject.toJSONString().getBytes());
-//
-//			params.put("data", SM4Utils.sm4Encrypt("zLxapoeqWYpoeqWY",encodedString));
-//		} catch (CryptoException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//
-//		String content = postWithParameters(SAVE_EXAMINFO_URL, params);
-//		return content;
-//
-//	}
-	
 	/**
 	 * 互认-检查信息
 	 * 
@@ -162,48 +74,48 @@ public class DataService {
 		
 		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", checkStr(record.getStr("年龄")));
-		jsonObjectB.put("BK", "121403004061412685");
-		jsonObjectB.put("BL", "阳泉市第一人民医院");
-		jsonObjectB.put("BM", checkStr(record.getStr("临床诊断名称")));
-		jsonObjectB.put("BN", 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", "12140300MB0351839N");
+		jsonObjectB.put("BL", "阳泉煤业（集团）有限责任公司总医院");
+		jsonObjectB.put("BM", checkStr(record.getStr("BM")));
+		jsonObjectB.put("BN", checkStr(record.getStr("BN")));
 
 
 		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("检查UID")));
-		jsonObjectC.put("CN", checkStr(record.getStr("检查号")));
-		jsonObjectC.put("CO", 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")));
+		jsonObjectC.put("CO", checkStr(record.getStr("CO")));
 
 		jsonObject.put("A", jsonObjectA);
 		jsonObject.put("B", jsonObjectB);
@@ -490,7 +402,7 @@ public class DataService {
 		}
 		RequestBody requestBody = formbody.build();
 
-		Request request = new Request.Builder().url(url).post(requestBody).addHeader("Authorization", "Bearer ZTFiZGFhNjlkMGU2YzE4NzJmYWE5ZDZkNzhiOGU0YWU=").build();
+		Request request = new Request.Builder().url(url).post(requestBody).addHeader("Authorization", "Bearer Zjc3YmIyODBhNjY4ZWZlMzc5MjdiMzFiNWE3MGExODM=").build();
 
 		try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
 			if (!response.isSuccessful())