diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/LhUltrasoundContent.java b/platform-common/src/main/java/com/lyms/platform/common/enums/LhUltrasoundContent.java new file mode 100644 index 0000000..6e7492a --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/LhUltrasoundContent.java @@ -0,0 +1,57 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 隆化-妇女健康管理-两癌-乳腺-乳腺彩超检查-超声所见 + * @Author: shiy + * @Date: 2021/11/18 + */ +public enum LhUltrasoundContent { + CSlevel1("1", "1级：阴性，超声上无异常发现。"), + CSlevel2("2", "2级：良性发现，本质上是非恶性的。"), + CSlevel3("3", "3级：可能良性发现，建议短期随访"), + CSlevel41("41", "4A级：属于低度可疑恶性；"), + CSlevel42("42", "4B级：有中度可能恶性的病灶；"), + CSlevel43("43", "4C级：恶性可能较大，但不像5级那样典型的恶性；"), + CSlevel5("5", "5级：高度提示恶性"), + CSlevel6("6", "6级：活检证实的恶性"); + + LhUltrasoundContent(String id, String name) { + this.id = id; + this.name = name; + } + + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + LhUltrasoundContent[] values = LhUltrasoundContent.values(); + for (LhUltrasoundContent 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 8e86ebb..90ec5e2 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 @@ -49,7 +49,7 @@ public class CancerScreeningModel extends BaseModel { private String number; //(一）病史情况 //月经情况 - //月经初潮年龄(岁) + //月经初潮年龄(岁)//隆化前端是以“，”分割的数据保存 private String bsYjage; //最近一次末次月经 private String bsZjyj; @@ -231,6 +231,118 @@ public class CancerScreeningModel extends BaseModel { //乳腺癌异常name private String breastAbnormityName; + //哺乳史//原id展示。改为手写月份。历史数据展示：前端判断newYcFrs有没值。没有还用以前ycFrs字段展示 + private String newYcFrs; + + /** + * 既往史，原既往史改为5个类别。如果5个类别都为空，前端展示历史数据。 + */ + //1乳腺癌0,1；1的时候需要写情况 + private String nxa; + //乳腺癌注明情况 + private String nxaQk; + //2乳腺包块0,1；1的时候需要写情况 + private String nxbk; + //乳腺包块注明情况 + private String nxbkQk; + //3有无乳腺手术史 + private String ynNxsss; + //4有无激素替代治疗史0,1；1的时候需要写情况 + private String ynJstdzls; + //有无激素替代治疗史注明情况 + private String ynJstdzlsQk; + //5其他，请注明 + private String previousOther; + + /** + * 乳腺彩超检查 + * 超声所见 + *原文字展示。改为单选。newRxCssj展示用到enum(LhUltrasoundContent)； + *历史数据展示：前端判断newRxCssj有没值。没有还用以前rxCssj字段展示 + */ + private String newRxCssj; + + + public String getNxa() { + return nxa; + } + + public void setNxa(String nxa) { + this.nxa = nxa; + } + + public String getNxaQk() { + return nxaQk; + } + + public void setNxaQk(String nxaQk) { + this.nxaQk = nxaQk; + } + + public String getNxbk() { + return nxbk; + } + + public void setNxbk(String nxbk) { + this.nxbk = nxbk; + } + + public String getNxbkQk() { + return nxbkQk; + } + + public void setNxbkQk(String nxbkQk) { + this.nxbkQk = nxbkQk; + } + + public String getYnNxsss() { + return ynNxsss; + } + + public void setYnNxsss(String ynNxsss) { + this.ynNxsss = ynNxsss; + } + + public String getYnJstdzls() { + return ynJstdzls; + } + + public void setYnJstdzls(String ynJstdzls) { + this.ynJstdzls = ynJstdzls; + } + + public String getYnJstdzlsQk() { + return ynJstdzlsQk; + } + + public void setYnJstdzlsQk(String ynJstdzlsQk) { + this.ynJstdzlsQk = ynJstdzlsQk; + } + + public String getPreviousOther() { + return previousOther; + } + + public void setPreviousOther(String previousOther) { + this.previousOther = previousOther; + } + + public String getNewRxCssj() { + return newRxCssj; + } + + public void setNewRxCssj(String newRxCssj) { + this.newRxCssj = newRxCssj; + } + + public String getNewYcFrs() { + return newYcFrs; + } + + public void setNewYcFrs(String newYcFrs) { + this.newYcFrs = newYcFrs; + } + public String getBreastAbnormityName() { return breastAbnormityName; } 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 497deed..b33df1d 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 @@ -303,6 +303,10 @@ public class CancerScreeningFacade { BaseResponse baseResponse = new BaseResponse(); CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id); CancerScreeningResult result = new CancerScreeningResult(); + //超声所见内容翻译字段 + if(StringUtils.isNotEmpty(cancerScreeningModel.getNewRxCssj())){ + result.setNewRxCssjName(LhUltrasoundContent.getName(cancerScreeningModel.getNewRxCssj())); + } 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 661069b..2e622bb 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 @@ -12,6 +12,16 @@ public class CancerScreeningResult extends CancerScreeningModel { private String levelTypeStr; private String addressStr; + //超声所见内容翻译字段 + private String newRxCssjName; + + public String getNewRxCssjName() { + return newRxCssjName; + } + + public void setNewRxCssjName(String newRxCssjName) { + this.newRxCssjName = newRxCssjName; + } public String getNationStr() { return nationStr;