diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index b54c7cf..b9a045e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -464,6 +464,29 @@ public class PremaritalCheckup extends BaseModel { //采血编号 private String cxNum; + /**隆化-增加 X线摄影报告 + */ + //X摄影(1:正常,2:异常-需要写内容) + private Integer xRay; + //异常情况填写内容 + private String abnormalTxt; + + public Integer getxRay() { + return xRay; + } + + public void setxRay(Integer xRay) { + this.xRay = xRay; + } + + public String getAbnormalTxt() { + return abnormalTxt; + } + + public void setAbnormalTxt(String abnormalTxt) { + this.abnormalTxt = abnormalTxt; + } + public String getCxNum() { return cxNum; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 356c04f..5588448 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -494,6 +494,13 @@ public class PremaritalCheckupFacade { checkupResult.setJczt(result.getJczt()); checkupResult.setFkjjState(result.getFkjjState()); checkupResult.setNumCode(com.lyms.platform.common.utils.StringUtils.numCodeStr(result.getNumCode())); + /**隆化-增加 X线摄影报告 + */ + //X摄影(1:正常,2:异常-需要写内容) + checkupResult.setxRay(result.getxRay()); + //异常情况填写内容 + checkupResult.setAbnormalTxt(result.getAbnormalTxt()); + return checkupResult; } @@ -948,6 +955,12 @@ public class PremaritalCheckupFacade { checkup.setGuidSign(addRequest.getGuidSign()); checkup.setUserSign(addRequest.getUserSign()); + /**隆化-增加 X线摄影报告 + */ + //X摄影(1:正常,2:异常-需要写内容) + checkup.setxRay(addRequest.getxRay()); + //异常情况填写内容 + checkup.setAbnormalTxt(addRequest.getAbnormalTxt()); /* 基础数据 */ checkup.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index f9de313..e020dd5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -453,6 +453,29 @@ public class PremaritalCheckupAddRequest { //采血编号 private String cxNum; + /**隆化-增加 X线摄影报告 + */ + //X摄影(1:正常,2:异常-需要写内容) + private Integer xRay; + //异常情况填写内容 + private String abnormalTxt; + + public Integer getxRay() { + return xRay; + } + + public void setxRay(Integer xRay) { + this.xRay = xRay; + } + + public String getAbnormalTxt() { + return abnormalTxt; + } + + public void setAbnormalTxt(String abnormalTxt) { + this.abnormalTxt = abnormalTxt; + } + public String getCxNum() { return cxNum; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index 77aeead..fd0fda0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -428,6 +428,29 @@ public class PremaritalCheckupResult { private String numCode; private String cxNum; + /**隆化-增加 X线摄影报告 + */ + //X摄影(1:正常,2:异常-需要写内容) + private Integer xRay; + //异常情况填写内容 + private String abnormalTxt; + + public Integer getxRay() { + return xRay; + } + + public void setxRay(Integer xRay) { + this.xRay = xRay; + } + + public String getAbnormalTxt() { + return abnormalTxt; + } + + public void setAbnormalTxt(String abnormalTxt) { + this.abnormalTxt = abnormalTxt; + } + public String getCxNum() { return cxNum; }