From 0d83cc41afeba76d37a7d21fd047d886a1fef8cf Mon Sep 17 00:00:00 2001 From: baohanddd Date: Wed, 19 Oct 2016 15:27:38 +0800 Subject: [PATCH] update assconfig table name --- .../lyms/platform/biz/BasicConfigServiceTest.java | 91 ++++++++++- .../platform/biz/service/MongoSyncService.java | 31 ++++ .../lyms/platform/common/utils/MongoSyncUtil.java | 46 +----- .../java/com/lyms/platform/pojo/AssayConfig.java | 20 +++ .../java/com/lyms/platform/pojo/LisCrisisItem.java | 166 +++++++++++++++++++++ .../java/com/lyms/platform/pojo/LisReport.java | 150 +++++++++++++++++++ .../java/com/lyms/platform/pojo/LisReportItem.java | 98 ++++++++++++ .../lyms/platform/query/LisCrisisItemQuery.java | 67 +++++++++ .../com/lyms/platform/query/LisReportQuery.java | 15 ++ .../java/com/lyms/hospitalapi/qhdfy/ConnTools.java | 78 ++++++++++ .../lyms/hospitalapi/qhdfy/QhdfyHisService.java | 95 ++++++++++++ .../com/lyms/hospitalapi/qhdfy/QhdfyLisReport.java | 144 ++++++++++++++++++ .../lyms/hospitalapi/qhdfy/QhdfyLisReportItem.java | 98 ++++++++++++ .../java/com/lyms/hospitalapi/qhdfy/README.TXT | 1 + .../java/com/lyms/platform/operate/web/Test.java | 31 +++- .../operate/web/controller/TestController.java | 28 ++++ .../src/main/resources/config.properties | 2 +- 17 files changed, 1107 insertions(+), 54 deletions(-) create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java create mode 100644 platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java create mode 100644 platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java create mode 100644 platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyLisReport.java create mode 100644 platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyLisReportItem.java create mode 100644 platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/README.TXT 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 9848e0c..898b4db 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 @@ -6,20 +6,22 @@ import java.text.SimpleDateFormat; import java.util.*; import com.lyms.platform.biz.dal.impl.YunBookbuildingDaoImpl; -import com.lyms.platform.biz.service.GuidelinesService; +import com.lyms.platform.biz.param.AssayConfigQuery; +import com.lyms.platform.biz.service.*; +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.JsonUtil; import com.lyms.platform.common.utils.PingYinUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.pojo.*; +import com.lyms.platform.query.BasicConfigQuery; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; import org.apache.struts.config.BaseConfig; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.lyms.platform.biz.service.BabyService; -import com.lyms.platform.biz.service.PuerperaService; -import com.lyms.platform.biz.service.VisitService; import com.lyms.platform.query.PuerperaModelQuery; import org.springframework.data.mongodb.core.MongoTemplate; @@ -86,6 +88,87 @@ public class BasicConfigServiceTest { // addZhenduan(applicationContext); // addHealthConfig(applicationContext); +// addCheckItem(applicationContext); + queryRisk(applicationContext); + } + + // fb43fd5a-b153-4cb9-9180-c46f5612ba43 + public static void queryRisk(ApplicationContext applicationContext) { + MongoTemplate mongoTemplate + =(MongoTemplate)applicationContext.getBean("mongoTemplate"); + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); + try { + BasicConfigQuery query = new BasicConfigQuery(); + query.setParentId("fb43fd5a-b153-4cb9-9180-c46f5612ba43"); + query.setYn(1); + query.setEnable(1); + List list = mongoTemplate.find(query.convertToQuery().convertToMongoQuery(), BasicConfig.class); + for (BasicConfig config:list) { + System.out.println(config.getName()); + query.setParentId(config.getId()); + List sublist = mongoTemplate.find(query.convertToQuery().convertToMongoQuery(), BasicConfig.class); + for (BasicConfig sub:sublist) { + System.out.println(sub.getName()); + } + } + + System.out.println(); + System.out.println(); + + String classes[] = {"","生化","外送","发光免疫","血常规","体液常规","血凝","艾滋","免疫","","微生物","其他","脑脊液生化","微量元素","分泌物检测(BV)"}; + for (String s:classes) { + if (StringUtils.isNotBlank(s)) { + MongoCondition condition = MongoCondition.newInstance("classify", s.trim(), MongoOper.IS); + List assayConfigList = mongoTemplate.find(condition.toMongoQuery().convertToMongoQuery(), AssayConfig.class); + System.out.println(s); + for (AssayConfig config:assayConfigList) { + System.out.print(config.getProjectName()); + System.out.print(" , "); + } + + System.out.println(); + } + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void addCheckItem(ApplicationContext applicationContext) { + MongoTemplate mongoTemplate + =(MongoTemplate)applicationContext.getBean("mongoTemplate"); + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); + try { + String classes[] = {"","生化","外送","发光免疫","血常规","体液常规","血凝","艾滋","免疫","","微生物","其他","脑脊液生化","微量元素","分泌物检测(BV)"}; + List list = FileUtils.readLines(new File("E:\\temp\\item.csv")); + int i=0; + for (String line:list) { + i++; + String[] array = line.trim().split("\t"); + if (array.length >= 22) { + AssayConfig config = new AssayConfig(); + config.setYn("1"); + config.setPrint("1"); + config.setHospitalId("216"); + config.setProjectCode(array[0].trim()); + config.setStandardCode(array[1].trim()); + config.setClassify(classes[Integer.valueOf(array[3].trim())]); + config.setProjectName(array[2].trim()); + config.setDefaultValue(array[6].trim()); + config.setResultType(array[4].trim()); + config.setId(""+i); + if (array.length == 25) { + config.setDesc(array[24].trim()); + } + + System.out.println(JsonUtil.obj2JsonString(config)); + mongoTemplate.insert(config); + } + } + } catch (IOException e) { + e.printStackTrace(); + } } public static void addZhenduan(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 d7c78a9..18c785e 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 @@ -30,6 +30,7 @@ public class MongoSyncService { @Autowired protected MongoTemplate mongoTemplate; + public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0"); public boolean syncData(String action, String id, String className, String json) { @@ -55,6 +56,36 @@ public class MongoSyncService { Class cla = Class.forName(LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key)); mongoTemplate.findAllAndRemove(new MongoQuery(new MongoCondition("id", LymsEncodeUtil.aesDecrypt(id, mongo_crypto_key), MongoOper.IS)).convertToMongoQuery(), cla); return true; + } else if (action.startsWith("Mysql")) { + return syncMysqlData(action,id,className,json); + } + return false; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + private boolean syncMysqlData(String action, String id, String className, String json) { + try { + String cname = LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key); + if ("MysqlAdd".equals(action)) { + Object entity = JsonUtil.jkstr2Obj(LymsEncodeUtil.aesDecrypt(json, mongo_crypto_key), Class.forName(cname)); + if (cname.endsWith("Users")) { + + } + return true; + } else if ("MysqlUpdate".equals(action)) { + Class cla = Class.forName(LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key)); + Object obj = JsonUtil.jkstr2Obj(LymsEncodeUtil.aesDecrypt(json, mongo_crypto_key), cla); + Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(obj)); + Assert.notNull(update, "execute update method must not null."); + mongoTemplate.updateMulti(new MongoQuery(new MongoCondition("id", LymsEncodeUtil.aesDecrypt(id, mongo_crypto_key), MongoOper.IS)).convertToMongoQuery(), update, cla); + return true; + } else if ("MysqlDel".equals(action)) { + Class cla = Class.forName(LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key)); + mongoTemplate.findAllAndRemove(new MongoQuery(new MongoCondition("id", LymsEncodeUtil.aesDecrypt(id, mongo_crypto_key), MongoOper.IS)).convertToMongoQuery(), cla); + return true; } return false; } catch (Exception e) { 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 c6c3336..14ecc89 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 @@ -88,49 +88,9 @@ public class MongoSyncUtil { info.setLimit(456); Object aaa = JsonUtil.str2Obj(JsonUtil.obj2JsonString(info), Class.forName(info.getClass().getName())); System.out.println(MD5Utils.md5(aaa.getClass().getName())); - System.out.println(LymsEncodeUtil.aesEncrypt("com.lyms.platform.common.utils.MongoSyncUtil", "Lymsh@2016")); - System.out.println(LymsEncodeUtil.aesDecrypt("tjRvEtdaZCzlpZQYqbJjrxslbB5yuZk8m4OzVRMv4Gs=", "Lymsh@2016")); - System.out.println(LymsEncodeUtil.aesDecrypt("JusDAcSiQQ6QmFo+VYVuS4ZzDNRVQv1RKdjtxe1MaQ0=","Lymsh@2016")); - System.out.println(LymsEncodeUtil.aesDecrypt("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","Lymsh@2016")); + System.out.println(LymsEncodeUtil.aesEncrypt("5805868f28b6213d2b7755eb", "Lymsh@2016")); + System.out.println(LymsEncodeUtil.aesDecrypt("8092817F8193D33BE10DE56935C157288FCAC8B7692BECA293504A9D487C207288C0A44ECA93600DC916D943AB6123AE24C1291D79503683D613C576B3704ABE82FA9B1285B343DD091E04C8FFB1BB8C6B0FCD48E397BAB86F484CC534AB6F1F0FAF4BB2B8CCE48F4FD740C102F72D564E92B74D4F463543A39A14D33D6E86E53DD7F5E6827006C1D2C9148C70AA6B397B90CE84E774FCFB5D034E79306BAB24481AC7617B763C4F2B94E71E9C68E2EE0222EB4AD90C2860303BFFDAD3F8F5FCE5C8D26B4D4B14DEBEC8C176A5E19EDA25CF68C1394D435267882C4C8D3D736F84004985A18CA0FF5C100AC40A074981485C7410DB4C4DD101E424E283D7FC3A69914727D5554C2C810862656190567AA211CAEE091BD384271C31DD7276E10FB8CECE0790D59EE18A06ABC1CBC406800057030323C8F3C2C16D9E85E31BE2D63CA31D99FCC5C7E2E1D552779ED5E57AF484BE7F34FBAF0BA5AB6CEB43FA45E231BE428D83ADE2C08CFF0A40E28F8441A16D4A3582B74273F081F4C7E7C672412FAB2E061F0C89DFED5BF6675CC648AE0EABFCC3B87A0316C65590C4F2C7ECB93C4952AC4257BC562D99D9A71E70B3077FA37536B654EF0879BF4B474FCE978059C6FBFDBF35E69D678F9B70E231FA2077B1D2F46B4E7ACAC5592BE63F472F4499DC4A529AA5E95ED41FADDE96378B571AE02F614F124D4DD4AD65A65E7051AC5C4AC46B99B40D4E02E12B25B47A695802B27A888070A3B7B1BC22DE5A9451BB7C09DDB298B5DDB73754339039288DECB1FFD31A0045F8543AA081E29A08DF99F4F48320FC6C6321D6C8932806332B8FDDE30E6CC26A271D429AD79B25DE1D2B9CA51E04BCDCE9BD290932583774FF2790E22C9E0D66FF266C8B3CBB92959CA1C50BB2E92E007FE74F7EE562C6833E69864B1F0D1621F213B05A2BE63B75418A0948D613E0BE8B894D01A7F120850AF98A938FD4DB6AB75E949F5FF0E75AF9A4667C0D4466778CB198B33F526285D90D5809FE7FC862E60A744664B9BFB91A2E43AA3434402EFE9217A7ADF8C519A5B6A48EF852E45E027C8BE9424D79A8096F4C98DE16B0DE2E5740F75C0DDF0AC8192818C6D864F41DBC6C4898EFB692103A97270F4AE03E9300215D65EEDD52473AAD0F83290CA85F9E190B154E34D56E18370F12F33DBD7F35DA476ECF7211000C0508805E2429422A94DBD3296C26D8A859C6FBFDBF35E69D678F9B70E231FA20C0A36E8D6883CAE2D7B9978221B55E60E9BAF730BFDE116772B4DF6EAD107B250E2B987756AB90DC6166A136FEA7010B1FCE2788ADA2367F164094325BD7A323B6C67115C6964F7FE56F4914D0DE29D08787DCB10387B961DAC2F78A57981019761845FD51D9E9660451E80D7571F139589896E7DAE2BE922E4F5D602FD236EC21F2D6AF5065D713651E7DFB03B2E5B9FE92BE862EE68DE6A87F54F32A4F77B3712A1A4EEF4C51F6EDB8CCA328CDF80E0BC4EFA0EF67722046233C573B2E7F4E3A565A023EB0BD21B8D9CB96F8D27C801603E9E8A0A37EF7560C60C9E0AD61F1A1D56232735737611C568891F9143E909E0106D24953F43ECDF140B4A4E135FFF4CCA890FF6665BDB98EA1D1E26F864873ED16E397A618A33A253CB146C56B720E5A8D87880883F1B998EFAC7EBF71E9071DA71742CA50E2BE993C01CABBD44A4D4E4E93D6C6F4A20823BD35BECD845E25C2DDD5348DA67E59F44C02802CADF275E3837194ADB682DB01ECCB3AE1B5A264BB921635F841985DBA35FF9503E27137DF2C8D0AE82BBD9C5FA01F2BC7292E8A04CF440C211CCEE96E7D38AE533205616D7E688F44DFD6F461006CF37F264A86622D89E0DEED5D91E44F3F017BC4AE43C6DA36B97C6B5043DFF6C1915402B5DB3D1115558F79E60C9CE05C91EDB676EEB7FF2ACF55CFEC73529C13EEF7D54ADD37CDCD26A2BCBD7D3B0490C71D8017FCBA98B43A2F596FC41DE2C62DEF3806C46D1B958C0D5614640EDB2DB5AB84D29A2F7C3E25DF156B420F9018D14ECCD8F3D60CE1E6D0913031E0C9F704235AF3BEB5CF751DBF40A1CA39723F715DEA598484957B2DC2AF8158CC06F48DFB90F1BF301F863C64F40159552FE92BFCFC4BE9863DDB4DD9427AF480798BAACBEFAEC10D8BCCDF41AB752E35CDA944A83DE43943EC82858A7E63968D9C151440433908E713529DCBF1F150B9C21CF655BF1A67EB5D81F48BB3DF540BB331F366A566B4CDC48029CFF5444DBB28AD5B77B138B09D6D553E9F753B48337ADA24059F8E1AEBC688333680DAD1E2A7866846B320C80FF26E0EF2FE50D3F92506262CFFB5793EA029F277E23C9B21DF19DE25DBBB5F52956EF90A2ECCB1E1190EF8638CBC1F659FD448576193F6692360505EB47B5878957F8286EFD1510E74687541E24DF44B751C30CCD886773459F0C9EE0470","Lymsh@2016")); + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java index cb707ca..65f908d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java @@ -1,10 +1,12 @@ package com.lyms.platform.pojo; import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; /** * 化验项 */ +@Document(collection = "lyms_assayconfig") public class AssayConfig extends BaseModel { /** * 添加字段注释 @@ -23,12 +25,30 @@ public class AssayConfig extends BaseModel { private String projectName; private String classify; //检验分类 private String resultType; //结果类型 + private String defaultValue; + private String desc; private String publishName; private String publishId; private Long createDate; private Long modifiedDate; + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public String getDefaultValue() { + return defaultValue; + } + + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + public String getPublishName() { return publishName; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java new file mode 100644 index 0000000..a630c63 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java @@ -0,0 +1,166 @@ +package com.lyms.platform.pojo; + +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +@Document(collection = "lyms_lis_crisis_item") +public class LisCrisisItem { + + private String id; + private String name; + private Integer age; + private String weeks; + private String itemCode; + private String itemName; + private String classify; + private String classifyName; + private String flag; + private String ref; + private String result; + private String unit; + private String applyDoctorCode; + private String applyDoctorName; + private Date publishTime; + private Integer status; + private String statusName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getWeeks() { + return weeks; + } + + public void setWeeks(String weeks) { + this.weeks = weeks; + } + + public String getItemCode() { + return itemCode; + } + + public void setItemCode(String itemCode) { + this.itemCode = itemCode; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public String getClassify() { + return classify; + } + + public void setClassify(String classify) { + this.classify = classify; + } + + public String getClassifyName() { + return classifyName; + } + + public void setClassifyName(String classifyName) { + this.classifyName = classifyName; + } + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + + public String getRef() { + return ref; + } + + public void setRef(String ref) { + this.ref = ref; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public String getApplyDoctorCode() { + return applyDoctorCode; + } + + public void setApplyDoctorCode(String applyDoctorCode) { + this.applyDoctorCode = applyDoctorCode; + } + + public String getApplyDoctorName() { + return applyDoctorName; + } + + public void setApplyDoctorName(String applyDoctorName) { + this.applyDoctorName = applyDoctorName; + } + + public Date getPublishTime() { + return publishTime; + } + + public void setPublishTime(Date publishTime) { + this.publishTime = publishTime; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getStatusName() { + return statusName; + } + + public void setStatusName(String statusName) { + this.statusName = statusName; + } +} 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 new file mode 100644 index 0000000..6d861eb --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java @@ -0,0 +1,150 @@ +package com.lyms.platform.pojo; + +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; +import java.util.List; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +@Document(collection = "lyms_lis_report") +public class LisReport { + + private String id; + private String patientFid; + private String patientHid; + private String vcCardNo; + private String name; + private String sex; + private Integer age; + private String deptCode; + private String deptName; + private String applyDoctorCode; + private String applyDoctorName; + private String checkDoctorCode; + private String checkDoctorName; + private Date publishTime; + + private List itemList; + + public List getItemList() { + return itemList; + } + + public void setItemList(List itemList) { + this.itemList = itemList; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatientFid() { + return patientFid; + } + + public void setPatientFid(String patientFid) { + this.patientFid = patientFid; + } + + public String getPatientHid() { + return patientHid; + } + + public void setPatientHid(String patientHid) { + this.patientHid = patientHid; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getDeptCode() { + return deptCode; + } + + public void setDeptCode(String deptCode) { + this.deptCode = deptCode; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getApplyDoctorCode() { + return applyDoctorCode; + } + + public void setApplyDoctorCode(String applyDoctorCode) { + this.applyDoctorCode = applyDoctorCode; + } + + public String getApplyDoctorName() { + return applyDoctorName; + } + + public void setApplyDoctorName(String applyDoctorName) { + this.applyDoctorName = applyDoctorName; + } + + public String getCheckDoctorCode() { + return checkDoctorCode; + } + + public void setCheckDoctorCode(String checkDoctorCode) { + this.checkDoctorCode = checkDoctorCode; + } + + public String getCheckDoctorName() { + return checkDoctorName; + } + + public void setCheckDoctorName(String checkDoctorName) { + this.checkDoctorName = checkDoctorName; + } + + public Date getPublishTime() { + return publishTime; + } + + public void setPublishTime(Date publishTime) { + this.publishTime = publishTime; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java new file mode 100644 index 0000000..7610526 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReportItem.java @@ -0,0 +1,98 @@ +package com.lyms.platform.pojo; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +public class LisReportItem { + + private String id; + private String code; + private String name; + private String result; + private String charResult; + private String numberResult; + private String flag; + private String ref; + private String unit; + private String resultType; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getCharResult() { + return charResult; + } + + public void setCharResult(String charResult) { + this.charResult = charResult; + } + + public String getNumberResult() { + return numberResult; + } + + public void setNumberResult(String numberResult) { + this.numberResult = numberResult; + } + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + + public String getRef() { + return ref; + } + + public void setRef(String ref) { + this.ref = ref; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public String getResultType() { + return resultType; + } + + public void setResultType(String resultType) { + this.resultType = resultType; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java new file mode 100644 index 0000000..fdd1f7a --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java @@ -0,0 +1,67 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import org.bson.types.ObjectId; + +import java.util.Date; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQuery { + + private String id; + private String name; + private String hospitalId; + private String itemCode; + private String itemName; + private String classify; + private String classifyName; + private String flag; + private String applyDoctorCode; + private String applyDoctorName; + private Integer status; + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + if (null != id) { + condition = condition.and("id", new ObjectId(id), MongoOper.IS); + } + + if (null != name) { + condition = condition.and("name", name, MongoOper.IS); + } + if(null!=itemCode){ + condition=condition.and("itemCode",itemCode,MongoOper.IS); + } + if(null!=itemName){ + condition=condition.and("itemName",itemName,MongoOper.IS); + } + if(null!=classify){ + condition=condition.and("classify",classify,MongoOper.IS); + } + + if(null!=classifyName){ + condition=condition.and("classifyName",classifyName,MongoOper.IS); + } + if (null != flag) { + condition = condition.and("flag", flag, MongoOper.IS); + } + if(null!=applyDoctorCode){ + condition=condition.and("applyDoctorCode",applyDoctorCode,MongoOper.IS); + } + if(null!=applyDoctorName){ + condition=condition.and("applyDoctorName",applyDoctorName,MongoOper.IS); + } + if(null!=status){ + condition=condition.and("status",status,MongoOper.IS); + } + + return condition.toMongoQuery(); + } +} 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 new file mode 100644 index 0000000..7e8d783 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/LisReportQuery.java @@ -0,0 +1,15 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoQuery; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +public class LisReportQuery extends BaseQuery implements IConvertToNativeQuery { + @Override + public MongoQuery convertToQuery() { + return null; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java new file mode 100644 index 0000000..b896ba6 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java @@ -0,0 +1,78 @@ +package com.lyms.hospitalapi.qhdfy; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + +/** + * Created by Administrator on 2016/9/9 0009. + + + + */ +public class ConnTools { + private static String hisDirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; + private static String hisUrl = "jdbc:sqlserver://168.254.0.7:1443; DatabaseName=THIS4"; + private static String hisUser = "sa"; + private static String hisPassword = "ccnms05*"; + + private static String pacsDirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; + private static String pacsUrl = "jdbc:sqlserver://168.254.0.9\\lis; DatabaseName=DBRIS501"; + private static String pacsUser = "sa"; + private static String pacsPassword = "ccnms05*"; + + private static String lisDirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; + private static String lisUrl = "jdbc:sqlserver://168.254.0.9\\lis; DatabaseName=DBLIS50"; + private static String lisUser = "sa"; + private static String lisPassword = "ccnms05*"; + + public static Connection makeHisConnection() { + Connection conn = null; + try { + Class.forName(hisDirverClassName); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + try { + conn = DriverManager.getConnection(hisUrl, hisUser, hisPassword); + } catch (SQLException e) { + e.printStackTrace(); + } + return conn; + } + + public static Connection makePacsConnection() { + Connection conn = null; + try { + Class.forName(pacsDirverClassName); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + try { + conn = DriverManager.getConnection(pacsUrl, pacsUser, pacsPassword); + } catch (SQLException e) { + e.printStackTrace(); + } + return conn; + } + + public static Connection makeLisConnection() { + Connection conn = null; + try { + Class.forName(lisDirverClassName); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + try { + conn = DriverManager.getConnection(lisUrl, lisUser, lisPassword); + } catch (SQLException e) { + e.printStackTrace(); + } + return conn; + } + + +} 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 new file mode 100644 index 0000000..83850f4 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -0,0 +1,95 @@ +package com.lyms.hospitalapi.qhdfy; + +import com.lyms.hospitalapi.pojo.CheckResponse; +import com.lyms.hospitalapi.pojo.RisCheckInfo; +import com.lyms.hospitalapi.v1.*; +import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.pojo.LisReport; +import com.lyms.platform.pojo.LisReportItem; +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.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +@Service("qhdfyHisService") +public class QhdfyHisService { + + @Autowired + private PatientsService patientsService; + + public List queryLisReport(Date startDate) { + List result = new ArrayList<>(); + if (null != startDate) { + Connection conn = ConnTools.makePacsConnection(); + QueryRunner queryRunner = new QueryRunner(); + try { + PatientsQuery patientsQuery = new PatientsQuery(); + String sql = "select top 10000 申请号,病人ID,住院号,卡号,患者姓名,性别,年龄,申请科室代码,申请科室名称,申请医生代码,申请医生名称,检查医生代码,检查医生名称,报告发布时间 from valllist_ex where 卡号 is not null and 报告发布时间>=? order by 申请号 desc"; + String subSql = "select top 1000 申请单号,项目代码,项目名称,项目结果,字符结果,数字结果,高低标志,参考值,单位,结果类型 from valresult_ex where 申请单号='"; + Object[] params = {startDate}; + List list = queryRunner.query(conn, sql, new BeanListHandler(QhdfyLisReport.class), params); + if (list.size() > 0) { + for (QhdfyLisReport report:list) { + patientsQuery.setVcCardNo(report.get卡号()); + int count = patientsService.queryPatientCount(patientsQuery); + if (count > 0) { + List itemList = queryRunner.query(conn, subSql+report.get申请号()+"'", new BeanListHandler(QhdfyLisReportItem.class)); + List lisReportItemList = new ArrayList<>(); + for (QhdfyLisReportItem item:itemList) { + LisReportItem lisReportItem = new LisReportItem(); + lisReportItem.setId(item.get申请单号()); + lisReportItem.setCharResult(item.get字符结果()); + lisReportItem.setCode(item.get项目代码()); + lisReportItem.setFlag(item.get高低标志()); + lisReportItem.setName(item.get项目名称()); + lisReportItem.setNumberResult(item.get数字结果()); + lisReportItem.setRef(item.get参考值()); + lisReportItem.setResult(item.get项目结果()); + lisReportItem.setResultType(item.get结果类型()); + lisReportItem.setUnit(item.get单位()); + lisReportItemList.add(lisReportItem); + } + LisReport lisReport = new LisReport(); + lisReport.setName(report.get患者姓名()); + lisReport.setAge(report.get年龄()); + lisReport.setApplyDoctorCode(report.get申请医生代码()); + lisReport.setApplyDoctorName(report.get检查医生名称()); + lisReport.setCheckDoctorCode(report.get检查医生代码()); + lisReport.setCheckDoctorName(report.get检查医生名称()); + lisReport.setDeptCode(report.get申请科室代码()); + lisReport.setDeptName(report.get申请科室名称()); + lisReport.setPatientFid(report.get病人ID()); + lisReport.setPatientHid(report.get住院号()); + lisReport.setId(report.get申请号()); + lisReport.setPublishTime(report.get报告发布时间()); + lisReport.setSex(report.get性别()); + lisReport.setVcCardNo(report.get卡号()); + lisReport.setItemList(lisReportItemList); + } + } + } + DbUtils.closeQuietly(conn); + return result; + } catch (SQLException e) { + DbUtils.closeQuietly(conn); + e.printStackTrace(); + return result; + } + } + return result; + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyLisReport.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyLisReport.java new file mode 100644 index 0000000..45384ff --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyLisReport.java @@ -0,0 +1,144 @@ +package com.lyms.hospitalapi.qhdfy; + +import java.util.Date; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +public class QhdfyLisReport { + + public static void main(String[] a) { + String str = "申请单号,项目代码,项目名称,项目结果,字符结果,数字结果,高低标志,参考值,单位,结果类型"; + String[] ss = str.split(","); + for (String s:ss) { + System.out.println("private String "+s+";"); + } + } + + private String 申请号; + private String 病人ID; + private String 住院号; + private String 卡号; + private String 患者姓名; + private String 性别; + private Integer 年龄; + private String 申请科室代码; + private String 申请科室名称; + private String 申请医生代码; + private String 申请医生名称; + private String 检查医生代码; + private String 检查医生名称; + private Date 报告发布时间; + + public String get申请号() { + return 申请号; + } + + public void set申请号(String 申请号) { + this.申请号 = 申请号; + } + + public String get病人ID() { + return 病人ID; + } + + public void set病人ID(String 病人ID) { + this.病人ID = 病人ID; + } + + public String get住院号() { + return 住院号; + } + + public void set住院号(String 住院号) { + this.住院号 = 住院号; + } + + public String get卡号() { + return 卡号; + } + + public void set卡号(String 卡号) { + this.卡号 = 卡号; + } + + public String get患者姓名() { + return 患者姓名; + } + + public void set患者姓名(String 患者姓名) { + this.患者姓名 = 患者姓名; + } + + public String get性别() { + return 性别; + } + + public void set性别(String 性别) { + this.性别 = 性别; + } + + public Integer get年龄() { + return 年龄; + } + + public void set年龄(Integer 年龄) { + this.年龄 = 年龄; + } + + public String get申请科室代码() { + return 申请科室代码; + } + + public void set申请科室代码(String 申请科室代码) { + this.申请科室代码 = 申请科室代码; + } + + public String get申请科室名称() { + return 申请科室名称; + } + + public void set申请科室名称(String 申请科室名称) { + this.申请科室名称 = 申请科室名称; + } + + public String get申请医生代码() { + return 申请医生代码; + } + + public void set申请医生代码(String 申请医生代码) { + this.申请医生代码 = 申请医生代码; + } + + public String get申请医生名称() { + return 申请医生名称; + } + + public void set申请医生名称(String 申请医生名称) { + this.申请医生名称 = 申请医生名称; + } + + public String get检查医生代码() { + return 检查医生代码; + } + + public void set检查医生代码(String 检查医生代码) { + this.检查医生代码 = 检查医生代码; + } + + public String get检查医生名称() { + return 检查医生名称; + } + + public void set检查医生名称(String 检查医生名称) { + this.检查医生名称 = 检查医生名称; + } + + public Date get报告发布时间() { + return 报告发布时间; + } + + public void set报告发布时间(Date 报告发布时间) { + this.报告发布时间 = 报告发布时间; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyLisReportItem.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyLisReportItem.java new file mode 100644 index 0000000..5527d61 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyLisReportItem.java @@ -0,0 +1,98 @@ +package com.lyms.hospitalapi.qhdfy; + +/** + * Created by Administrator on 2016/10/19 0019. + */ +public class QhdfyLisReportItem { + + private String 申请单号; + private String 项目代码; + private String 项目名称; + private String 项目结果; + private String 字符结果; + private String 数字结果; + private String 高低标志; + private String 参考值; + private String 单位; + private String 结果类型; + + public String get申请单号() { + return 申请单号; + } + + public void set申请单号(String 申请单号) { + this.申请单号 = 申请单号; + } + + public String get项目代码() { + return 项目代码; + } + + public void set项目代码(String 项目代码) { + this.项目代码 = 项目代码; + } + + public String get项目名称() { + return 项目名称; + } + + public void set项目名称(String 项目名称) { + this.项目名称 = 项目名称; + } + + public String get项目结果() { + return 项目结果; + } + + public void set项目结果(String 项目结果) { + this.项目结果 = 项目结果; + } + + public String get字符结果() { + return 字符结果; + } + + public void set字符结果(String 字符结果) { + this.字符结果 = 字符结果; + } + + public String get数字结果() { + return 数字结果; + } + + public void set数字结果(String 数字结果) { + this.数字结果 = 数字结果; + } + + public String get高低标志() { + return 高低标志; + } + + public void set高低标志(String 高低标志) { + this.高低标志 = 高低标志; + } + + public String get参考值() { + return 参考值; + } + + public void set参考值(String 参考值) { + this.参考值 = 参考值; + } + + public String get单位() { + return 单位; + } + + public void set单位(String 单位) { + this.单位 = 单位; + } + + public String get结果类型() { + return 结果类型; + } + + public void set结果类型(String 结果类型) { + this.结果类型 = 结果类型; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/README.TXT b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/README.TXT new file mode 100644 index 0000000..c2105bc --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/README.TXT @@ -0,0 +1 @@ +秦皇岛妇幼 \ No newline at end of file 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 c8713fa..c5296ec 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,15 +1,23 @@ package com.lyms.platform.operate.web; +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.common.utils.MongoConvertHelper; +import com.lyms.platform.common.utils.ReflectionUtils; +import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.PatientsQuery; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.data.mongodb.core.query.Update; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.List; /** * Created by Administrator on 2016/8/22 0022. @@ -17,13 +25,24 @@ import java.util.Date; public class Test{ public static void main(String[] args){ - Patients patients=new Patients(); - patients.setId("1111"); - patients.setBirth(DateUtil.parseYMD("2016-4-12")); - String s= JsonUtil.obj2Str(patients); - System.out.println(s); + PatientsQuery patientsQuery1 = new PatientsQuery(); + patientsQuery1.setPid("pid"); + patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setType(1); + Patients patients1 = new Patients(); + patients1.setModified(new Date()); - System.out.println(DateUtil.getymdhm(JsonUtil.jkstr2Obj(s, Patients.class).getBirth())); + List ids = new ArrayList<>(); + ids.add("id1"); + ids.add("id12"); + ids.add("id134"); + patients1.setRiskScore(12); + patients1.setRiskFactorId(ids); + patients1.setRiskLevelId(JsonUtil.array2JsonString(ids)); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(patients1)); + System.out.println(JsonUtil.obj2JsonString(patientsQuery1.convertToQuery().convertToMongoQuery())); + System.out.println(JsonUtil.obj2JsonString(update)); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index bd0cc88..7b46359 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.biz.JdbcUtil; +import com.lyms.platform.biz.service.PatientsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Controller; @@ -24,6 +25,10 @@ public class TestController { @Autowired private MongoTemplate mongoTemplate; + + @Autowired + private PatientsService patientsService; + /** * 获取科室 */ @@ -118,4 +123,27 @@ public class TestController { // System.out.println("同步结束孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>"); return "starting..........."; } + + + @RequestMapping(value = "/addSieveJob", method = RequestMethod.GET) + @ResponseBody + public String addSieveJob() { + patientsService.addSieveJob();; + return "finish"; + } + + @RequestMapping(value = "/autoMatDeliver", method = RequestMethod.GET) + @ResponseBody + public String autoMatDeliver() { + patientsService.autoMatDeliver();; + return "finish"; + } + + @RequestMapping(value = "/delSieve", method = RequestMethod.GET) + @ResponseBody + public String delSieve() { + patientsService.delSieve();; + return "finish"; + } + } diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index a684ffd..9ecc757 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -8,7 +8,7 @@ center_token=e0c56363-00d6-42ee-bbe0-23c553583062 his_version=0 #统计中心url -center_statistics_url=http://mms.api.stage.platform.healthbaby.com.cn/ +center_statistics_url=http://api.healthbaby.com.cn/ -- 1.8.3.1