From 469f747ef4d3d32b7967e397ae0ae2fa1263cb7a Mon Sep 17 00:00:00 2001 From: hanshaofeng Date: Wed, 9 Nov 2016 20:04:45 +0800 Subject: [PATCH] fuck ture and false --- .../lyms/platform/biz/BasicConfigServiceTest.java | 17 ++++++++++++++- .../platform/biz/service/MongoSyncService.java | 1 + .../lyms/platform/common/utils/MongoSyncUtil.java | 14 +++++++++++++ .../java/com/lyms/platform/pojo/LisReport.java | 9 ++++++++ .../com/lyms/platform/query/LisReportQuery.java | 12 +++++++++++ .../lyms/hospitalapi/qhdfy/QhdfyHisService.java | 24 ++++++++++++++-------- .../operate/web/service/SyncDataTaskService.java | 12 +++++++++++ 7 files changed, 79 insertions(+), 10 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index 1437ff9..5c8bfa8 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -97,7 +97,22 @@ public class BasicConfigServiceTest { // addHealthConfig(applicationContext); // saveHospitalMsgConfig(applicationContext); // saveHospitalMsgTemplate(applicationContext); - queryRisk(applicationContext); +// queryRisk(applicationContext); + testtt(applicationContext); + } + + public static void testtt(ApplicationContext applicationContext) { + MongoTemplate mongoTemplate + =(MongoTemplate)applicationContext.getBean("mongoTemplate"); + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); + MongoCondition mongoCondition = MongoCondition.newInstance("hospitalId", "216", MongoOper.IS); + List assayConfigList = mongoTemplate.find(mongoCondition.toMongoQuery().convertToMongoQuery(), AssayConfig.class); + Map assayConfigMap = new HashMap<>(); + for (AssayConfig config:assayConfigList) { + assayConfigMap.put(config.getProjectCode(), config); + } + System.out.println(JsonUtil.obj2Str(assayConfigMap)); + System.out.println(JsonUtil.obj2Str(assayConfigMap.get("PLT"))); } public static void saveHospitalMsgTemplate(ApplicationContext applicationContext) { 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 6728349..68063bd 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 @@ -38,6 +38,7 @@ public class MongoSyncService { public static final String CENTER_BASE_URL= PropertiesUtils.getPropertyValue("center_base_url"); public static final String CENTER_TOKEN = PropertiesUtils.getPropertyValue("center_token"); + public static final String timeAtts[] = {"checkDate","nextCheckTime","created","modified","dueDate","lastMenses","nextDate","birth","fbirth","mbirth","buildDate","vipEndTime","currentVisit","nextVisitDate","publishTime","bookbuildingDate","fmDate","husbandBirth","lastThTime","LastCTime","dueWeek","received","applyDate","sendDate","stopDate","start","end","nextCheckTimeStart","nextCheckTimeEnd","gteModified","gteCreated","start","end","buildDateStart","buildDateEnd","birthStart","birthEnd","nextDateStart","nextDateEnd","createdStart","endStart"}; public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0"); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/MongoSyncUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/MongoSyncUtil.java index f26bc33..7ea43d7 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/MongoSyncUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/MongoSyncUtil.java @@ -102,6 +102,20 @@ public class MongoSyncUtil { System.out.println(LymsEncodeUtil.aesDecrypt("26EB0301C4A2410E90985A3E55856E4B86730CD45542FD5129D8EDC5ED4C690D","Lymsh@2016")); String ssss = LymsEncodeUtil.aesDecrypt("E75ACE9E5E23E6BB253B26F8F5B94156B72CCE1E6118C8A72D501E3B34BC377B013B4A8AE524B0F33E9D2FF7001FBD08A60FA406B2C0D5EBA2B923156B223A45287B1B95F7DF5905EB8FABBD537800173C423A706FACE7C63D809A2274A60120F38E5C35AEE2869F44907FFECC2EA1221223D3E0F9B5EE703446A1156A673BEE02A5E94E27A525BBDC8909E6CCCFC63A2923F29B060D2A93A732C30123F4840CE2FF2CF876A3400189C3F23C51F810DA588177B9C1A4EC224920FF3C0EF44847E3C20529445FC6093CD123BF67CA58C11367F7C8D596859803B37BC9D9057FCC605B9D6BA1173BFFCEC688CF01B423E5", "Lymsh@2016"); System.out.println(ssss); + System.out.println(ssss); + UpdateMultiData data = new UpdateMultiData(); + data.setMongoQuery(new MongoQuery(new MongoCondition("parentId", "57d27d83f0f09ff4e51db341", MongoOper.IS)).convertToMongoQuery()); + Map u = new HashMap<>(); + u.put("score", 0); + u.put("rRisk", "[\"年龄??35??\"]"); + data.setUpdate(u); + System.out.println("---"+JsonUtil.obj2Str(data)); + System.out.println(LymsEncodeUtil.aesEncrypt(JsonUtil.obj2Str(data), "Lymsh@2016")); + + + String s = "{\"query\":{\"parentId\":\"581a91c528b67bb1fa239ce3\"},\"update\":{\"score\":0,\"rRisk\":\"[\\\"年龄??35??\\\"]\"}}"; + UpdateMultiData updateMultiData = JsonUtil.str2Obj(s, UpdateMultiData.class); + System.out.println(JsonUtil.obj2Str(updateMultiData)); } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java index bb3c053..fb6eedf 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java @@ -17,6 +17,7 @@ public class LisReport { private String patientFid; private String patientHid; private String vcCardNo; + private String phone; private String name; private String sex; private Integer age; @@ -30,6 +31,14 @@ public class LisReport { private Integer status;// 1:未计算危机;2:已计算危机 private String classifyName; + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + public String getClassifyName() { return classifyName; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java index 9c6f380..afd5b90 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java @@ -16,9 +16,18 @@ public class LisReportQuery extends BaseQuery implements IConvertToNativeQuery { private String id; private String hospitalId; private String vcCardNo; + private String phone; private String name; private Integer status;// 1:未计算危机;2:已计算危机 + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + public Integer getStatus() { return status; } @@ -77,6 +86,9 @@ public class LisReportQuery extends BaseQuery implements IConvertToNativeQuery { if(StringUtils.isNotBlank(name)){ condition=condition.and("name",name,MongoOper.IS); } + if(StringUtils.isNotBlank(phone)){ + condition=condition.and("phone",phone,MongoOper.IS); + } return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index d4137cc..3030674 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -9,17 +9,20 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.*; import com.lyms.platform.query.LisReportQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.dbutils.DbUtils; import org.apache.commons.dbutils.QueryRunner; import org.apache.commons.dbutils.handlers.BeanListHandler; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.File; import java.sql.Connection; import java.sql.SQLException; import java.util.*; @@ -63,14 +66,14 @@ public class QhdfyHisService { ReferConfigQuery referConfigQuery = new ReferConfigQuery(); referConfigQuery.setYn(YnEnums.YES.getId()); referConfigQuery.setHospitalId(hospitalId); + referConfigQuery.setLimit(10000); List referValueList = referConfigService.queryRefer(referConfigQuery); Map referValueMap = new HashMap<>(); for (ReferValue referValue:referValueList) { referValueMap.put(referValue.getCode(), referValue); } - PatientsQuery patientsQuery = new PatientsQuery(); - String sql = "select top 10000 shenqinghao as hospitalId,bingrenid as patientFid,zhuyuanhao as patientHid,kahao as vcCardNo,huanzhexingming as name,xingbie as sex,nianling as age,shenqingkeshidaima as deptCode,shenqingkeshimingcheng as deptName,shenqingyishengdaima as applyDoctorCode,shenqingyishengmingcheng as applyDoctorName,jianchayishengdaima as checkDoctorCode,jianchayishengxingming as checkDoctorName,baogaofabushijian as publishTime from valllist_ex_en where kahao is not null and shenqinghao is not null order by shenqinghao desc"; + String sql = "select top 100000 shenqinghao as hospitalId,bingrenid as patientFid,zhuyuanhao as patientHid,kahao as vcCardNo,phone,huanzhexingming as name,xingbie as sex,nianling as age,shenqingkeshidaima as deptCode,shenqingkeshimingcheng as deptName,shenqingyishengdaima as applyDoctorCode,shenqingyishengmingcheng as applyDoctorName,jianchayishengdaima as checkDoctorCode,jianchayishengxingming as checkDoctorName,baogaofabushijian as publishTime from valllist_ex_en where phone is not null and phone !='' and shenqinghao is not null order by shenqinghao desc"; String subSql = "select top 1000 sheqingdanhao as id,xiangmudaima as code,xiangmumingcheng as name,xiangmujieguo as result,zifujieguo as charResult,shuzijieguo as numberResult,gaodibiaozhi as flag,cankaozhi as ref,danwei as unit,jieguoleixing as result from valresult_ex_en where sheqingdanhao='"; Object[] params = {startDate}; List list = queryRunner.query(conn, sql, new BeanListHandler(LisReport.class)); @@ -82,10 +85,10 @@ public class QhdfyHisService { assayConfigMap.put(config.getProjectCode(), config); } for (LisReport report:list) { - patientsQuery.setVcCardNo(report.getVcCardNo()); + patientsQuery.setPhone(report.getPhone().trim()); int count = patientsService.queryPatientCount(patientsQuery); LisReportQuery lisReportQuery = new LisReportQuery(); - lisReportQuery.setVcCardNo(report.getVcCardNo()); + lisReportQuery.setId(hospitalId + "_" + report.getHospitalId()); lisReportQuery.setHospitalId(""+hospitalId); int reportCount = lisReportService.queryLisReportCount(lisReportQuery); if (count > 0 && reportCount == 0) { @@ -122,7 +125,7 @@ public class QhdfyHisService { // crisis init for (LisReportItem item:itemList) { boolean flag = false; - ReferValue referValue = referValueMap.get(item.getCode()); + ReferValue referValue = referValueMap.get(item.getCode().trim()); if (referValue != null) { if (StringUtils.isNotBlank(item.getNumberResult())) { crisisItem.setResult(item.getNumberResult()); @@ -132,11 +135,13 @@ public class QhdfyHisService { crisisItem.setResult(item.getResult()); } try { - if (referValue.getEmergencyChar() != null && referValue.getEmergencyChar().equals(crisisItem.getResult())) { + if (StringUtils.isNotBlank(referValue.getEmergencyChar()) && referValue.getEmergencyChar().equals(crisisItem.getResult())) { flag = true; - } else if (referValue.getEmergencyMax() != null && Double.valueOf(referValue.getEmergencyMax()) <= Double.valueOf(crisisItem.getResult())) { + } + if (StringUtils.isNotBlank(referValue.getEmergencyMax()) && Double.valueOf(referValue.getEmergencyMax()) <= Double.valueOf(crisisItem.getResult())) { flag = true; - } else if (referValue.getEmergencyMin() != null && Double.valueOf(referValue.getEmergencyMin()) >= Double.valueOf(crisisItem.getResult())) { + } + if (StringUtils.isNotBlank(referValue.getEmergencyMin()) && Double.valueOf(referValue.getEmergencyMin()) >= Double.valueOf(crisisItem.getResult())) { flag = true; } } catch (Exception e) { @@ -164,7 +169,7 @@ public class QhdfyHisService { } DbUtils.closeQuietly(conn); return result; - } catch (SQLException e) { + } catch (Exception e) { DbUtils.closeQuietly(conn); e.printStackTrace(); return result; @@ -258,6 +263,7 @@ public class QhdfyHisService { List list = new ArrayList<>(); if (lisReportList.size() > 0) { for (LisReport lisReport:lisReportList) { + // hospitalId为申请号 if (StringUtils.isNotBlank(lisReport.getHospitalId())) { List lisReportItemList = queryRunner.query(conn, subSql+lisReport.getHospitalId()+"'", new BeanListHandler(LisReportItem.class)); if (lisReportItemList != null && lisReportItemList.size() > 0) { 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 ba2a9fa..4500076 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.pojo.SyncDataModel; +import com.lyms.platform.common.pojo.UpdateMultiData; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.GuideQuery; import com.lyms.platform.permission.model.Users; @@ -9,6 +10,7 @@ import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; +import com.qiniu.util.Json; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.NameValuePair; import org.apache.commons.httpclient.methods.PostMethod; @@ -523,6 +525,16 @@ public class SyncDataTaskService { 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)); } private static Map buildRiskMap() { -- 1.8.3.1