diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index 44030e8..7a346d1 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -26,7 +26,7 @@ public class LymsEncodeUtil { String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt); - String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4BCB0B8BBABA86F0708151BE6D196C9E96ED08D7D1CEACE8584EAB3D90C3637802", key); + String json = aesDecrypt("522E50C6944F903BCAAF46E5078F8A517CEC505DC2BA5ABA52E16CC7A5593909", key); System.out.println("解密后：" + json); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index fffe060..a226151 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -558,6 +558,8 @@ public class RiskReportFacade { map.put("data",items); series.add(map); + + // List> bfbItem = new ArrayList<>(); // // if (CollectionUtils.isNotEmpty(series)) @@ -589,6 +591,8 @@ public class RiskReportFacade { // bfb.add(MathUtil.getProportion(Integer.valueOf(String.valueOf(obj)),total); // } // } + + } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index ac51904..c8926f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -42,7 +42,7 @@ import java.util.*; @Service("syncDataTaskService") public class SyncDataTaskService { - private static final Map urls = new HashMap<>(); + private static final Map urls = new LinkedHashMap<>(); static { @@ -54,7 +54,7 @@ public class SyncDataTaskService { urls.put("rp-hbnq-api.healthbaby.com.cn:18019","内丘"); urls.put("area-chengde-api.healthbaby.com.cn:12356","承德"); urls.put("area-kaifeng-api.healthbaby.com.cn:12356","开封"); -// urls.put("area-weixian-api.healthbaby.com.cn:12356","威县"); + urls.put("area-weixian-api.healthbaby.com.cn:12356","威县"); urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院"); } @@ -160,6 +160,7 @@ public class SyncDataTaskService { for (final String url : urls.keySet()) { try{ + System.out.println(" areaurl = "+ url ); String areaName = urls.get(url); String json = HttpClientUtil.doPost("https://"+url+"/findSyncData", new HashMap(), "utf-8"); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(json)) @@ -844,102 +845,107 @@ public class SyncDataTaskService { public static void main(String[] a) throws Exception { // new SyncDataTaskService().syncQhdfyCsv(); - List list = FileUtils.readLines(new File("D:\\qhd-jd.csv"), "utf-8"); - int linenum = 0; - DateTime dt = new DateTime(); - Set set = new HashSet<>(); - Map riskMap = buildRiskMap(); - int riskcount = 0; - int risktotalcount = 0; - for (String line : list) { - linenum++; - if (linenum > 14035) { - break; - } - try { - int tempIndex = line.indexOf(",,,,,,,,,,,,,,,"); - line = line.substring(0, tempIndex + 1); - String ss[] = line.split(","); - Patients patients = new Patients(); - patients.setServiceStatus(0); - patients.setServiceType(0); - patients.setType(1); - patients.setPcountryId("0da4334f-49e7-4180-b690-5cea668f75e9"); - patients.setPnationId("a628ab3a-1e0c-4219-ab14-a14636c5cdaa"); - patients.setPcerteTypeId("57e1dcd3f0f02e7ca519d6c6"); - patients.setBuildType(0); - patients.setYn(1); - System.out.println(ss[3].trim()); - patients.setAge(Integer.valueOf(ss[3].trim())); - DateTime agetime = dt.minusYears(Integer.valueOf(ss[3].trim())); - patients.setBirth(agetime.toDate()); - // 末次月经6,7,8 - String month = ss[7].trim(); - if (month.length() == 1) { - month = "0" + month; - } - String day = ss[8].trim(); - if (day.length() == 1) { - day = "0" + day; - } - patients.setLastMenses(DateUtil.getYmdhmDate("20" + ss[6].trim() + month + day + "0000")); - // > 41zhou - if (DateUtil.getWeek(patients.getLastMenses(), new Date()) > 41) { - continue; - } - // 预产期9,10,11 - month = ss[10].trim(); - if (month.length() == 1) { - month = "0" + month; - } - day = ss[11].trim(); - if (day.length() == 1) { - day = "0" + day; - } - patients.setDueDate(DateUtil.getYmdhmDate("20" + ss[9].trim() + month + day + "0000")); - - // 风险因素13 - String risks = ss[13].trim().replace(" ", " "); - if (risks != null && risks.length() > 1) { - Integer score = 0; - patients.setLastRhTime(patients.getBookbuildingDate()); - String[] riskArray = risks.split(" |\\+"); - for (String r : riskArray) { - risktotalcount++; - boolean boo = true; - for (String s : riskMap.keySet()) { - if (s.indexOf(r) >= 0 || r.indexOf(s) >= 0) { - riskcount++; - boo = false; - break; - } - } - if (boo) { - set.add(r); - } - } - } -// System.out.println(JsonUtil.obj2JsonString(patients)); - } catch (Exception e) { -// e.printStackTrace(); - } - } - Map map = new HashMap<>(); - System.out.println("riskcount:" + riskcount); - System.out.println("risktotalcount:" + risktotalcount); - for (String s : set) { - System.out.println(s); - } +// List list = FileUtils.readLines(new File("D:\\qhd-jd.csv"), "utf-8"); +// int linenum = 0; +// DateTime dt = new DateTime(); +// Set set = new HashSet<>(); +// Map riskMap = buildRiskMap(); +// int riskcount = 0; +// int risktotalcount = 0; +// for (String line : list) { +// linenum++; +// if (linenum > 14035) { +// break; +// } +// try { +// int tempIndex = line.indexOf(",,,,,,,,,,,,,,,"); +// line = line.substring(0, tempIndex + 1); +// String ss[] = line.split(","); +// Patients patients = new Patients(); +// patients.setServiceStatus(0); +// patients.setServiceType(0); +// patients.setType(1); +// patients.setPcountryId("0da4334f-49e7-4180-b690-5cea668f75e9"); +// patients.setPnationId("a628ab3a-1e0c-4219-ab14-a14636c5cdaa"); +// patients.setPcerteTypeId("57e1dcd3f0f02e7ca519d6c6"); +// patients.setBuildType(0); +// patients.setYn(1); +// System.out.println(ss[3].trim()); +// patients.setAge(Integer.valueOf(ss[3].trim())); +// DateTime agetime = dt.minusYears(Integer.valueOf(ss[3].trim())); +// patients.setBirth(agetime.toDate()); +// // 末次月经6,7,8 +// String month = ss[7].trim(); +// if (month.length() == 1) { +// month = "0" + month; +// } +// String day = ss[8].trim(); +// if (day.length() == 1) { +// day = "0" + day; +// } +// patients.setLastMenses(DateUtil.getYmdhmDate("20" + ss[6].trim() + month + day + "0000")); +// // > 41zhou +// if (DateUtil.getWeek(patients.getLastMenses(), new Date()) > 41) { +// continue; +// } +// // 预产期9,10,11 +// month = ss[10].trim(); +// if (month.length() == 1) { +// month = "0" + month; +// } +// day = ss[11].trim(); +// if (day.length() == 1) { +// day = "0" + day; +// } +// patients.setDueDate(DateUtil.getYmdhmDate("20" + ss[9].trim() + month + day + "0000")); +// +// // 风险因素13 +// String risks = ss[13].trim().replace(" ", " "); +// if (risks != null && risks.length() > 1) { +// Integer score = 0; +// patients.setLastRhTime(patients.getBookbuildingDate()); +// String[] riskArray = risks.split(" |\\+"); +// for (String r : riskArray) { +// risktotalcount++; +// boolean boo = true; +// for (String s : riskMap.keySet()) { +// if (s.indexOf(r) >= 0 || r.indexOf(s) >= 0) { +// riskcount++; +// boo = false; +// break; +// } +// } +// if (boo) { +// set.add(r); +// } +// } +// } +//// System.out.println(JsonUtil.obj2JsonString(patients)); +// } catch (Exception e) { +//// e.printStackTrace(); +// } +// } +// Map map = new HashMap<>(); +// System.out.println("riskcount:" + riskcount); +// System.out.println("risktotalcount:" + risktotalcount); +// for (String s : set) { +// System.out.println(s); +// } +// +// AntExChuModel chuModel = new AntExChuModel(); +// chuModel.setLastMenses(new Date()); +// Map omap = ReflectionUtils.getUpdateField(chuModel); +// for (String key : omap.keySet()) { +// System.out.println(key + "--" + omap.get(key)); +// } +// UpdateMultiData data = new UpdateMultiData(); +// data.setUpdate(omap); +// System.out.println(JsonUtil.obj2Str(data)); - AntExChuModel chuModel = new AntExChuModel(); - chuModel.setLastMenses(new Date()); - Map omap = ReflectionUtils.getUpdateField(chuModel); - for (String key : omap.keySet()) { - System.out.println(key + "--" + omap.get(key)); + for (final String url : urls.keySet()) + { + System.out.println(url); } - UpdateMultiData data = new UpdateMultiData(); - data.setUpdate(omap); - System.out.println(JsonUtil.obj2Str(data)); } private static Map buildRiskMap() {