From 163a86edd883ea531dd1b3baee18747938f1240a Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 25 Apr 2017 18:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0soureceid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/index/restore/data/ConvertHelper.java | 427 ++++++++++++++++----- .../job/index/restore/data/SyncDataWork.java | 12 +- 2 files changed, 340 insertions(+), 99 deletions(-) diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java index 1dc7f96..3a44133 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/ConvertHelper.java @@ -1,15 +1,12 @@ package com.lyms.platform.job.index.restore.data; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import java.util.*; +import com.lyms.platform.common.enums.FetalEnums; +import com.lyms.platform.common.enums.FetalPositionEnums; +import com.lyms.platform.common.enums.JoinEnums; +import com.lyms.platform.job.index.model.Placenta; import org.apache.commons.collections.CollectionUtils; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.support.EncodedResource; @@ -32,17 +29,19 @@ import com.lymsh.mommybaby.maindata.model.Reports; /** * Created by Administrator on 2016/9/29 0029. */ -public class ConvertHelper { +public class ConvertHelper +{ - private static String AUTO_WORKER = "system-worker"; + private static String AUTO_WORKER = "system-worker"; - private static final String YES_OR_NO = "yesOrNo"; + private static final String YES_OR_NO = "yesOrNo"; private static java.util.Map> cachedField = new HashMap<>(); - private static final Map content = new HashMap<>(); + private static final Map content = new HashMap<>(); - static { + static + { content.put("ycxjbs", "遗传性疾病史"); content.put("jsjbs", "精神疾病史"); content.put("xtjx", "先天畸形"); @@ -93,18 +92,22 @@ public class ConvertHelper { } - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { + static + { + try + { properties = PropertiesLoaderUtils.loadProperties(new EncodedResource(new ClassPathResource( - "lable.properties"), "utf8")); - } catch (Exception e) { + "lable.properties"), "utf8")); + } catch (Exception e) + { e.printStackTrace(); } } - public static com.lymsh.mommybaby.maindata.model.Patients convertToMamiBaby(BabyModel babyModel) { + public static com.lymsh.mommybaby.maindata.model.Patients convertToMamiBaby(BabyModel babyModel) + { com.lymsh.mommybaby.maindata.model.Patients patients = new com.lymsh.mommybaby.maindata.model.Patients(); //新生儿类型为2 patients.setType(2); @@ -123,7 +126,8 @@ public class ConvertHelper { return patients; } - public static Reports convertToBabyCheck(BabyCheckModel babyCheckModel, BabyModel babyModel) { + public static Reports convertToBabyCheck(BabyCheckModel babyCheckModel, BabyModel babyModel) + { Reports reports = new Reports(); reports.setYn(babyCheckModel.getYn()); reports.setType(2); @@ -137,7 +141,8 @@ public class ConvertHelper { * @param patients * @return */ - public static com.lymsh.mommybaby.maindata.model.Patients convertPatient(Patients patients) { + public static com.lymsh.mommybaby.maindata.model.Patients convertPatient(Patients patients) + { com.lymsh.mommybaby.maindata.model.Patients localPatient = new com.lymsh.mommybaby.maindata.model.Patients(); localPatient.setDueDate(patients.getDueDate()); localPatient.setCreated(patients.getCreated()); @@ -165,7 +170,8 @@ public class ConvertHelper { * @param users * @return */ - public static DoctorUsers convertUsers(com.lyms.platform.permission.model.Users users) { + public static DoctorUsers convertUsers(com.lyms.platform.permission.model.Users users) + { DoctorUsers users1 = new DoctorUsers(); users1.setCreated(users.getCreated()); users1.setModified(users.getModified()); @@ -188,7 +194,8 @@ public class ConvertHelper { * @param organization * @return */ - public static Hospitals convertHospital(Organization organization) { + public static Hospitals convertHospital(Organization organization) + { Hospitals hospitals = new Hospitals(); hospitals.setCreated(organization.getCreated()); hospitals.setModified(organization.getModified()); @@ -204,7 +211,8 @@ public class ConvertHelper { hospitals.setPublishName(AUTO_WORKER); hospitals.setOnline(0); //院内系统设置医院为试运行 正式运行的时候需要设置医院online - if (null != organization.getStatus() && (0 == organization.getStatus() || 1 == organization.getStatus())) { + if (null != organization.getStatus() && (0 == organization.getStatus() || 1 == organization.getStatus())) + { hospitals.setOnline(1); } return hospitals; @@ -216,7 +224,8 @@ public class ConvertHelper { * @param antExChuModel * @return */ - public static Reports convertAntExChu(AntExChuModel antExChuModel, Date lastMenses, Map map, String doctorUserName) { + public static Reports convertAntExChu(AntExChuModel antExChuModel, Date lastMenses, Map map, String doctorUserName) + { Reports reports = new Reports(); //孕期类型 reports.setType(1); @@ -244,7 +253,8 @@ public class ConvertHelper { * @return */ public static Reports convertAntExChu(AntenatalExaminationModel antExChuModel, Date lastMenses, - Map rhMap, String doctorUserName) { + Map rhMap, String doctorUserName) + { Reports reports = new Reports(); //孕期类型 reports.setType(1); @@ -272,37 +282,46 @@ public class ConvertHelper { * @return */ private static String convertAntExChuResult(AntExChuModel antExChuModel, Map bgMap, - String doctorUserName) { + String doctorUserName) + { List list = new ArrayList(); List list2 = getField(antExChuModel); - for (int i = 0; i < list2.size(); i++) { + for (int i = 0; i < list2.size(); i++) + { Object obj = ReflectionUtils.getFieldValue(antExChuModel, list2.get(i)); String key = properties.getProperty(list2.get(i)); java.util.Map dataMap = new HashMap<>(); - if (null != key) { - if ("血压".equals(key)) { + if (null != key) + { + if ("血压".equals(key)) + { Map map = JsonUtil.str2Obj(antExChuModel.getBp(), Map.class); - if (null != map) { + if (null != map) + { String ssy = null; String szy = null; Object obj1 = map.get("ssy"); - if (null != obj1) { + if (null != obj1) + { //低压 ssy = map.get("ssy").toString(); } obj1 = map.get("szy"); - if (null != obj1) { + if (null != obj1) + { szy = map.get("szy").toString(); } //高压 - if (StringUtils.isNotEmpty(szy)) { + if (StringUtils.isNotEmpty(szy)) + { java.util.Map dataMap1 = new HashMap<>(); dataMap1.put("k", "血压低压"); dataMap1.put("v", szy + "mmHg"); list.add(dataMap1); } - if (StringUtils.isNotEmpty(ssy)) { + if (StringUtils.isNotEmpty(ssy)) + { dataMap.put("k", "血压（高）"); dataMap.put("v", ssy + "mmHg"); list.add(dataMap); @@ -311,22 +330,29 @@ public class ConvertHelper { continue; } //高危 - if ("高危因素".equals(key)) { + if ("高危因素".equals(key)) + { List map = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - if (CollectionUtils.isNotEmpty(map)) { + if (CollectionUtils.isNotEmpty(map)) + { StringBuilder sb = new StringBuilder(); - for (Object str : map) { - if (null != str && org.apache.commons.lang.StringUtils.isNotEmpty(str.toString())) { + for (Object str : map) + { + if (null != str && org.apache.commons.lang.StringUtils.isNotEmpty(str.toString())) + { String val = bgMap.get(str.toString()); - if (org.apache.commons.lang.StringUtils.isNotEmpty(val)) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(val)) + { sb.append(val).append("、"); } } } - if (null != antExChuModel.getOtherHighRisk() && !"{}".equals(antExChuModel.getOtherHighRisk())) { + if (null != antExChuModel.getOtherHighRisk() && !"{}".equals(antExChuModel.getOtherHighRisk())) + { Map map1 = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); Object rh = map1.get("fxysu"); - if (null != rh && StringUtils.isNotEmpty(rh.toString())) { + if (null != rh && StringUtils.isNotEmpty(rh.toString())) + { sb.append(rh); } } @@ -337,25 +363,103 @@ public class ConvertHelper { list.add(dataMap1); } continue; + } else if ("胎盘".equals(key)) + { + if (CollectionUtils.isNotEmpty(antExChuModel.getPlacentas())) + { + String heartRateVal="",fetalPositionVal="",fetalPresentationVal="",joinVal=""; + for (int j =0; j < antExChuModel.getPlacentas().size(); j++) + { + LinkedHashMap map = (LinkedHashMap) antExChuModel.getPlacentas().get(j); + //胎先露、胎方位、胎心率和衔接 + String heartRate = String.valueOf(map.get("heartRate")); + String fetalPosition = String.valueOf(map.get("fetalPosition")); + String fetalPresentation =String.valueOf(map.get("fetalPresentation")); + String join = String.valueOf(map.get("join")); + if(StringUtils.isNotEmpty(heartRate)){ + heartRateVal+=heartRate+"次/分"+","; + } + if(StringUtils.isNotEmpty(fetalPosition)){ + fetalPositionVal+= FetalPositionEnums.getTitle(fetalPosition)+","; + } + if(StringUtils.isNotEmpty(fetalPresentation)){ + fetalPresentationVal+= FetalEnums.getTitle(fetalPresentation)+","; + } + if(StringUtils.isNotEmpty(join)){ + joinVal+=JoinEnums.getTitle(join)+","; + } + } + if(heartRateVal.endsWith(",")){ + heartRateVal=heartRateVal.substring(0,heartRateVal.length()-1); + } + if(fetalPositionVal.endsWith(",")){ + fetalPositionVal=fetalPositionVal.substring(0,fetalPositionVal.length()-1); + } + if(fetalPresentationVal.endsWith(",")){ + fetalPresentationVal=fetalPresentationVal.substring(0,fetalPresentationVal.length()-1); + } + if(joinVal.endsWith(",")){ + joinVal=joinVal.substring(0,joinVal.length()-1); + } + + //胎心率 + if(StringUtils.isNotEmpty(heartRateVal)){ + java.util.Map dataMap1 = new HashMap<>(); + dataMap1.put("k", "胎心率"); + dataMap1.put("v", heartRateVal); + list.add(dataMap1); + } + //胎心率 + if(StringUtils.isNotEmpty(fetalPositionVal)) + { + java.util.Map dataMap2 = new HashMap<>(); + dataMap2.put("k", "胎方位"); + dataMap2.put("v", fetalPositionVal); + list.add(dataMap2); + } + + //胎先露 + if(StringUtils.isNotEmpty(fetalPresentationVal)) + { + java.util.Map dataMap3 = new HashMap<>(); + dataMap3.put("k", "胎先露"); + dataMap3.put("v", fetalPresentationVal); + list.add(dataMap3); + } + if(StringUtils.isNotEmpty(joinVal)) + { + java.util.Map dataMap4 = new HashMap<>(); + dataMap4.put("k", "衔接"); + dataMap4.put("v", joinVal); + list.add(dataMap4); + } + } + continue; } dataMap.put("k", key); - if ("产检医生".equals(key)) { + if ("产检医生".equals(key)) + { obj = doctorUserName; dataMap.put("v", obj); list.add(dataMap); continue; } - if (obj instanceof Date) { + if (obj instanceof Date) + { dataMap.put("v", DateUtil.getyyyy_MM_dd((Date) obj)); - } else { + } else + { String str = getAntExChuValue(key, antExChuModel); - if (null != str) { + if (null != str) + { dataMap.put("v", str); - } else { + } else + { dataMap.put("v", obj); } } - if (null != obj) { + if (null != obj) + { list.add(dataMap); } } @@ -364,37 +468,46 @@ public class ConvertHelper { } private static String convertAntExResult(AntenatalExaminationModel antExChuModel, Map hrMap, - String doctorUserName) { + String doctorUserName) + { List list = new ArrayList(); List list2 = getField(antExChuModel); - for (int i = 0; i < list2.size(); i++) { + for (int i = 0; i < list2.size(); i++) + { Object obj = ReflectionUtils.getFieldValue(antExChuModel, list2.get(i)); String key = properties.getProperty(list2.get(i)); java.util.Map dataMap = new HashMap<>(); - if (null != key) { - if ("血压".equals(key)) { + if (null != key) + { + if ("血压".equals(key)) + { Map map = JsonUtil.str2Obj(antExChuModel.getBp(), Map.class); - if (null != map) { + if (null != map) + { String ssy = null; String szy = null; Object obj1 = map.get("ssy"); - if (null != obj1) { + if (null != obj1) + { //低压 ssy = map.get("ssy").toString(); } obj1 = map.get("szy"); - if (null != obj1) { + if (null != obj1) + { szy = map.get("szy").toString(); } - if (StringUtils.isNotEmpty(szy)) { + if (StringUtils.isNotEmpty(szy)) + { java.util.Map dataMap1 = new HashMap<>(); dataMap1.put("k", "血压(低压)"); dataMap1.put("v", szy + "mmHg"); list.add(dataMap1); } - if (StringUtils.isNotEmpty(ssy)) { + if (StringUtils.isNotEmpty(ssy)) + { dataMap.put("k", "高压"); dataMap.put("v", ssy + "mmHg"); list.add(dataMap); @@ -403,22 +516,29 @@ public class ConvertHelper { continue; } //高危 - else if ("高危因素".equals(key)) { + else if ("高危因素".equals(key)) + { List map = JsonUtil.toList(antExChuModel.getRiskFactor(), List.class); - if (CollectionUtils.isNotEmpty(map)) { + if (CollectionUtils.isNotEmpty(map)) + { StringBuilder sb = new StringBuilder(); - for (Object str : map) { - if (org.apache.commons.lang.StringUtils.isNotEmpty(str.toString())) { + for (Object str : map) + { + if (null!=str&&org.apache.commons.lang.StringUtils.isNotEmpty(str.toString())) + { String val = hrMap.get(str.toString()); - if (org.apache.commons.lang.StringUtils.isNotEmpty(val)) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(val)) + { sb.append(val).append("、"); } } } - if (null != antExChuModel.getOtherRisk() && !"{}".equals(antExChuModel.getOtherRisk())) { + if (null != antExChuModel.getOtherRisk() && !"{}".equals(antExChuModel.getOtherRisk())) + { Map map1 = JsonUtil.str2Obj(antExChuModel.getOtherRisk(), Map.class); Object rh = map1.get("fxysu"); - if (null != rh && StringUtils.isNotEmpty(rh.toString())) { + if (null != rh && StringUtils.isNotEmpty(rh.toString())) + { sb.append(rh); } } @@ -429,17 +549,94 @@ public class ConvertHelper { list.add(dataMap1); } continue; - } else if ("产检医生".equals(key)) { + } else if ("产检医生".equals(key)) + { obj = doctorUserName; + } else if ("胎盘".equals(key)) + { + if (CollectionUtils.isNotEmpty(antExChuModel.getTireData())) + { + String heartRateVal="",fetalPositionVal="",fetalPresentationVal="",joinVal=""; + for (int j =0; j < antExChuModel.getTireData().size(); j++) + { + LinkedHashMap map = (LinkedHashMap) antExChuModel.getTireData().get(j); + //胎先露、胎方位、胎心率和衔接 + String heartRate = String.valueOf(map.get("heartRate")); + String fetalPosition = String.valueOf(map.get("fetalPosition")); + String fetalPresentation =String.valueOf(map.get("fetalPresentation")); + String join = String.valueOf(map.get("join")); + if(!"null".equals(heartRate) &&StringUtils.isNotEmpty(heartRate)){ + heartRateVal+=heartRate+"次/分"+","; + } + if(!"null".equals(fetalPosition) &&StringUtils.isNotEmpty(fetalPosition)){ + fetalPositionVal+= FetalPositionEnums.getTitle(fetalPosition)+","; + } + if(!"null".equals(fetalPresentation) &&StringUtils.isNotEmpty(fetalPresentation)){ + fetalPresentationVal+= FetalEnums.getTitle(fetalPresentation)+","; + } + if(!"null".equals(join) &&StringUtils.isNotEmpty(join)){ + joinVal+=JoinEnums.getTitle(join)+","; + } + } + if(heartRateVal.endsWith(",")){ + heartRateVal=heartRateVal.substring(0,heartRateVal.length()-1); + } + if(fetalPositionVal.endsWith(",")){ + fetalPositionVal=fetalPositionVal.substring(0,fetalPositionVal.length()-1); + } + if(fetalPresentationVal.endsWith(",")){ + fetalPresentationVal=fetalPresentationVal.substring(0,fetalPresentationVal.length()-1); + } + if(joinVal.endsWith(",")){ + joinVal=joinVal.substring(0,joinVal.length()-1); + } + + + //胎心率 + if(StringUtils.isNotEmpty(heartRateVal)){ + java.util.Map dataMap1 = new HashMap<>(); + dataMap1.put("k", "胎心率"); + dataMap1.put("v", heartRateVal); + list.add(dataMap1); + } + //胎心率 + if(StringUtils.isNotEmpty(fetalPositionVal)) + { + java.util.Map dataMap2 = new HashMap<>(); + dataMap2.put("k", "胎方位"); + dataMap2.put("v", fetalPositionVal); + list.add(dataMap2); + } + + //胎先露 + if(StringUtils.isNotEmpty(fetalPresentationVal)) + { + java.util.Map dataMap3 = new HashMap<>(); + dataMap3.put("k", "胎先露"); + dataMap3.put("v", fetalPresentationVal); + list.add(dataMap3); + } + if(StringUtils.isNotEmpty(joinVal)) + { + java.util.Map dataMap4 = new HashMap<>(); + dataMap4.put("k", "衔接"); + dataMap4.put("v", joinVal); + list.add(dataMap4); + } + } + continue; } dataMap.put("k", key); - if (obj instanceof Date) { + if (obj instanceof Date) + { dataMap.put("v", DateUtil.getyyyy_MM_dd((Date) obj)); - } else { + } else + { dataMap.put("v", obj); } - if (null != obj) { + if (null != obj) + { list.add(dataMap); } } @@ -447,30 +644,40 @@ public class ConvertHelper { return JsonUtil.array2JsonString(list); } - private static String getAntExChuValue(String key, AntExChuModel antExChuModel) { + private static String getAntExChuValue(String key, AntExChuModel antExChuModel) + { StringBuilder sb = new StringBuilder(); Map map = null; - if ("既往史".equals(key)) { + if ("既往史".equals(key)) + { map = JsonUtil.str2Obj(antExChuModel.getPastHistory(), Map.class); - } else if ("家族史".equals(key)) { + } else if ("家族史".equals(key)) + { map = JsonUtil.str2Obj(antExChuModel.getFamilyHistory(), Map.class); - } else if ("个人史".equals(key)) { + } else if ("个人史".equals(key)) + { map = JsonUtil.str2Obj(antExChuModel.getPersonalHistory(), Map.class); - } else if ("疫苗接种史".equals(key)) { + } else if ("疫苗接种史".equals(key)) + { map = JsonUtil.str2Obj(antExChuModel.getYmjzHistory(), Map.class); - } else if ("药物过敏史".equals(key)) { + } else if ("药物过敏史".equals(key)) + { map = JsonUtil.str2Obj(antExChuModel.getYwgmHistory(), Map.class); - } else if ("妇科手术史".equals(key)) { + } else if ("妇科手术史".equals(key)) + { map = JsonUtil.str2Obj(antExChuModel.getFksxHistory(), Map.class); - } else if ("叶酸服用".equals(key)) { + } else if ("叶酸服用".equals(key)) + { map = JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class); - } else if ("本次妊娠情况".equals(key)) { + } else if ("本次妊娠情况".equals(key)) + { map = JsonUtil.str2Obj(antExChuModel.getCestationInfo(), Map.class); } return replace(map, sb); } - public static void main(String[] args) { + public static void main(String[] args) + { AntExChuModel antExChuModel = new AntExChuModel(); antExChuModel.setFamilyHistory("{\"npx\":true,\"sm\":true,\"yesOrNo\":\"yes\"}"); antExChuModel.setPregnancyTimes(3); @@ -478,60 +685,90 @@ public class ConvertHelper { antExChuModel.setYsfyHistory("{\"yesOrNo\":\"yes\",\"yzq3\":true}"); antExChuModel.setBp("{\"ssy\":70,\"szy\":120}"); antExChuModel.setFuwei("11"); - System.out.print(convertAntExChu(antExChuModel, null, null, "").getResult()); + System.out.println(convertAntExChu(antExChuModel, null, null, "").getResult()); + + + + AntenatalExaminationModel antenatalExaminationModel = new AntenatalExaminationModel(); + List list = new ArrayList<>(); + Placenta placenta = new Placenta(); + placenta.setFetalPosition(FetalPositionEnums.ONE1.getId()); + placenta.setJoin(JoinEnums.O.getId()); + placenta.setFetalPresentation(FetalEnums.A.getId()); + placenta.setHeartRate(111.00); + list.add(placenta); + antenatalExaminationModel.setTireData(list); + + System.out.print(convertAntExChu(antenatalExaminationModel, null, null, "").getResult()); } - private static String replace(Map map, StringBuilder sb) { - if (null == map) { + private static String replace(Map map, StringBuilder sb) + { + if (null == map) + { return null; } - if ("yes".equals(map.get(YES_OR_NO))) { + if ("yes".equals(map.get(YES_OR_NO))) + { Set> m = map.entrySet(); Iterator> it = m.iterator(); - while (it.hasNext()) { + while (it.hasNext()) + { Map.Entry ma = it.next(); - if (ma.getKey().equals(YES_OR_NO)) { + if (ma.getKey().equals(YES_OR_NO)) + { continue; } - if ("true".equals(ma.getValue() + "")) { - if (content.containsKey(ma.getKey())) { + if ("true".equals(ma.getValue() + "")) + { + if (content.containsKey(ma.getKey())) + { sb.append(content.get(ma.getKey())).append(','); } } } - if (map.containsKey("qtText")) { + if (map.containsKey("qtText")) + { sb.append(map.get("qtText")); } - if (sb.toString().endsWith(",")) { + if (sb.toString().endsWith(",")) + { return sb.substring(0, sb.length() - 1); } - } else if ("no".equals(map.get(YES_OR_NO))) { + } else if ("no".equals(map.get(YES_OR_NO))) + { sb.append("无"); } return sb.toString(); } - private static List getField(AntExChuModel antExChuModel) { - if (cachedField.containsKey(antExChuModel.getClass())) { + private static List getField(AntExChuModel antExChuModel) + { + if (cachedField.containsKey(antExChuModel.getClass())) + { return cachedField.get(antExChuModel.getClass()); } Field[] field = AntExChuModel.class.getDeclaredFields(); List fieldName = new ArrayList<>(); - for (Field f : field) { + for (Field f : field) + { fieldName.add(f.getName()); } cachedField.put(antExChuModel.getClass(), fieldName); return fieldName; } - private static List getField(AntenatalExaminationModel antExChuModel) { - if (cachedField.containsKey(antExChuModel.getClass())) { + private static List getField(AntenatalExaminationModel antExChuModel) + { + if (cachedField.containsKey(antExChuModel.getClass())) + { return cachedField.get(antExChuModel.getClass()); } Field[] field = AntenatalExaminationModel.class.getDeclaredFields(); List fieldName = new ArrayList<>(); - for (Field f : field) { + for (Field f : field) + { fieldName.add(f.getName()); } cachedField.put(antExChuModel.getClass(), fieldName); diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java index af4dcec..b93937a 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java @@ -531,9 +531,10 @@ public class SyncDataWork } String doctorUserName = null; List antExChuModel = antenatalExaminationService.queryAntExChu(antExChuQuery); - + logger.info("query antexc" + patients.getId() + ". list size:"+antExChuModel.size()); if (CollectionUtils.isNotEmpty(antExChuModel)) { + logger.info("query antexc" + patients.getId() + ". list size:"+antExChuModel); handLastRisk(patients, mamiPatient.getId()); doctorUserName = null; @@ -554,8 +555,9 @@ public class SyncDataWork Reports reports = ConvertHelper.convertAntExChu(antExChuModel1, patients.getLastMenses(), bgHighRisk, doctorUserName); - + logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:"+antExChuModel1.getId()); handleDoctorMemeber(reports, antExChuModel1.getProdDoctor(), mamiPatient, patients, stopWatch3); + logger.info("query handleDoctorMemeber" + patients.getId() + ". antex chu:" + antExChuModel1.getId()); } } } @@ -650,7 +652,7 @@ public class SyncDataWork List antList = antenatalExaminationService .queryAntenatalExamination(antExQuery.convertToQuery()); String doctorUserName = null; - logger.info("query antex" + patients.getId() + "."); + logger.info("query antex" + patients.getId() + ". list size:"+antList.size()); if (CollectionUtils.isNotEmpty(antList)) { for (AntenatalExaminationModel ant : antList) @@ -953,6 +955,7 @@ public class SyncDataWork private void handLastRisk(com.lyms.platform.pojo.Patients patients, Integer patientId) { + logger.info("start handLastRisk " + patients.getId() + "."); StringBuilder sb = new StringBuilder(); List data = new ArrayList<>(); @@ -1019,6 +1022,7 @@ public class SyncDataWork risks.setCrisis(crisis); risks.setPublishId(0); risks.setPublishName("system-worker"); + logger.info("addRisks " + patients.getId() + "."); risksService.addRisks(risks); if (null != patientId) @@ -1030,7 +1034,7 @@ public class SyncDataWork { ERROR_LOGGER.error("convert high risk error.", e); } - + logger.info("end handLastRisk " + patients.getId() + "."); } public static void main(String[] args) -- 1.8.3.1