diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java index 4c56493..733f88d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java @@ -1205,8 +1205,10 @@ public class JdbcUtil { if (buildHospitalId != null && !"".equals(buildHospitalId)) { - String hname = getString(getOralceSingleObjBySql("select h_name from plat_hospital h where h.h_isvalid=1 and h_id = '" + buildHospitalId + "'")); - String id = getString(getMysqlSingleObjBySql("select id from organization where name = '" + hname + "'")); + String hname = getPatHosptalById(buildHospitalId); +// String hname = getString(getOralceSingleObjBySql("select h_name from plat_hospital h where h.h_isvalid=1 and h_id = '" + buildHospitalId + "'")); +// String id = getString(getMysqlSingleObjBySql("select id from organization where name = '" + hname + "'")); + String id = getOrgIdByName(hname); model.setHospitalId(id); } @@ -1218,7 +1220,8 @@ public class JdbcUtil { String dueTypeId = getString(map.get("PI_FENMIAN")); if (dueTypeId != null && !"".equals(dueTypeId)) { - String name = getString(getOralceSingleObjBySql("select pd.dc_name from Plat_Datacontent pd where pd.dc_id='" + dueTypeId + "'")); + String name = getDataContentByById(dueTypeId); + //String name = getString(getOralceSingleObjBySql("select pd.dc_name from Plat_Datacontent pd where pd.dc_id='" + dueTypeId + "'")); model.setDueType(FmTypeEnums.getIdByName(name)); } @@ -1231,8 +1234,10 @@ public class JdbcUtil { String doctorId = getString(map.get("PI_CREATEOPER")); if (doctorId != null && !"".equals(doctorId)) { - String hname = getString(getOralceSingleObjBySql("select e.e_name from mommy_employee e where e.e_id = '" + doctorId + "'")); - String id = getString(getMysqlSingleObjBySql("select id from users where name = '" + hname + "'")); + String hname = getEmpNameById(doctorId); + //String hname = getString(getOralceSingleObjBySql("select e.e_name from mommy_employee e where e.e_id = '" + doctorId + "'")); + //String id = getString(getMysqlSingleObjBySql("select id from users where name = '" + hname + "'")); + String id = getUserIdByName(hname); model.setBuildDoctor(id); } @@ -1324,7 +1329,8 @@ public class JdbcUtil { String hname = getString(map.get("CER_EXAMINHOSPITAL")); if (hname != null && !"".equals(hname)) { - String id = getString(getMysqlSingleObjBySql("select id from organization where name = '" + hname + "'")); + String id = getOrgIdByName(hname); + //String id = getString(getMysqlSingleObjBySql("select id from organization where name = '" + hname + "'")); checkModel.setHospitalId(id); } checkModel.setCreated(getDate(map.get("CER_CREATETIME"))); @@ -1334,7 +1340,8 @@ public class JdbcUtil { String doctorName = getString(map.get("CER_DOCTORSIGNATURE")); if (doctorName != null && !"".equals(doctorName)) { - String id = getString(getMysqlSingleObjBySql("select id from users where name = '" + doctorName + "'")); + String id = getUserIdByName(doctorName); + // String id = getString(getMysqlSingleObjBySql("select id from users where name = '" + doctorName + "'")); checkModel.setCheckDoctor(id); } @@ -1528,7 +1535,7 @@ public class JdbcUtil { } } - public void syncDataBaby(String hid, MongoTemplate mongoTemplate) { + public static void syncDataBaby(String hid, MongoTemplate mongoTemplate) { try { syncBabyData(hid, mongoTemplate); } catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 6bd5111..bd0cc88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -99,22 +99,23 @@ public class TestController { @ResponseBody public String syncData(@RequestParam(required = true) final String oracleHid,@RequestParam(required = true) final Integer mysqlHid) { final MongoTemplate template = mongoTemplate; -// new Thread(new Runnable() { -// @Override -// public void run() { -// System.out.print("同步开始儿童>>>>>>>>>>>>>>>>>>>>>>>>>"); -// new com.lyms.platform.biz.JdbcUtil().syncDataBaby(hid, template); -// System.out.print("同步结束儿童>>>>>>>>>>>>>>>>>>>>>>>>>"); -// } -// }).start(); + JdbcUtil.initData(mysqlHid); System.out.println("initData------"); - System.out.println("同步开始孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>"); - JdbcUtil.syncDataPat(oracleHid, template); - System.out.println("同步结束孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>"); + new Thread(new Runnable() { + @Override + public void run() { + System.out.print("同步开始儿童>>>>>>>>>>>>>>>>>>>>>>>>>"); + JdbcUtil.syncDataBaby(oracleHid, template); + System.out.print("同步结束儿童>>>>>>>>>>>>>>>>>>>>>>>>>"); + } + }).start(); +// System.out.println("同步开始孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>"); +// JdbcUtil.syncDataPat(oracleHid, template); +// System.out.println("同步结束孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>"); return "starting..........."; } }