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 e32a8ba..fc6202b 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 @@ -18,6 +18,7 @@ import org.bson.types.ObjectId; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.util.*; @@ -1556,8 +1557,12 @@ public class JdbcUtil { public static void main(String[] args) { -// MongoTemplate template = getMongoTemplate(); -// AggregationOperation match = Aggregation.match(Criteria.where("_id").is("88ff423d07bf4d40b4fa331e6fe0e32a")); + MongoTemplate template = getMongoTemplate(); + + Date nextDate = new Date(); + template.updateFirst(new Query(Criteria.where("id").is("8c8a99a172084c18b5e4f237c944410f")), Update.update("nextDate", nextDate), BabyModel.class); + +// AggregationOperation match = Aggregation.mach(Criteria.where("_id").is("88ff423d07bf4d40b4fa331e6fe0e32a")); // AggregationOperation group = Aggregation.group("_id"); // Aggregation aggregation = Aggregation.newAggregation(match, group); // AggregationResults result = template.aggregate(aggregation, "lyms_patient_test", BabyCheckModel.class); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java index c5b7177..35e0193 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyCheckDaoImpl.java @@ -7,10 +7,13 @@ import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.BabyCheckModel; +import com.lyms.platform.pojo.BabyModel; import org.springframework.data.mongodb.core.aggregation.Aggregation; import org.springframework.data.mongodb.core.aggregation.AggregationOperation; import org.springframework.data.mongodb.core.aggregation.AggregationResults; import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Repository; import java.util.List; @@ -26,6 +29,7 @@ public class BabyCheckDaoImpl extends BaseMongoDAOImpl implement @Override public void updateBabyCheck(BabyCheckModel obj, String id) { update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); + this.mongoTemplate.updateFirst(new Query(Criteria.where("id").is(obj.getBuildId())), Update.update("nextDate", obj.getNextDate()), BabyModel.class); } @Override diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java index a7fbf98..0dd5f95 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java @@ -185,6 +185,25 @@ public class AmsMessageService { // getMessageTemplateMap("8be01f59-ad25-4ae6-968d-8450c9421e0b", // AmsServiceTypeEnum.CHILD_GUIDE); +// String result = "头：9.5|胸：10.0|腹：10.0"; +// String b = ""; +// +// //头：9.5|胸：10.0|腹：10.0 +// String[] arrs = result.split("\\u007C"); +// for (String str : arrs) { +// String[] temps = str.split("："); +// if (str.startsWith("头")) { +// b = temps.length == 2 ? temps[1] : ""; +// System.out.println(b); +// } else if (str.startsWith("胸")) { +// b =temps.length == 2 ? temps[1] : ""; +// System.out.println(b); +// } else if (str.startsWith("腹")) { +// b =temps.length == 2 ? temps[1] : ""; +// System.out.println(b); +// } +// } + } diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java index ba6e80f..d59777b 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java @@ -14,6 +14,7 @@ import com.lyms.platform.query.BasicConfigQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; @@ -157,9 +158,7 @@ public class SyncDataService { @Override public void run() { - List> list = JDBCUtil.getOracleListDataBySql(" SELECT * FROM ( SELECT A.*, ROWNUM RN FROM " + - " (select replace(m.PI_ID,'-','') as ID,m.* from MOMMY_PATIENTINFO m where m.pi_bookbuildinghospitalid='" + hid + "') " + - " A WHERE ROWNUM < 1000000 ) WHERE RN >= 1 "); + List> list = JDBCUtil.getOracleListDataBySql(" select replace(m.PI_ID,'-','') as ID,m.* from MOMMY_PATIENTINFO m where m.pi_bookbuildinghospitalid='" + hid + "' " ); for (Map map : list) { @@ -181,184 +180,6 @@ public class SyncDataService { new workerBaby(oracleHid).start(); } - private void syncBaby(Map map) - { - PersonModel personModel = new PersonModel(); - personModel.setId(DataUtil.getString(map.get("ID"))); - personModel.setPhone(DataUtil.getString(map.get("PI_MOTHERPHONE"))); - personModel.setName(DataUtil.getString(map.get("PI_NAME"))); - personModel.setCardNo(DataUtil.getString(map.get("PI_MOTHERPHONE"))); - personModel.setBirth(DataUtil.getDate(map.get("PI_BIRTHDAY"))); - personModel.setType(2); - personModel.setYn(YnEnums.YES.getId()); - personModel.setCreated(DataUtil.getDate(map.get("PI_CREATETIME"))); - personModel.setModified(DataUtil.getDate(map.get("PI_OPERTIME"))); - - mongoTemplate.save(personModel); - - BabyModel model = new BabyModel(); - model.setId(DataUtil.getString(map.get("ID"))); - model.setPid(personModel.getId()); - model.setCreated(DataUtil.getDate(map.get("PI_CREATETIME"))); - model.setModified(DataUtil.getDate(map.get("PI_OPERTIME"))); - model.setBirth(DataUtil.getDate(map.get("PI_BIRTHDAY"))); - model.setAddress(DataUtil.getString(map.get("PI_ADDRESS"))); - - model.setFname(DataUtil.getString(map.get("PI_FATHERNAME"))); - model.setFphone(DataUtil.getString(map.get("PI_FATHERPHONE"))); - model.setFbirth(DataUtil.getDate(map.get(""))); - - - String fproTypeId = DataUtil.getString(map.get("PI_FATHERPROFESSION")); - if (fproTypeId != null && !"".equals(fproTypeId)) { - String fproTypeName = DataUtil.getOracleBasicConfig(fproTypeId); - String id = DataUtil.getMongoBasicConfig(fproTypeName, SystemConfig.PROFESSION_TYPE_ID); - model.setFproTypeId(id); - } - - model.setFcertNo(DataUtil.getString(map.get(""))); - model.setFcertTypeId(DataUtil.getString(map.get(""))); - - String fLevelId = DataUtil.getString(map.get("PI_BBCULTURE")); - if (fLevelId != null && !"".equals(fLevelId)) { - String fLevelName = DataUtil.getOracleBasicConfig(fLevelId); - String id = DataUtil.getMongoBasicConfig(fLevelName, SystemConfig.LEVEL_TYPE_ID); - model.setfLevelId(id); - } - - model.setMname(DataUtil.getString(map.get("PI_MOTHERNAME"))); - model.setMphone(DataUtil.getString(map.get("PI_MOTHERPHONE"))); - model.setMbirth(DataUtil.getDate(map.get(""))); - - String mproTypeId = DataUtil.getString(map.get("PI_MATHERPROFESSION")); - if (mproTypeId != null && !"".equals(mproTypeId)) { - String mproTypeName = DataUtil.getOracleBasicConfig(mproTypeId); - String id = DataUtil.getMongoBasicConfig(mproTypeName, SystemConfig.PROFESSION_TYPE_ID); - model.setMproTypeId(id); - } - - model.setMcertNo(DataUtil.getString(map.get("PI_MOTHERPHONE"))); - model.setMcertTypeId("57e0a21c0cf209b410a82cda"); - - String mLevelId = DataUtil.getString(map.get("PI_MMCULTURE")); - if (mLevelId != null && !"".equals(mLevelId)) { - String mLevelName = DataUtil.getOracleBasicConfig(fLevelId); - String id = DataUtil.getMongoBasicConfig(mLevelName, SystemConfig.LEVEL_TYPE_ID); - model.setmLevelId(id); - } - - String zhuchanOrg = DataUtil.getString(map.get("PI_BIRTHASPHYXIA")); - if (zhuchanOrg != null && !"".equals(zhuchanOrg)) { - String id = DataUtil.getString(JDBCUtil.getMysqlSingleObjBySql("select id from organization where name = '" + zhuchanOrg + "'")); - model.setDeliverOrg(id); - } - - model.setCardNo(DataUtil.getString(map.get("PI_IDENTITYCARDNUMBER"))); - - String buildHospitalId = DataUtil.getString(map.get("PI_BOOKBUILDINGHOSPITALID")); - - - if (buildHospitalId != null && !"".equals(buildHospitalId)) { - String hname = DataUtil.getPatHosptalById(buildHospitalId); - String id = DataUtil.getOrgIdByName(hname); - model.setHospitalId(id); - } - - model.setBuildType(1); - model.setSex(DataUtil.getInteger(map.get("PI_SEX"))); - model.setName(DataUtil.getString(map.get("PI_NAME"))); - Integer yn = DataUtil.getInteger(map.get("PI_ISDELETE")); - model.setYn(yn); - - String dueTypeId = DataUtil.getString(map.get("PI_FENMIAN")); - if (dueTypeId != null && !"".equals(dueTypeId)) { - String name = DataUtil.getDataContentByById(dueTypeId); - model.setDueType(FmTypeEnums.getIdByName(name)); - } - - model.setFetusCount(DataUtil.getString(map.get("PI_FOETUSCOUNT"))); - model.setDueCount(DataUtil.getString(map.get("PI_BIRTHCOUNT"))); - model.setBabyWeight(DataUtil.getString(map.get("PI_WEIGHT"))); - model.setBabyHeight(DataUtil.getString(map.get("PI_HEIGHT"))); - model.setBabyHead(DataUtil.getString(map.get("PI_HEADSIZE"))); - model.setMalformation(DataUtil.getInteger(map.get("PI_BIRTHDEFORMED"))); - - String doctorId = DataUtil.getString(map.get("PI_CREATEOPER")); - if (doctorId != null && !"".equals(doctorId)) { - String hname = DataUtil.getEmpNameById(doctorId); - String id = DataUtil.getUserIdByName(hname); - model.setBuildDoctor(id); - } - - model.setBuildDate(DataUtil.getDate(map.get("PI_CREATETIME"))); - - Integer isVip = DataUtil.getInteger(map.get("PI_ISVIP")); - Integer status = DataUtil.getInteger(map.get("PI_SERVICETYPE")); - if (isVip == 0) { - model.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); - if (status != null) { - if (status == 0) { - model.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - } else { - model.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); - } - - } - - } else if (isVip == 1) { - model.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - - if (status == 0) { - model.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); - } else if (status == 1) { - model.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); - } else if (status == 2) { - model.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); - } else if (status == 3) { - model.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); - } else if (status == 4) { - model.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); - } - } - - model.setVcCardNo(DataUtil.getString(map.get("PI_CARDNO"))); - // String apgar = getString(map.get("PI_APGAR")); - // if (StringUtils.isNotEmpty(apgar)) - // { - // String[] apgars = apgar.split("-"); - // if (apgars) - // { - // - // } - // } - // model.setApgarScore(); - model.setAsphyxiaM(DataUtil.getString(map.get(""))); - model.setPregnancyOut(DataUtil.getString(map.get(""))); - model.setBabyHealthy(DataUtil.getString(map.get(""))); - model.setContactStartM(DataUtil.getString(map.get(""))); - model.setContactM(DataUtil.getString(map.get(""))); - model.setEarlySuck(DataUtil.getString(map.get(""))); - model.setDiagnose(DataUtil.getString(map.get(""))); - model.setNextDate(DataUtil.getDate(map.get(""))); - model.setLastHighRisk(DataUtil.getInteger(map.get("PI_KIDSTYPE"))); - String dueWeek = DataUtil.getString(map.get("PI_GESTATIONALWEEKS")); - if (dueWeek != null && !"".equals(dueWeek)) { - - if (dueWeek.contains(".") && dueWeek.split("\\u002E").length > 0) { - model.setDueWeek(Integer.parseInt(dueWeek.split("\\u002E")[0])); - } else { - String sp = "\\u002B"; - String str = dueWeek.split(sp)[0]; - model.setDueWeek(Integer.parseInt(str)); - } - - } - - mongoTemplate.save(model); - syncBabyCheck(model.getId(), mongoTemplate,DataUtil.getDate(map.get("PI_BIRTHDAY"))); - } - - private void initChuzhenDatas() { @@ -807,10 +628,7 @@ public class SyncDataService { } -// private synchronized void save(Object obj) -// { -// mongoTemplate.save(obj); -// } + private void syncChuZhen(String pid, String parentId, MongoTemplate mongoTemplate,Date lastMenses,int weeks) { long startTimes = System.currentTimeMillis(); @@ -895,8 +713,8 @@ public class SyncDataService { } } - chuModel.setDirOpinion(content); + chuModel.setTreatOpinion(DataUtil.getString(map.get("FE_OTHERINFO"))); chuModel.setCheckTime(DataUtil.getDate(map.get("FE_ROCTORTIME"))); chuModel.setOtherHighRisk("{}"); @@ -983,7 +801,6 @@ public class SyncDataService { antxModel.setType(DataUtil.getString(map.get(""))); antxModel.setTypeYc(DataUtil.getString(map.get(""))); antxModel.setTreatmentOpinion(DataUtil.getString(map.get("TREATMENTOPINION"))); - antxModel.setGuide(DataUtil.getString(map.get(""))); String checkDoctorName = DataUtil.getString(map.get("CHECKDOCTOR")); if (checkDoctorName != null && !"".equals(checkDoctorName)) { @@ -1047,8 +864,199 @@ public class SyncDataService { } } + private void syncBaby(Map map) + { + PersonModel personModel = new PersonModel(); + personModel.setId(DataUtil.getString(map.get("ID"))); + personModel.setPhone(DataUtil.getString(map.get("PI_MOTHERPHONE"))); + personModel.setName(DataUtil.getString(map.get("PI_NAME"))); + personModel.setCardNo(DataUtil.getString(map.get("PI_MOTHERPHONE"))); + personModel.setBirth(DataUtil.getDate(map.get("PI_BIRTHDAY"))); + personModel.setType(2); + personModel.setYn(YnEnums.YES.getId()); + personModel.setCreated(DataUtil.getDate(map.get("PI_CREATETIME"))); + personModel.setModified(DataUtil.getDate(map.get("PI_OPERTIME"))); + + mongoTemplate.save(personModel); + + BabyModel model = new BabyModel(); + model.setId(DataUtil.getString(map.get("ID"))); + model.setPid(personModel.getId()); + model.setCreated(DataUtil.getDate(map.get("PI_CREATETIME"))); + model.setModified(DataUtil.getDate(map.get("PI_OPERTIME"))); + model.setBirth(DataUtil.getDate(map.get("PI_BIRTHDAY"))); + model.setAddress(DataUtil.getString(map.get("PI_ADDRESS"))); + + model.setFname(DataUtil.getString(map.get("PI_FATHERNAME"))); + model.setFphone(DataUtil.getString(map.get("PI_FATHERPHONE"))); + model.setFbirth(DataUtil.getDate(map.get(""))); + + + String fproTypeId = DataUtil.getString(map.get("PI_FATHERPROFESSION")); + if (fproTypeId != null && !"".equals(fproTypeId)) { + String fproTypeName = DataUtil.getOracleBasicConfig(fproTypeId); + String id = DataUtil.getMongoBasicConfig(fproTypeName, SystemConfig.PROFESSION_TYPE_ID); + model.setFproTypeId(id); + } + + model.setFcertNo(DataUtil.getString(map.get(""))); + model.setFcertTypeId(DataUtil.getString(map.get(""))); + + String fLevelId = DataUtil.getString(map.get("PI_BBCULTURE")); + if (fLevelId != null && !"".equals(fLevelId)) { + String fLevelName = DataUtil.getOracleBasicConfig(fLevelId); + String id = DataUtil.getMongoBasicConfig(fLevelName, SystemConfig.LEVEL_TYPE_ID); + model.setfLevelId(id); + } + + model.setMname(DataUtil.getString(map.get("PI_MOTHERNAME"))); + model.setMphone(DataUtil.getString(map.get("PI_MOTHERPHONE"))); + model.setMbirth(DataUtil.getDate(map.get(""))); + + String mproTypeId = DataUtil.getString(map.get("PI_MATHERPROFESSION")); + if (mproTypeId != null && !"".equals(mproTypeId)) { + String mproTypeName = DataUtil.getOracleBasicConfig(mproTypeId); + String id = DataUtil.getMongoBasicConfig(mproTypeName, SystemConfig.PROFESSION_TYPE_ID); + model.setMproTypeId(id); + } + + model.setMcertNo(DataUtil.getString(map.get("PI_MOTHERPHONE"))); + model.setMcertTypeId("57e0a21c0cf209b410a82cda"); + + String mLevelId = DataUtil.getString(map.get("PI_MMCULTURE")); + if (mLevelId != null && !"".equals(mLevelId)) { + String mLevelName = DataUtil.getOracleBasicConfig(fLevelId); + String id = DataUtil.getMongoBasicConfig(mLevelName, SystemConfig.LEVEL_TYPE_ID); + model.setmLevelId(id); + } + + String zhuchanOrg = DataUtil.getString(map.get("PI_BIRTHASPHYXIA")); + if (zhuchanOrg != null && !"".equals(zhuchanOrg)) { + String id = DataUtil.getString(JDBCUtil.getMysqlSingleObjBySql("select id from organization where name = '" + zhuchanOrg + "'")); + model.setDeliverOrg(id); + } + + model.setCardNo(DataUtil.getString(map.get("PI_IDENTITYCARDNUMBER"))); + + String buildHospitalId = DataUtil.getString(map.get("PI_BOOKBUILDINGHOSPITALID")); + + + if (buildHospitalId != null && !"".equals(buildHospitalId)) { + String hname = DataUtil.getPatHosptalById(buildHospitalId); + String id = DataUtil.getOrgIdByName(hname); + model.setHospitalId(id); + } + + model.setBuildType(1); + model.setSex(DataUtil.getInteger(map.get("PI_SEX"))); + model.setName(DataUtil.getString(map.get("PI_NAME"))); + Integer yn = DataUtil.getInteger(map.get("PI_ISDELETE")); + model.setYn(yn); + + String dueTypeId = DataUtil.getString(map.get("PI_FENMIAN")); + if (dueTypeId != null && !"".equals(dueTypeId)) { + String name = DataUtil.getDataContentByById(dueTypeId); + model.setDueType(FmTypeEnums.getIdByName(name)); + } + + model.setFetusCount(DataUtil.getString(map.get("PI_FOETUSCOUNT"))); + model.setDueCount(DataUtil.getString(map.get("PI_BIRTHCOUNT"))); + if (StringUtils.isNotEmpty(DataUtil.getString(map.get("PI_WEIGHT")))) + { + try { + String strWeight = DataUtil.getString(map.get("PI_WEIGHT")); + java.text.DecimalFormat df =new java.text.DecimalFormat("#.00"); + model.setBabyWeight(df.format(strWeight)); + }catch (Exception e) + { + System.out.print(e); + } + + } + + model.setBabyHeight(DataUtil.getString(map.get("PI_HEIGHT"))); + model.setBabyHead(DataUtil.getString(map.get("PI_HEADSIZE"))); + model.setMalformation(DataUtil.getInteger(map.get("PI_BIRTHDEFORMED"))); + + String doctorId = DataUtil.getString(map.get("PI_CREATEOPER")); + if (doctorId != null && !"".equals(doctorId)) { + String hname = DataUtil.getEmpNameById(doctorId); + String id = DataUtil.getUserIdByName(hname); + model.setBuildDoctor(id); + } + + model.setBuildDate(DataUtil.getDate(map.get("PI_CREATETIME"))); + + Integer isVip = DataUtil.getInteger(map.get("PI_ISVIP")); + Integer status = DataUtil.getInteger(map.get("PI_SERVICETYPE")); + if (isVip == 0) { + model.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + if (status != null) { + if (status == 0) { + model.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + } else { + model.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); + } + + } + + } else if (isVip == 1) { + model.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + + if (status == 0) { + model.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId()); + } else if (status == 1) { + model.setServiceStatus(ServiceStatusEnums.SUSPEND.getId()); + } else if (status == 2) { + model.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); + } else if (status == 3) { + model.setServiceStatus(ServiceStatusEnums.UNSUBSCRIBE.getId()); + } else if (status == 4) { + model.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + } + } + + model.setVcCardNo(DataUtil.getString(map.get("PI_CARDNO"))); + // String apgar = getString(map.get("PI_APGAR")); + // if (StringUtils.isNotEmpty(apgar)) + // { + // String[] apgars = apgar.split("-"); + // if (apgars) + // { + // + // } + // } + // model.setApgarScore(); + model.setAsphyxiaM(DataUtil.getString(map.get(""))); + model.setPregnancyOut(DataUtil.getString(map.get(""))); + model.setBabyHealthy(DataUtil.getString(map.get(""))); + model.setContactStartM(DataUtil.getString(map.get(""))); + model.setContactM(DataUtil.getString(map.get(""))); + model.setEarlySuck(DataUtil.getString(map.get(""))); + model.setDiagnose(DataUtil.getString(map.get(""))); + model.setNextDate(DataUtil.getDate(map.get(""))); + model.setHighRisk(DataUtil.getInteger(map.get("PI_KIDSTYPE"))); + model.setLastHighRisk(DataUtil.getInteger(map.get("PI_KIDSTYPE"))); + String dueWeek = DataUtil.getString(map.get("PI_GESTATIONALWEEKS")); + if (dueWeek != null && !"".equals(dueWeek)) { + + if (dueWeek.contains(".") && dueWeek.split("\\u002E").length > 0) { + model.setDueWeek(Integer.parseInt(dueWeek.split("\\u002E")[0])); + } else { + String sp = "\\u002B"; + String str = dueWeek.split(sp)[0]; + model.setDueWeek(Integer.parseInt(str)); + } + + } + + mongoTemplate.save(model); + syncBabyCheck(model.getId(), mongoTemplate,DataUtil.getDate(map.get("PI_BIRTHDAY"))); + } + + public void syncBabyCheck(String parentId, MongoTemplate mongoTemplate,Date birth) { - String sql = " select * from MOMMY_CHILDEXAMINRECORD MC left join MOMMY_PATIENTINFO MP ON MP.PI_ID = MC.CER_PATIENTID WHERE replace(MP.Pi_Id,'-','')= '" + parentId + "'"; + String sql = " select * from MOMMY_CHILDEXAMINRECORD MC left join MOMMY_PATIENTINFO MP ON MP.PI_ID = MC.CER_PATIENTID WHERE replace(MP.Pi_Id,'-','')= '" + parentId + "' order by mc.CER_EXAMINDATE asc "; List> list = JDBCUtil.getOracleListDataBySql(sql); for (Map map : list) { @@ -1075,9 +1083,7 @@ public class SyncDataService { checkModel.setCheckDoctor(id); } - checkModel.setGuideSuggest(DataUtil.getString(map.get("CER_DIRECTIVEOPINION"))); - checkModel.setHandlSuggest(DataUtil.getString(map.get("CER_REMARKS"))); - + checkModel.setHandlSuggest(DataUtil.getString(map.get("CER_DIRECTIVEOPINION"))); checkModel.setMainFoster(DataUtil.getString(map.get(""))); @@ -1205,6 +1211,10 @@ public class SyncDataService { checkModel.setWhiteCell(result); } } + + Date nextDate = DataUtil.getDate(map.get("CER_NEXTEXAMINDATE")); + mongoTemplate.updateFirst(new Query(Criteria.where("id").is(parentId)), Update.update("nextDate", nextDate), BabyModel.class); + mongoTemplate.save(checkModel); } }