diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
index f0f554d..169c451 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
@@ -1612,4 +1612,153 @@ public class BabyCheckModel extends BaseModel {
}
}
+ @Override
+ public String toString() {
+ return "BabyCheckModel{" +
+ "id='" + id + '\'' +
+ ", yn=" + yn +
+ ", buildId='" + buildId + '\'' +
+ ", checkDate=" + checkDate +
+ ", ylSelect='" + ylSelect + '\'' +
+ ", tcType=" + tcType +
+ ", mainFoster='" + mainFoster + '\'' +
+ ", feedType='" + feedType + '\'' +
+ ", pee='" + pee + '\'' +
+ ", excrement='" + excrement + '\'' +
+ ", sleep='" + sleep + '\'' +
+ ", activity='" + activity + '\'' +
+ ", vitaminD='" + vitaminD + '\'' +
+ ", assistFood='" + assistFood + '\'' +
+ ", homeMeasure='" + homeMeasure + '\'' +
+ ", morbidity='" + morbidity + '\'' +
+ ", drugGllergic='" + drugGllergic + '\'' +
+ ", temperature='" + temperature + '\'' +
+ ", weight='" + weight + '\'' +
+ ", height='" + height + '\'' +
+ ", head='" + head + '\'' +
+ ", heightWeight='" + heightWeight + '\'' +
+ ", chestw='" + chestw + '\'' +
+ ", growthEvaluate='" + growthEvaluate + '\'' +
+ ", bilirubinHead='" + bilirubinHead + '\'' +
+ ", bilirubinChest='" + bilirubinChest + '\'' +
+ ", bilirubinBelly='" + bilirubinBelly + '\'' +
+ ", bregma='" + bregma + '\'' +
+ ", tooth='" + tooth + '\'' +
+ ", faceColor='" + faceColor + '\'' +
+ ", skin='" + skin + '\'' +
+ ", eye='" + eye + '\'' +
+ ", eyesight='" + eyesight + '\'' +
+ ", ear='" + ear + '\'' +
+ ", hearing='" + hearing + '\'' +
+ ", neck='" + neck + '\'' +
+ ", chest='" + chest + '\'' +
+ ", belly='" + belly + '\'' +
+ ", spineFours='" + spineFours + '\'' +
+ ", portaGenitals='" + portaGenitals + '\'' +
+ ", stepStatus='" + stepStatus + '\'' +
+ ", stoopStatus='" + stoopStatus + '\'' +
+ ", stoopSign='" + stoopSign + '\'' +
+ ", nerve='" + nerve + '\'' +
+ ", bonez='" + bonez + '\'' +
+ ", hipJoint='" + hipJoint + '\'' +
+ ", hemoglobin='" + hemoglobin + '\'' +
+ ", whiteCell='" + whiteCell + '\'' +
+ ", platelet='" + platelet + '\'' +
+ ", otherBlood='" + otherBlood + '\'' +
+ ", urineProtein='" + urineProtein + '\'' +
+ ", urineSugar='" + urineSugar + '\'' +
+ ", urineAcetone='" + urineAcetone + '\'' +
+ ", hematuria='" + hematuria + '\'' +
+ ", otherUrine='" + otherUrine + '\'' +
+ ", diagnose='" + diagnose + '\'' +
+ ", handlSuggest='" + handlSuggest + '\'' +
+ ", guideSuggest='" + guideSuggest + '\'' +
+ ", checkDoctor='" + checkDoctor + '\'' +
+ ", nextDate=" + nextDate +
+ ", highRisk=" + highRisk +
+ ", modified=" + modified +
+ ", created=" + created +
+ ", hospitalId='" + hospitalId + '\'' +
+ ", weightEvaluate='" + weightEvaluate + '\'' +
+ ", heightEvaluate='" + heightEvaluate + '\'' +
+ ", headEvaluate='" + headEvaluate + '\'' +
+ ", birth=" + birth +
+ ", checkMonth=" + checkMonth +
+ ", sportsEvaluation='" + sportsEvaluation + '\'' +
+ ", heartAction='" + heartAction + '\'' +
+ ", askOther='" + askOther + '\'' +
+ ", babyCheckOther='" + babyCheckOther + '\'' +
+ ", assistCheckOther='" + assistCheckOther + '\'' +
+ ", navel=" + navel +
+ ", cnqk='" + cnqk + '\'' +
+ ", mtcnNum='" + mtcnNum + '\'' +
+ ", xbNum='" + xbNum + '\'' +
+ ", dbNum='" + dbNum + '\'' +
+ ", qdtlTime='" + qdtlTime + '\'' +
+ ", pfhrTime='" + pfhrTime + '\'' +
+ ", wssAd='" + wssAd + '\'' +
+ ", douhbqk=" + douhbqk +
+ ", kq='" + kq + '\'' +
+ ", cyNum='" + cyNum + '\'' +
+ ", qcNum='" + qcNum + '\'' +
+ ", btt='" + btt + '\'' +
+ ", xf='" + xf + '\'' +
+ ", xlClass=" + xlClass +
+ ", xldq='" + xldq + '\'' +
+ ", nd='" + nd + '\'' +
+ ", ygbmky='" + ygbmky + '\'' +
+ ", ygbmkt='" + ygbmkt + '\'' +
+ ", ygeky='" + ygeky + '\'' +
+ ", ygekt='" + ygekt + '\'' +
+ ", yghxkt='" + yghxkt + '\'' +
+ ", wlTong='" + wlTong + '\'' +
+ ", wlXin='" + wlXin + '\'' +
+ ", wlGai='" + wlGai + '\'' +
+ ", wlMei='" + wlMei + '\'' +
+ ", wlTie='" + wlTie + '\'' +
+ ", wlQian='" + wlQian + '\'' +
+ ", wlGe='" + wlGe + '\'' +
+ ", wlMeng='" + wlMeng + '\'' +
+ ", ygbmkyNum='" + ygbmkyNum + '\'' +
+ ", ygbmktNum='" + ygbmktNum + '\'' +
+ ", ygekyNum='" + ygekyNum + '\'' +
+ ", ygektNum='" + ygektNum + '\'' +
+ ", yghxktNum='" + yghxktNum + '\'' +
+ ", xqgbzam='" + xqgbzam + '\'' +
+ ", xqgczam='" + xqgczam + '\'' +
+ ", albumin='" + albumin + '\'' +
+ ", totalBilirubin='" + totalBilirubin + '\'' +
+ ", jhBilirubin='" + jhBilirubin + '\'' +
+ ", bcgYs='" + bcgYs + '\'' +
+ ", bcgXz='" + bcgXz + '\'' +
+ ", bcgHbx='" + bcgHbx + '\'' +
+ ", bcgBxb='" + bcgBxb + '\'' +
+ ", bcgSpxb='" + bcgSpxb + '\'' +
+ ", bcgZlxb='" + bcgZlxb + '\'' +
+ ", bcgDfkl='" + bcgDfkl + '\'' +
+ ", bcgZfkl='" + bcgZfkl + '\'' +
+ ", bcgJxw='" + bcgJxw + '\'' +
+ ", bcgZwxw='" + bcgZwxw + '\'' +
+ ", bcgZbj='" + bcgZbj + '\'' +
+ ", bcgZj='" + bcgZj + '\'' +
+ ", bcgJsc='" + bcgJsc + '\'' +
+ ", bcgYc='" + bcgYc + '\'' +
+ ", bcgQw='" + bcgQw + '\'' +
+ ", wssa='" + wssa + '\'' +
+ ", jcwd='" + jcwd + '\'' +
+ ", wsse='" + wsse + '\'' +
+ ", rzfx=" + rzfx +
+ ", chatSc=" + chatSc +
+ ", yyfyTest=" + yyfyTest +
+ ", zlcp='" + zlcp + '\'' +
+ ", gdzsc='" + gdzsc + '\'' +
+ ", ssfx='" + ssfx + '\'' +
+ ", gjzh='" + gjzh + '\'' +
+ ", rxnl='" + rxnl + '\'' +
+ ", xxbsc='" + xxbsc + '\'' +
+ ", zlsc='" + zlsc + '\'' +
+ ", qtfz='" + qtfz + '\'' +
+ ", correctAge='" + correctAge + '\'' +
+ '}';
+ }
}
\ No newline at end of file
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 0351cb4..eb3febc 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
@@ -387,6 +387,15 @@ public class ConvertHelper {
babyCheckDiagnosis.setDrugGllergic(drugGllergic);
babyCheckDiagnosis.setOtherText(babyCheckModel.getAskOther());
+ babyCheckDiagnosis.setCnqk(babyCheckModel.getCnqk());
+ babyCheckDiagnosis.setMtcnNum(babyCheckModel.getMtcnNum());
+ babyCheckDiagnosis.setXbNum(babyCheckModel.getXbNum());
+ babyCheckDiagnosis.setDbNum(babyCheckModel.getDbNum());
+ babyCheckDiagnosis.setQdtlTime(babyCheckModel.getQdtlTime());
+ babyCheckDiagnosis.setPfhrTime(babyCheckModel.getPfhrTime());
+ babyCheckDiagnosis.setWssAd(babyCheckModel.getWssAd());
+ babyCheckDiagnosis.setDouhbqk(JsonUtil.obj2JsonString(babyCheckModel.getDouhbqk()));
+
return babyCheckDiagnosis;
}
return null;
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 a46ae86..43df2a9 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
@@ -433,6 +433,7 @@ public class SyncDataWork {
logger.info("loadRpBaby babycheck by:" + hospitalId + ",babycheck size:" + (null == babyCheckModels ? 0 : babyCheckModels.size()));
if (CollectionUtils.isNotEmpty(babyCheckModels)) {
for (BabyCheckModel babyCheckModel : babyCheckModels) {
+ System.out.println("待同步的儿保检查数据:"+babyCheckModel.toString());
//儿保信息
BabyCheckBase babyCheckBase = ConvertHelper.convertToBabyCheckBase(babyCheckModel, babyModel);
babyCheckBase.setPatientId(patients.getId());
diff --git a/platform-job-index/src/main/resources/conf.properties b/platform-job-index/src/main/resources/conf.properties
index b27db57..185818b 100644
--- a/platform-job-index/src/main/resources/conf.properties
+++ b/platform-job-index/src/main/resources/conf.properties
@@ -1,8 +1,12 @@
-#需要导入的妈咪贝比
maindata.driver=com.mysql.jdbc.Driver
-maindata.jdbcurl=jdbc:mysql://119.90.43.68:3307/mommybaby?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
-maindata.username=lyms_chengdu
-maindata.password=lyms2015
+#maindata.jdbcurl=jdbc:mysql://192.168.1.69:3306/mommybaby?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
+#maindata.username=lyms_chengdu
+#maindata.password=lyms2015
+
+maindata.jdbcurl=jdbc:mysql://192.168.1.26:3306/mommybaby?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
+maindata.username=mommybaby
+maindata.password=Lyms123456
+
maindata.maxpoolsize=5
maindata.initialpoolsize=2
@@ -10,9 +14,16 @@ maindata.minpoolsize=2
+sequence.create.size=3000
+sequence.index=20000000
+sequence.min.size=300
+sequence.schedule.expression=0 0 * * 1 ?
+
+
-mongo.db.host=119.90.57.26
-mongo.db.port=27018
+
+mongo.db.host=192.168.1.26
+mongo.db.port=10001
mongo.db.dbname=platform
mongo.db.username=platform
mongo.db.password=platform123
@@ -24,23 +35,20 @@ mongo.maxWaitTime=4000
mongo.autoConnectRetry=true
mongo.socketKeepAlive=true
-mysql.db.name=platform
-mysql.db.password=platform123
-mysql.driver=com.mysql.jdbc.Driver
-mysql.jdbcurl=jdbc:mysql://119.90.43.68:3307/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
+#mysql.db.name=platform
+#mysql.db.password=platform123
+#mysql.driver=com.mysql.jdbc.Driver
+#mysql.jdbcurl=jdbc:mysql://192.168.1.39:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
mysql.maxpoolsize=5
mysql.initialpoolsize=2
mysql.minpoolsize=2
-
-
mysql.master.db.name=platform
mysql.master.db.password=platform123
mysql.master.driver=com.mysql.jdbc.Driver
-mysql.master.jdbcurl=jdbc:mysql://119.90.57.26:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
-
+mysql.master.jdbcurl=jdbc:mysql://192.168.1.26:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
redis.servers=localhost:6379
@@ -49,4 +57,4 @@ report.db.jdbcurl=jdbc:oracle:thin:@192.168.1.32:1521:orcl
report.db.username=LYMS_ODS
report.db.password=Welcome1
-file.path=c://lastsynctime.txt
\ No newline at end of file
+file.path=c://data/lastsynctime.txt
\ No newline at end of file
diff --git a/platform-job-index/src/main/resources/spring/applicationContext-sync-data.xml b/platform-job-index/src/main/resources/spring/applicationContext-sync-data.xml
index a55349b..ff49a13 100644
--- a/platform-job-index/src/main/resources/spring/applicationContext-sync-data.xml
+++ b/platform-job-index/src/main/resources/spring/applicationContext-sync-data.xml
@@ -9,19 +9,19 @@
-
-
-
-
-
-
-
-
+
+
+
+ classpath:conf.properties
+
+
+
-
-
-
-
+
+
+
diff --git a/platform-job-index/src/main/webapp/WEB-INF/lib/mainData.jar b/platform-job-index/src/main/webapp/WEB-INF/lib/mainData.jar
index c2cebe956e5fed7fa030a5b0f3c236a78131203c..921e7279afb576c85e1b45bb75962846a0d9bb7d 100644
GIT binary patch
delta 10087
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
Q2Hx?&@z6QhFpymT2lI8adjJ3c
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
index 165996f..87e822f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
@@ -1,14 +1,10 @@
package com.lyms.platform.operate.web;
import com.lyms.platform.common.utils.DateUtil;
-import com.lyms.platform.common.utils.SerializUtils;
import com.lyms.platform.pojo.BasicConfig;
-import com.lyms.platform.pojo.DiagnoseConfigModel;
import net.sourceforge.pinyin4j.PinyinHelper;
-import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
-import java.io.Serializable;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -22,17 +18,21 @@ public class Test {
private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE");
public static void main(String[] args) throws Exception {
+ Date date = new Date();
+ date.setTime(1524043320001L);
+ System.out.println(DateUtil.getyyyy_MM_dd_hms(date));
+
//月龄套餐
//月龄套餐
// List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class);
// System.out.println(jctc);
//根据出生孕周计算末次月经
- Date LastMens = DateUtil.addWeek(DateUtil.parseYMD("2018-01-01"),-34);
+ // Date LastMens = DateUtil.addWeek(DateUtil.parseYMD("2018-01-01"),-34);
//根据末次月经计算预产期
- Date dueDate = DateUtil.addMonth(LastMens, 9);
- dueDate = DateUtil.addDay(dueDate, 7);
- System.out.println(DateUtil.getyyyy_MM_dd(dueDate));
+ // Date dueDate = DateUtil.addMonth(LastMens, 9);
+ // dueDate = DateUtil.addDay(dueDate, 7);
+ // System.out.println(DateUtil.getyyyy_MM_dd(dueDate));
// System.out.println(EnumUtil.toJson(BabyDeformityEnums.class));
// int day = DateUtil.getExcludeMonthDay(DateUtil.parseYMD("2018-04-19"),new Date());