From c923ee664a55ae29084c765c94e1642ed8a67948 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 3 Apr 2018 14:46:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E8=AF=8A=E6=96=AD=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/DiagnoseEnums.java | 53 +++++--- .../operate/web/facade/DiagnoseConfigFacde.java | 22 ++- .../operate/web/result/DiagnoseConfigResult.java | 30 ++-- .../operate/web/result/DiagnoseItemResult.java | 151 +++++++++++++++++++++ .../operate/web/service/SyncDataTaskService.java | 2 +- .../platform/report/web/inteceptor/TokenUtil.java | 77 +++++++++++ 6 files changed, 299 insertions(+), 36 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseItemResult.java create mode 100644 platform-report-api/src/main/java/com/lyms/platform/report/web/inteceptor/TokenUtil.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java index 9af103e..5c59946 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java @@ -27,7 +27,8 @@ public class DiagnoseEnums { jws(14, "既往史"), crbs(15, "传染病史"), ckjc(16, "产科检查"), - bc(17, "B超"); + bc(17, "B超"), + BCRSQK(18, "本次妊娠情况"); private DiagnoseItemEnums(int id, String title) { this.id = id; this.title = title; @@ -110,7 +111,8 @@ public class DiagnoseEnums { SZ(1, "数值比较"), WZ(2, "文字包含"), SF(3, "是否选择"), - XL(4, "下拉选择"); + XL(4, "下拉选择"), + WZJ(5, "无子集"); private TypeEnums(int id, String title) { this.id = id; @@ -208,7 +210,7 @@ public class DiagnoseEnums { CXGQT(6, "其他",5,TypeEnums.WZ.getId(),0,""), //辅助检查——血型 - RHXX(7, "RH血型",6,TypeEnums.SF.getId(),0,""), + RHXX(7, "RH血型——阳性（+）",6,TypeEnums.WZJ.getId(),0,""), XT(8, "血糖",6,TypeEnums.SZ.getId(),0,"mmol/L"), @@ -221,24 +223,27 @@ public class DiagnoseEnums { GGNBG(14, "丙肝",7,TypeEnums.SF.getId(),1,""), // 辅助检查——乙肝五项 - YGBMKY(15, "乙肝表面抗原",8,TypeEnums.SF.getId(),0,""), - YGBMKT(16, "乙肝表面抗体",8,TypeEnums.SZ.getId(),0,""), - YGEKY(17, "乙肝e抗原",8,TypeEnums.SZ.getId(),0,""), - YGEKT(18, "乙肝e抗体",8,TypeEnums.SZ.getId(),0,""), - YGKXKT(19, "乙肝核心抗体",8,TypeEnums.SZ.getId(),0,""), + YGBMKY(15, "乙肝表面抗原——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), + YGBMKT(16, "乙肝表面抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), + YGEKY(17, "乙肝e抗原——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), + YGEKT(18, "乙肝e抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), + YGKXKT(19, "乙肝核心抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""), //辅助检查——肾功能 XQJG(20, "血清肌酐",9,TypeEnums.SZ.getId(),0,"μmol/L"), XNXD(21, "血尿素氮",9,TypeEnums.SZ.getId(),0,"mmol/L"), //辅助检查——梅毒血清实验 - SYJG(22, "实验结果",10,TypeEnums.SF.getId(),1,""), - HIVKTJC(23, "HIV抗体检测",10,TypeEnums.SF.getId(),1,""), + SYJGYXYQZ(22, "实验结果——阳性（+）已确诊 ",10,TypeEnums.WZJ.getId(),1,""), + SYJGYXCZJG(23, "实验结果——阳性（+）初诊结果 ",10,TypeEnums.WZJ.getId(),1,""), + + HIVYQZ(63, "HIV抗体检测——阳性（+）已确诊",10,TypeEnums.WZJ.getId(),1,""), + HIVCZJG(64, "HIV抗体检测——阳性（+）初诊结果",10,TypeEnums.WZJ.getId(),1,""), //妇科手术史（盆腔手术史） - YWRSSS(24, "异位妊娠手术",11,TypeEnums.SF.getId(),1,""), - ZGJLXC(25, "子宫肌瘤剥除",11,TypeEnums.SF.getId(),1,""), - PGC(26, "剖宫产",11,TypeEnums.SF.getId(),1,""), + YWRSSS(24, "异位妊娠手术",11,TypeEnums.WZJ.getId(),1,""), + ZGJLXC(25, "子宫肌瘤剥除",11,TypeEnums.WZJ.getId(),1,""), + PGC(26, "剖宫产",11,TypeEnums.WZJ.getId(),1,""), FKSSSQT(27, "其他",11,TypeEnums.WZ.getId(),0,""), //孕产史 @@ -263,10 +268,10 @@ public class DiagnoseEnums { JWSQT(42, "其他",14,TypeEnums.WZ.getId(),0,""), //传染病史 - YG(43, "乙肝",15,TypeEnums.SF.getId(),0,""), - BG(44, "丙肝",15,TypeEnums.SF.getId(),0,""), - AZ(45, "艾滋",15,TypeEnums.SF.getId(),0,""), - MD(46, "梅毒",15,TypeEnums.SF.getId(),0,""), + YG(43, "乙肝",15,TypeEnums.WZJ.getId(),1,""), + BG(44, "丙肝",15,TypeEnums.WZJ.getId(),1,""), + AZ(45, "艾滋",15,TypeEnums.WZJ.getId(),1,""), + MD(46, "梅毒",15,TypeEnums.WZJ.getId(),1,""), CRBSQT(47, "其他",15,TypeEnums.WZ.getId(),0,""), //产科检查 @@ -277,8 +282,18 @@ public class DiagnoseEnums { TSLYST(52, "胎数>双胎",16,TypeEnums.WZ.getId(),0,""), //B超 - BC(53, "B超",17,TypeEnums.WZ.getId(),0,""); - + BC(53, "B超",17,TypeEnums.WZ.getId(),0,""), + + //本次妊娠情况 + EX(54, "恶心",18,TypeEnums.WZ.getId(),0,""), + OT(55, "呕吐",18,TypeEnums.WZ.getId(),0,""), + YH(56, "眼花",18,TypeEnums.WZ.getId(),0,""), + XM(57, "胸闷",18,TypeEnums.WZ.getId(),0,""), + FUZ(58, "浮肿",18,TypeEnums.WZ.getId(),0,""), + YDCX(59, "阴道出血",18,TypeEnums.WZ.getId(),0,""), + FT(60, "腹痛",18,TypeEnums.WZ.getId(),0,""), + TT(61, "头痛",18,TypeEnums.WZ.getId(),0,""), + FBXZG(62, "腹部下坠感",18,TypeEnums.WZ.getId(),0,""); private DiagnoseDetailItemEnums(int id, String title,Integer parentId,Integer type,Integer isRepeat,String unit) { this.id = id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java index 05a2b96..265aa16 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java @@ -3,9 +3,12 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.DiagnoseConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.OptActionEnums; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.DiagnoseConfigRequest; +import com.lyms.platform.operate.web.result.DiagnoseConfigResult; +import com.lyms.platform.operate.web.result.DiagnoseItemResult; import com.lyms.platform.pojo.DiagnoseConfigModel; import com.lyms.platform.pojo.DiagnoseItemModel; import com.lyms.platform.query.DiagnoseConfigQuery; @@ -14,6 +17,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -150,15 +154,27 @@ public class DiagnoseConfigFacde { if (configModel != null) { + DiagnoseConfigResult result = new DiagnoseConfigResult(); + result.convertToResult(configModel); + DiagnoseItemsQuery diagnoseItemsQuery = new DiagnoseItemsQuery(); diagnoseItemsQuery.setConfigId(configModel.getId()); List diagnoseItemModels = diagnoseConfigService.queryDiagnoseItems(diagnoseItemsQuery); + if (CollectionUtils.isNotEmpty(diagnoseItemModels)) + { + List results = new ArrayList<>(); + for (DiagnoseItemModel model : diagnoseItemModels) + { + DiagnoseItemResult itemResult = new DiagnoseItemResult(); + itemResult.convertToResult(model); + results.add(itemResult); + } + result.setResults(results); + } + new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(result); } - - - return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据"); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseConfigResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseConfigResult.java index 39a0979..dcd4d3b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseConfigResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseConfigResult.java @@ -1,12 +1,15 @@ package com.lyms.platform.operate.web.result; +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.pojo.DiagnoseConfigModel; + import java.util.List; import java.util.Map; /** * Created by Administrator on 2018-03-30. */ -public class DiagnoseConfigResult { +public class DiagnoseConfigResult implements IBasicResultConvert { private String id; private String hospitalId; @@ -14,8 +17,8 @@ public class DiagnoseConfigResult { private String enable; private List> status; - private String created; - private String modified; + private List results; + public String getId() { return id; @@ -49,19 +52,20 @@ public class DiagnoseConfigResult { this.status = status; } - public String getCreated() { - return created; - } - - public void setCreated(String created) { - this.created = created; + public List getResults() { + return results; } - public String getModified() { - return modified; + public void setResults(List results) { + this.results = results; } - public void setModified(String modified) { - this.modified = modified; + @Override + public DiagnoseConfigResult convertToResult(DiagnoseConfigModel model) { + setId(model.getId()); + setHospitalId(model.getHospitalId()); + setEnable(model.getEnable()); + setStatus(model.getStatus()); + return this; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseItemResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseItemResult.java new file mode 100644 index 0000000..1a1eeb6 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseItemResult.java @@ -0,0 +1,151 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.pojo.DiagnoseItemModel; + + +/** + * Created by Administrator on 2018-04-02. + */ +public class DiagnoseItemResult implements IBasicResultConvert { + + private String id; + private String configId; + private String hospitalId; + private String parentId; + //是否启用 0停用 1启用 + private Integer enable; + private String valueOne; + private String valueTwo; + private String valueThree; + private String valueFour; + private String valueFive; + private String valueSix; + //权重 + private Integer weight; + + //高危id + private String riskId; + + @Override + public DiagnoseItemResult convertToResult(DiagnoseItemModel model) { + setId(model.getId()); + setConfigId(model.getConfigId()); + setHospitalId(model.getHospitalId()); + setParentId(model.getParentId()); + setEnable(model.getEnable()); + setValueOne(model.getValueOne()); + setValueTwo(model.getValueTwo()); + setValueThree(model.getValueThree()); + setValueFour(model.getValueFour()); + setValueFive(model.getValueFive()); + setValueSix(model.getValueSix()); + setWeight(model.getWeight()); + setRiskId(model.getRiskId()); + return this; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + + public String getValueOne() { + return valueOne; + } + + public void setValueOne(String valueOne) { + this.valueOne = valueOne; + } + + public String getValueTwo() { + return valueTwo; + } + + public void setValueTwo(String valueTwo) { + this.valueTwo = valueTwo; + } + + public String getValueThree() { + return valueThree; + } + + public void setValueThree(String valueThree) { + this.valueThree = valueThree; + } + + public String getValueFour() { + return valueFour; + } + + public void setValueFour(String valueFour) { + this.valueFour = valueFour; + } + + public String getValueFive() { + return valueFive; + } + + public void setValueFive(String valueFive) { + this.valueFive = valueFive; + } + + public String getValueSix() { + return valueSix; + } + + public void setValueSix(String valueSix) { + this.valueSix = valueSix; + } + + public Integer getWeight() { + return weight; + } + + public void setWeight(Integer weight) { + this.weight = weight; + } + + public String getRiskId() { + return riskId; + } + + public void setRiskId(String riskId) { + this.riskId = riskId; + } +} 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 66f1ecd..91370bc 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 @@ -53,7 +53,7 @@ public class SyncDataTaskService { // urls.put("area-weixian-api.healthbaby.com.cn:12356","威县"); urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院"); urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼"); - urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院"); +// urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院"); urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院"); } diff --git a/platform-report-api/src/main/java/com/lyms/platform/report/web/inteceptor/TokenUtil.java b/platform-report-api/src/main/java/com/lyms/platform/report/web/inteceptor/TokenUtil.java new file mode 100644 index 0000000..49187ca --- /dev/null +++ b/platform-report-api/src/main/java/com/lyms/platform/report/web/inteceptor/TokenUtil.java @@ -0,0 +1,77 @@ +package com.lyms.platform.report.web.inteceptor; + +import org.apache.commons.codec.binary.Base64; + +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; + +/** + * Created by Administrator on 2018-04-03. + */ +public class TokenUtil { + /// 加密 + /// + /// 加密前明文 + /// 16位密钥< + /// + public static String encrypt(String sSrc, String sKey) throws Exception { + if (sKey==null) { + System.out.print("Key为空null"); + return null; + } + // 判断Key是否为16位 + if (sKey.length() !=16) { + System.out.print("Key长度不是16位"); + return null; + } + byte[] raw =sKey.getBytes("utf-8"); + SecretKeySpec skeySpec=new SecretKeySpec(raw, "AES"); + Cipher cipher= Cipher.getInstance("AES/ECB/PKCS5Padding");//"算法/模式/补码方式" + cipher.init(Cipher.ENCRYPT_MODE, skeySpec); + byte[] encrypted =cipher.doFinal(sSrc.getBytes("utf-8")); + + return new Base64().encodeToString(encrypted); + } + + /// + /// 解密 + /// + /// 密文 + /// 16位密钥 + /// + public static String decrypt(String sSrc, String sKey) throws Exception { + try { + // 判断Key是否正确 + if (sKey==null) { + System.out.print("Key为空null"); + return null; + } + // 判断Key是否为16位 + if (sKey.length() !=16) { + System.out.print("Key长度不是16位"); + return null; + } + byte[] raw =sKey.getBytes("utf-8"); + SecretKeySpec skeySpec=new SecretKeySpec(raw, "AES"); + Cipher cipher=Cipher.getInstance("AES/ECB/PKCS5Padding"); + cipher.init(Cipher.DECRYPT_MODE, skeySpec); + byte[] encrypted1 =new Base64().decode(sSrc);//先用base64解密 + try { + byte[] original =cipher.doFinal(encrypted1); + String originalString=new String(original,"utf-8"); + return originalString; + } catch (Exception e) { + System.out.println(e.toString()); + return null; + } + } catch (Exception ex) { + System.out.println(ex.toString()); + return null; + } + } + + public static void main(String[] args) throws Exception { + String s = encrypt("E2BC2EE87653D64DDDB6352CD4AA248C","1D0CAF3624C67625"); + System.out.println(s); + } +} -- 1.8.3.1