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 8052195..17b7ef3 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 @@ -121,6 +121,7 @@ public class CancerScreeningModel extends BaseModel { private Map rxlHddz; //活动度右 private Map rxlHddy; + //副乳1.无2.有 private String rxlFr; // 遵化新增 ,副乳其它 @@ -135,6 +136,14 @@ public class CancerScreeningModel extends BaseModel { private Map rxlSglby; //临床检査结果 private Map rxlJcjg; + + //临床检查机构 + private String lcjcjg; + //临床检査人员 + private String lcjcry; + //临床检査日期 + private Date lcjcrq; + //遵化新增, 治疗情况 private String zlqk; @@ -208,6 +217,42 @@ public class CancerScreeningModel extends BaseModel { //1 未同步 2已经同步 private Integer isSync; + + //编号 + private String code; + + public String getLcjcjg() { + return lcjcjg; + } + + public void setLcjcjg(String lcjcjg) { + this.lcjcjg = lcjcjg; + } + + public String getLcjcry() { + return lcjcry; + } + + public void setLcjcry(String lcjcry) { + this.lcjcry = lcjcry; + } + + public Date getLcjcrq() { + return lcjcrq; + } + + public void setLcjcrq(Date lcjcrq) { + this.lcjcrq = lcjcrq; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + public Integer getIsSync() { return isSync; } 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 857e12d..2572d7e 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.CancerScreeningRequest; +import com.lyms.platform.operate.web.result.CancerScreeningResult; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.operate.web.utils.ResponseUtil; @@ -27,6 +28,7 @@ import com.lyms.platform.query.ResidentsArchiveQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -295,6 +297,15 @@ public class CancerScreeningFacade { public BaseResponse getCancerScreenInfo(String id) { BaseResponse baseResponse = new BaseResponse(); CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id); + CancerScreeningResult result = new CancerScreeningResult(); + org.springframework.beans.BeanUtils.copyProperties(cancerScreeningModel,result); + + result.setNationStr(CommonsHelper.getName1(cancerScreeningModel.getNationId(),basicConfigService)); + result.setLevelTypeStr(CommonsHelper.getName1(cancerScreeningModel.getLevelTypeId(),basicConfigService)); + String addressStr = CommonsHelper.getResidence(cancerScreeningModel.getProvinceId(), cancerScreeningModel.getCityId(), + cancerScreeningModel.getAreaId(), cancerScreeningModel.getStreetId(), cancerScreeningModel.getAddress(), basicConfigService); + result.setAddressStr(addressStr); + baseResponse.setObject(cancerScreeningModel); return baseResponse; } 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 new file mode 100644 index 0000000..661069b --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java @@ -0,0 +1,39 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.pojo.CancerScreeningModel; + +/** + * Created by Administrator on 2021-07-19. + */ +public class CancerScreeningResult extends CancerScreeningModel { + + private String nationStr; + + private String levelTypeStr; + + private String addressStr; + + public String getNationStr() { + return nationStr; + } + + public void setNationStr(String nationStr) { + this.nationStr = nationStr; + } + + public String getLevelTypeStr() { + return levelTypeStr; + } + + public void setLevelTypeStr(String levelTypeStr) { + this.levelTypeStr = levelTypeStr; + } + + public String getAddressStr() { + return addressStr; + } + + public void setAddressStr(String addressStr) { + this.addressStr = addressStr; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java index bc20df3..3338430 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CervicalCancerModelResult.java @@ -18,6 +18,27 @@ public class CervicalCancerModelResult extends CervicalCancerModel { private String createTime; + + private String nationStr; + + private String levelTypeStr; + + public String getNationStr() { + return nationStr; + } + + public void setNationStr(String nationStr) { + this.nationStr = nationStr; + } + + public String getLevelTypeStr() { + return levelTypeStr; + } + + public void setLevelTypeStr(String levelTypeStr) { + this.levelTypeStr = levelTypeStr; + } + public String getCreateTime() { return createTime; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 936f548..1d3ed0b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -638,6 +638,8 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { basicConfigService )); + result.setNationStr(CommonsHelper.getName1(model.getNationId(), basicConfigService)); + result.setLevelTypeStr(CommonsHelper.getName1(model.getLevelTypeId(), basicConfigService)); result.setLastMenstrual(model.getMcyj()); result.setName(model.getUsername()); result.setAge(model.getAge());