From 13fc39f4476d0df22dc574de509b6093c358f695 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 24 Dec 2020 15:55:23 +0800 Subject: [PATCH] update --- .../platform/biz/service/MongoSyncService.java | 2 +- .../platform/msg/service/impl/BaseServiceImpl.java | 132 ++++++----- .../msg/worker/TempleteMsgGenerateWorker.java | 26 +-- .../operate/web/facade/PatientSyncMysqlFacade.java | 255 +++++++++++++-------- .../operate/web/service/SyncDataTaskService.java | 8 +- .../resources/spring/applicationContext-quartz.xml | 17 ++ 6 files changed, 270 insertions(+), 170 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java index d23d4ef..cf57e5b 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java @@ -167,7 +167,7 @@ public class MongoSyncService { return false; } catch (Exception e) { ExceptionUtils.catchException(e,"syncData Error. id :" +id+",action:" +action+",json:"+json +",className:"+className); - return false; + return true; } } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java index 0dd284e..a21ff1b 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java @@ -1,7 +1,9 @@ package com.lyms.platform.msg.service.impl; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.msg.model.HighScoreResult; @@ -120,68 +122,88 @@ public class BaseServiceImpl implements IBaseService { //把时间格式化成 yyyy_MM_dd 的日期 yuYueDate = DateUtils.formatDate(yuYueDate,DateUtils.Y_M_D); } - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setNextCheckTimeStart(yuYueDate); - antExChuQuery.setNextCheckTimeEnd(yuYueDate); - antExChuQuery.setHospitalId(tempHid); - List chus = antenatalExaminationService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(chus)) - { - for (AntExChuModel chu : chus) - { - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setParentId(chu.getParentId()); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId(tempHid); - //复诊不存在 才添加 - List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (!CollectionUtils.isNotEmpty(list)) - { - idset.add(chu.getParentId()); - } - } - } - PatientsQuery patientQuery = new PatientsQuery(); - patientQuery.setYn(YnEnums.YES.getId()); - List buildType = new ArrayList(); - buildType.add(0); - buildType.add(2); - patientQuery.setBuildTypeList(buildType); - //1孕妇 3 产妇 - patientQuery.setType(1); - //分娩状态 - patientQuery.setDueStatus(0); - patientQuery.setHospitalId(tempHid); - - //末次月经必须大于当前时间减去42周视为未分娩孕妇 - Date lastMensesMax = DateUtils.getNewDate(new Date(),-42, "周", 1); - patientQuery.setLastMensesStart(lastMensesMax); - - List patientses = patientsService.queryPatient(patientQuery); - if (CollectionUtils.isNotEmpty(patientses)) + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setHospitalId(tempHid); + antExRecordQuery.setNextCheckTimeStart(yuYueDate); + antExRecordQuery.setNextCheckTimeEnd(yuYueDate); + + System.out.println(antExRecordQuery.convertToQuery().convertToMongoQuery().toString()); + List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); + if (CollectionUtils.isNotEmpty(antExRecordModelList)) { - for (Patients pat : patientses) + for (AntExRecordModel model : antExRecordModelList) { - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setParentId(pat.getId()); - antExQuery.setYn(YnEnums.YES.getId()); - List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (CollectionUtils.isNotEmpty(list)) - { - AntenatalExaminationModel ae = list.get(0); - if (ae != null && ae.getNextCheckTime() != null) - { - if (DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D).equals(DateUtils.getDateStr(ae.getNextCheckTime(), DateUtils.Y_M_D))) { - idset.add(ae.getParentId()); - } - } - } + idset.add(model.getParentId()); } } + return idset; + + +// AntExChuQuery antExChuQuery = new AntExChuQuery(); +// antExChuQuery.setYn(YnEnums.YES.getId()); +// antExChuQuery.setNextCheckTimeStart(yuYueDate); +// antExChuQuery.setNextCheckTimeEnd(yuYueDate); +// antExChuQuery.setHospitalId(tempHid); +// List chus = antenatalExaminationService.queryAntExChu(antExChuQuery); +// if (CollectionUtils.isNotEmpty(chus)) +// { +// for (AntExChuModel chu : chus) +// { +// AntExQuery antExQuery = new AntExQuery(); +// antExQuery.setParentId(chu.getParentId()); +// antExQuery.setYn(YnEnums.YES.getId()); +// antExQuery.setHospitalId(tempHid); +// //复诊不存在 才添加 +// List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); +// if (!CollectionUtils.isNotEmpty(list)) +// { +// idset.add(chu.getParentId()); +// } +// +// } +// } +// +// PatientsQuery patientQuery = new PatientsQuery(); +// patientQuery.setYn(YnEnums.YES.getId()); +// List buildType = new ArrayList(); +// buildType.add(0); +// buildType.add(2); +// patientQuery.setBuildTypeList(buildType); +// //1孕妇 3 产妇 +// patientQuery.setType(1); +// //分娩状态 +// patientQuery.setDueStatus(0); +// patientQuery.setHospitalId(tempHid); +// +// //末次月经必须大于当前时间减去42周视为未分娩孕妇 +// Date lastMensesMax = DateUtils.getNewDate(new Date(),-42, "周", 1); +// patientQuery.setLastMensesStart(lastMensesMax); +// +// List patientses = patientsService.queryPatient(patientQuery); +// if (CollectionUtils.isNotEmpty(patientses)) +// { +// for (Patients pat : patientses) +// { +// AntExQuery antExQuery = new AntExQuery(); +// antExQuery.setParentId(pat.getId()); +// antExQuery.setYn(YnEnums.YES.getId()); +// List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); +// if (CollectionUtils.isNotEmpty(list)) +// { +// AntenatalExaminationModel ae = list.get(0); +// if (ae != null && ae.getNextCheckTime() != null) +// { +// if (DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D).equals(DateUtils.getDateStr(ae.getNextCheckTime(), DateUtils.Y_M_D))) { +// idset.add(ae.getParentId()); +// } +// } +// } +// } +// } +// return idset; } /** diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 73d188c..2b82d53 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -1273,15 +1273,13 @@ public class TempleteMsgGenerateWorker implements Runnable { addYumRemindMessages(template, config, service, tempHid, sendTimeType, messages,start, end, patient); } } else { - PatientsQuery query = getPatientsQuery(template, true); - query.setLastMensesStart(startDate); - query.setLastMensesEnd(endDate); - - List patients = yunBookbuildingService.queryPregnantWithQuery(query); + // PatientsQuery query = getPatientsQuery(template, true); + patientsQuery.setLastMensesStart(startDate); + patientsQuery.setLastMensesEnd(endDate); + System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); for (Patients patient : patients){ - HashMap hashMap = getMapByParam(template, patient.getId(), false); - List patientServices = patientServiceService.getPatientServices(hashMap); - if (CollectionUtils.isNotEmpty(patientServices)){ + if (CollectionUtils.isNotEmpty(patients)){ addYumRemindMessages(template, config, service, tempHid, sendTimeType, messages,start, end, patient); } } @@ -1354,12 +1352,12 @@ public class TempleteMsgGenerateWorker implements Runnable { if (existMsg){ continue; } - - HashMap hashMap = getMapByParam(template, patient.getId(), false); - List patientServices = patientServiceService.getPatientServices(hashMap); - if (CollectionUtils.isNotEmpty(patientServices)){ - addYunOverdueMessages(template, config, service, messages, yuYueDate, patient); - } + addYunOverdueMessages(template, config, service, messages, yuYueDate, patient); +// HashMap hashMap = getMapByParam(template, patient.getId(), false); +// List patientServices = patientServiceService.getPatientServices(hashMap); +// if (CollectionUtils.isNotEmpty(patientServices)){ +// addYunOverdueMessages(template, config, service, messages, yuYueDate, patient); +// } } list.setMessages(messages); HelperUtils.sendMsg(list); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index c12b25d..dd97b66 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -293,6 +293,7 @@ public class PatientSyncMysqlFacade { public void syncAntex(Date start,Date end) { AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setHospitalId("2100001377"); if (start != null) @@ -767,41 +768,54 @@ public class PatientSyncMysqlFacade { String assistFood = babyCheckModel.getAssistFood(); if (StringUtils.isNotEmpty(assistFood)) { - JSONObject jsonObject = JsonUtil.getObj(assistFood); - if (jsonObject != null && jsonObject.size() > 0 && "yes".equals(jsonObject.get("yesOrNo").toString()) && jsonObject.get("qtText") != null) - { - mysqlBabyCheck.setAssistFood(jsonObject.get("qtText").toString()); - } - else if (jsonObject != null && "no".equals(jsonObject.get("yesOrNo").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(assistFood); + if (jsonObject != null && jsonObject.size() > 0 && "yes".equals(jsonObject.get("yesOrNo").toString()) && jsonObject.get("qtText") != null) + { + mysqlBabyCheck.setAssistFood(jsonObject.get("qtText").toString()); + } + else if (jsonObject != null && "no".equals(jsonObject.get("yesOrNo").toString())) + { + mysqlBabyCheck.setAssistFood(null); + } + }catch (Exception e) { - mysqlBabyCheck.setAssistFood(null); + mysqlBabyCheck.setAssistFood(assistFood); } + + } String faceColor = babyCheckModel.getFaceColor(); if (StringUtils.isNotEmpty(faceColor)) { - JSONObject jsonObject = JsonUtil.getObj(faceColor); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString())) - { - if ( "1".equals(jsonObject.get("select").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(faceColor); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString())) { - faceColor ="红润"; - }else if ( "2".equals(jsonObject.get("select").toString())) - { - faceColor ="黄染"; + if ( "1".equals(jsonObject.get("select").toString())) + { + faceColor ="红润"; + }else if ( "2".equals(jsonObject.get("select").toString())) + { + faceColor ="黄染"; + } + else + { + faceColor = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + } + mysqlBabyCheck.setFaceColor(faceColor); } else { - faceColor = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + mysqlBabyCheck.setFaceColor(null); } - mysqlBabyCheck.setFaceColor(faceColor); - } - else + }catch (Exception e) { - mysqlBabyCheck.setFaceColor(null); + mysqlBabyCheck.setFaceColor(faceColor); } + } @@ -868,18 +882,24 @@ public class PatientSyncMysqlFacade { String neck = babyCheckModel.getNeck(); if (StringUtils.isNotEmpty(neck)) { - JSONObject jsonObject = JsonUtil.getObj(neck); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString())) - { - if ( "yes".equals(jsonObject.get("yesOrNo").toString())) - { - neck = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; - }else if ( "no".equals(jsonObject.get("yesOrNo").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(neck); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString())) { - neck ="无"; + if ( "yes".equals(jsonObject.get("yesOrNo").toString())) + { + neck = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + }else if ( "no".equals(jsonObject.get("yesOrNo").toString())) + { + neck ="无"; + } + mysqlBabyCheck.setNeck(neck); } + }catch (Exception e) + { mysqlBabyCheck.setNeck(neck); } + } Map navel = babyCheckModel.getNavel(); @@ -950,95 +970,126 @@ public class PatientSyncMysqlFacade { String chest = babyCheckModel.getChest(); if (StringUtils.isNotEmpty(chest)) { - JSONObject jsonObject = JsonUtil.getObj(chest); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString())) - { - if ( "yes".equals(jsonObject.get("yesOrNo").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(chest); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString())) { - chest = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; - }else if ( "no".equals(jsonObject.get("yesOrNo").toString())) - { - chest ="无"; + if ( "yes".equals(jsonObject.get("yesOrNo").toString())) + { + chest = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + }else if ( "no".equals(jsonObject.get("yesOrNo").toString())) + { + chest ="无"; + } + mysqlBabyCheck.setChest(chest); } + } + catch (Exception e) + { mysqlBabyCheck.setChest(chest); } + } String portaGenitals = babyCheckModel.getPortaGenitals(); if (StringUtils.isNotEmpty(portaGenitals)) { - JSONObject jsonObject = JsonUtil.getObj(portaGenitals); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()) && "yes".equals(jsonObject.get("yesOrNo").toString())) - { - mysqlBabyCheck.setPortaGenitals("异常"); - } - else if ("no".equals(jsonObject.get("yesOrNo").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(portaGenitals); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString()) && "yes".equals(jsonObject.get("yesOrNo").toString())) + { + mysqlBabyCheck.setPortaGenitals("异常"); + } + else if ("no".equals(jsonObject.get("yesOrNo").toString())) + { + mysqlBabyCheck.setPortaGenitals("未见异常"); + } + }catch (Exception e) { - mysqlBabyCheck.setPortaGenitals("未见异常"); + mysqlBabyCheck.setPortaGenitals("portaGenitals"); } + } String stoopStatus = babyCheckModel.getStoopStatus(); if (StringUtils.isNotEmpty(stoopStatus)) { - JSONObject jsonObject = JsonUtil.getObj(stoopStatus); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString())) - { - if ( "yes".equals(jsonObject.get("yesOrNo").toString())) - { - stoopStatus = "异常"; - }else if ( "no".equals(jsonObject.get("yesOrNo").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(stoopStatus); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString())) { - stoopStatus ="未见异常"; + if ( "yes".equals(jsonObject.get("yesOrNo").toString())) + { + stoopStatus = "异常"; + }else if ( "no".equals(jsonObject.get("yesOrNo").toString())) + { + stoopStatus ="未见异常"; + } + mysqlBabyCheck.setStoopStatus(stoopStatus); } + }catch (Exception e) + { mysqlBabyCheck.setStoopStatus(stoopStatus); } + } String stoopSign = babyCheckModel.getStoopSign(); if (StringUtils.isNotEmpty(stoopSign)) { - JSONObject jsonObject = JsonUtil.getObj(stoopSign); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString())) - { - if ( "yes".equals(jsonObject.get("yesOrNo").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(stoopSign); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("yesOrNo").toString())) { - stoopSign = "异常"; - }else if ( "no".equals(jsonObject.get("yesOrNo").toString())) - { - stoopSign ="未见异常"; + if ( "yes".equals(jsonObject.get("yesOrNo").toString())) + { + stoopSign = "异常"; + }else if ( "no".equals(jsonObject.get("yesOrNo").toString())) + { + stoopSign ="未见异常"; + } + mysqlBabyCheck.setStoopSign(stoopSign); } + }catch (Exception e) + { mysqlBabyCheck.setStoopSign(stoopSign); } + } String hipJoint = babyCheckModel.getHipJoint(); if (StringUtils.isNotEmpty(hipJoint)) { - JSONObject jsonObject = JsonUtil.getObj(hipJoint); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString())) - { - if ( "1".equals(jsonObject.get("select").toString())) - { - hipJoint = "未见明显异常"; - }else if ( "2".equals(jsonObject.get("select").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(hipJoint); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString())) { - hipJoint ="接近正常"; + if ( "1".equals(jsonObject.get("select").toString())) + { + hipJoint = "未见明显异常"; + }else if ( "2".equals(jsonObject.get("select").toString())) + { + hipJoint ="接近正常"; + } + else if ( "3".equals(jsonObject.get("select").toString())) + { + hipJoint = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + } + mysqlBabyCheck.setHipJoint(hipJoint); } - else if ( "3".equals(jsonObject.get("select").toString())) + else { - hipJoint = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + mysqlBabyCheck.setHipJoint(null); } - mysqlBabyCheck.setHipJoint(hipJoint); - } - else + }catch (Exception e) { - mysqlBabyCheck.setHipJoint(null); + mysqlBabyCheck.setHipJoint(hipJoint); } + } mysqlBabyCheck.setHemoglobin(babyCheckModel.getHemoglobin()); @@ -1099,18 +1150,24 @@ public class PatientSyncMysqlFacade { String slscx = mysqlBabyCheck.getSlscx(); if (StringUtils.isNotEmpty(slscx)) { - JSONObject jsonObject = JsonUtil.getObj(slscx); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString())) - { - if ( "2".equals(jsonObject.get("select").toString())) - { - slscx = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; - }else if ( "1".equals(jsonObject.get("select").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(slscx); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString())) { - slscx ="未见异常"; + if ( "2".equals(jsonObject.get("select").toString())) + { + slscx = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + }else if ( "1".equals(jsonObject.get("select").toString())) + { + slscx ="未见异常"; + } + mysqlBabyCheck.setSlscx(slscx); } + }catch (Exception e) + { mysqlBabyCheck.setSlscx(slscx); } + } else { @@ -1149,24 +1206,30 @@ public class PatientSyncMysqlFacade { if (StringUtils.isNotEmpty(hearing)) { String hearingStr = ""; - JSONObject jsonObject = JsonUtil.getObj(hearing); - if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString())) - { - if ( "1".equals(jsonObject.get("select").toString())) + try { + JSONObject jsonObject = JsonUtil.getObj(hearing); + if (jsonObject != null && jsonObject.size() > 0 && StringUtils.isNotEmpty(jsonObject.get("select").toString())) { - hearingStr = "通过"; - }else if ( "2".equals(jsonObject.get("select").toString())) { - hearingStr = "未通过"; - } - else if ( "3".equals(jsonObject.get("select").toString())) - { - hearingStr = "未筛查"; - } - else { - hearingStr = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + if ( "1".equals(jsonObject.get("select").toString())) + { + hearingStr = "通过"; + }else if ( "2".equals(jsonObject.get("select").toString())) { + hearingStr = "未通过"; + } + else if ( "3".equals(jsonObject.get("select").toString())) + { + hearingStr = "未筛查"; + } + else { + hearingStr = jsonObject.get("qtText") !=null ? jsonObject.get("qtText").toString() : null; + } + mysqlBabyCheck.setHearing(hearingStr); } - mysqlBabyCheck.setHearing(hearingStr); + }catch (Exception e) + { + mysqlBabyCheck.setHearing(hearing); } + } else { 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 7ac4acf..d54192a 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 @@ -51,11 +51,11 @@ public class SyncDataTaskService { // urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑"); // urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统"); // urls.put("area-lc-api.healthbaby.com.cn:55581","聊城"); - urls.put("area-dz-api.healthbaby.com.cn:12356","德州"); + // urls.put("area-dz-api.healthbaby.com.cn:12356","德州"); urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛"); // urls.put("area-nc-api.healthbaby.com.cn:12356","南充"); //urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵"); - urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院"); + // urls.put("area-zhuchengrenmin-api.healthbaby.com.cn:12356","诸城人民医院"); urls.put("area-hengshui-api.healthbaby.com.cn:8787","衡水区域"); urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成"); urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院"); @@ -167,8 +167,8 @@ public class SyncDataTaskService { { if ("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4".equals( model.getClassName()) || "26EB0301C4A2410E90985A3E55856E4BD23678A20530C64EC8478C7581BC98073D9BFF0544133E28AB36B23DF4485FB8".equals(model.getClassName()) - || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89") - || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB") +// || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4BC90B764322A576155B201AFB0BC8C94FFAB29197A8B86F592DD2ABABF896EB89") +// || model.getClassName().equals("26EB0301C4A2410E90985A3E55856E4B3C4D479C08144B1C305459866E333E5EA9DBC5ADCC909D6B56A15E9ACD7D84BB") ) { //System.out.println("archiveData="+model.getClassName()); diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index 8379827..42a1797 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -521,6 +521,22 @@ + + + + + + + + + + + + + + + + @@ -529,6 +545,7 @@ + -- 1.8.3.1