From 1926b057e5ed87f42740ecc3f6f7541601a1ee27 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Mon, 22 Nov 2021 11:42:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96=E4=B8=A4=E7=99=8C-12.?= =?UTF-8?q?=E4=B9=B3=E8=85=BA=E6=9C=80=E5=90=8E=E9=9A=8F=E8=AE=BF=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/LhEndDiagnosisContent.java | 58 +++++++++++++ .../lyms/platform/pojo/CancerScreeningModel.java | 95 ++++++++++++++++++++++ .../operate/web/facade/CancerScreeningFacade.java | 12 +++ .../operate/web/result/CancerScreeningResult.java | 10 +++ 4 files changed, 175 insertions(+) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/LhEndDiagnosisContent.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/LhEndDiagnosisContent.java b/platform-common/src/main/java/com/lyms/platform/common/enums/LhEndDiagnosisContent.java new file mode 100644 index 0000000..274324d --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/LhEndDiagnosisContent.java @@ -0,0 +1,58 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 隆化-妇女健康管理-两癌-乳腺-乳腺最后随访结果-最后诊断异常项 + * @Author: shiy + * @Date: 2021/11/22 + */ +public enum LhEndDiagnosisContent { + YcType1("1", "乳腺增生"), + YcType2("2", "乳腺纤维腺瘤"), + YcType3("3", "乳腺炎"), + YcType4("4", "乳腺导管内乳头状瘤"), + YcType5("5", "小叶瘤变"), + YcType6("6", "导管原位癌"), + YcType7("7", "微小浸润癌"), + YcType8("8", "浸润癌"), + YcType9("9", "其他"); + + LhEndDiagnosisContent(String id, String name) { + this.id = id; + this.name = name; + } + + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + LhEndDiagnosisContent[] values = LhEndDiagnosisContent.values(); + for (LhEndDiagnosisContent value : values) { + if (value.getId().equals(id)) { + return value.getName(); + } + } + return null; + } + private String id; + private String name; + + 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; + } + +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java index a59d60f..17e2b8f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java @@ -274,6 +274,101 @@ public class CancerScreeningModel extends BaseModel { //隆化新乳腺X线检查内容,展示用到enum(LhBreastXRayContent) private String rxXJc; + /** + *隆化-最终追访结果 + * + */ + //失访情况 1，是；2。否 + private String newSfQk; + //病理结果 内容字段：t;n;m;qibie; + private Map blJg; + //诊断机构 + private String bLzdJg; + //诊断人员 + private String bLzdRy; + //诊断时间 + private Date bLzdSj; + //最后诊断 内容字段 yn(0未见异常,1异常);yc(异常项1-9)展示用到enum(LhEndDiagnosisContent);qt(其他注明); + private Map zhJd; + //诊断机构 + private String zHzdJg; + //诊断人员 + private String zHzdRy; + //诊断时间 + private Date zHzdSj; + + public String getNewSfQk() { + return newSfQk; + } + + public void setNewSfQk(String newSfQk) { + this.newSfQk = newSfQk; + } + + public Map getBlJg() { + return blJg; + } + + public void setBlJg(Map blJg) { + this.blJg = blJg; + } + + public String getbLzdJg() { + return bLzdJg; + } + + public void setbLzdJg(String bLzdJg) { + this.bLzdJg = bLzdJg; + } + + public String getbLzdRy() { + return bLzdRy; + } + + public void setbLzdRy(String bLzdRy) { + this.bLzdRy = bLzdRy; + } + + public Date getbLzdSj() { + return bLzdSj; + } + + public void setbLzdSj(Date bLzdSj) { + this.bLzdSj = bLzdSj; + } + + public Map getZhJd() { + return zhJd; + } + + public void setZhJd(Map zhJd) { + this.zhJd = zhJd; + } + + public String getzHzdJg() { + return zHzdJg; + } + + public void setzHzdJg(String zHzdJg) { + this.zHzdJg = zHzdJg; + } + + public String getzHzdRy() { + return zHzdRy; + } + + public void setzHzdRy(String zHzdRy) { + this.zHzdRy = zHzdRy; + } + + public Date getzHzdSj() { + return zHzdSj; + } + + public void setzHzdSj(Date zHzdSj) { + this.zHzdSj = zHzdSj; + } + public String getRxXJc() { return rxXJc; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 5745fe8..d3bf249 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -31,8 +31,10 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import scala.util.parsing.combinator.testing.Str; import javax.servlet.http.HttpServletResponse; +import java.lang.reflect.Array; import java.util.*; /** @@ -311,6 +313,16 @@ public class CancerScreeningFacade { if(StringUtils.isNotEmpty(cancerScreeningModel.getRxXJc())){ result.setRxXJcName(LhBreastXRayContent.getName(cancerScreeningModel.getRxXJc())); } + //乳腺最后随访结果内容翻译字段（map key:yc） + if(null!=cancerScreeningModel.getZhJd()){ + if(null!=cancerScreeningModel.getZhJd().get("yc")){ + String[] arry = null; + for (int i=0; i<((String[]) cancerScreeningModel.getZhJd().get("yc")).length;i++) { + arry[i]=LhEndDiagnosisContent.getName(((String[]) cancerScreeningModel.getZhJd().get("yc"))[i]); + } + result.setMapYcName(arry); + } + } org.springframework.beans.BeanUtils.copyProperties(cancerScreeningModel,result); //隆化-两癌-翻译乳腺癌名称 result.setBreastAbnormityName(RxaZdycEnums.getName(null!=cancerScreeningModel.getBreastAbnormity()?cancerScreeningModel.getBreastAbnormity().toString():null)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java index 9bf4783..1d741b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java @@ -16,6 +16,16 @@ public class CancerScreeningResult extends CancerScreeningModel { private String newRxCssjName; //乳腺X线检查容翻译字段 private String rxXJcName; + //乳腺最后随访结果内容翻译字段（map key:yc） + private String[] mapYcName; + + public String[] getMapYcName() { + return mapYcName; + } + + public void setMapYcName(String[] mapYcName) { + this.mapYcName = mapYcName; + } public String getRxXJcName() { return rxXJcName; -- 1.8.3.1