diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java index 213b5e9..97124bd 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java @@ -148,9 +148,9 @@ public class DischargeAbstractBabyModel extends BaseModel { private Integer isUNHS; /** - * 听筛结果 + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 */ - private Map hearScrResult; + private Integer hearScrResult; /** * @auther HuJiaqi @@ -160,11 +160,11 @@ public class DischargeAbstractBabyModel extends BaseModel { private Integer isOtherScreen; //是否高危儿童 - private boolean isHighRisk; + private String isHighRisk; /** * 高危详情 */ - private Map highRiskResult; + private Map highRiskResult; /** * @auther HuJiaqi @@ -182,27 +182,27 @@ public class DischargeAbstractBabyModel extends BaseModel { private Integer yn; - public boolean isHighRisk() { + public String getIsHighRisk() { return isHighRisk; } - public void setHighRisk(boolean highRisk) { - isHighRisk = highRisk; + public void setIsHighRisk(String isHighRisk) { + this.isHighRisk = isHighRisk; } - public Map getHighRiskResult() { + public Map getHighRiskResult() { return highRiskResult; } - public void setHighRiskResult(Map highRiskResult) { + public void setHighRiskResult(Map highRiskResult) { this.highRiskResult = highRiskResult; } - public Map getHearScrResult() { + public Integer getHearScrResult() { return hearScrResult; } - public void setHearScrResult(Map hearScrResult) { + public void setHearScrResult(Integer hearScrResult) { this.hearScrResult = hearScrResult; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index e92db48..0081b64 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2984,8 +2984,8 @@ public class ViewFacade { babyMap.put("isCH", FunvCommonUtil.checkIsScreening(temp.getIsCH())); babyMap.put("isUNHS", FunvCommonUtil.checkIsScreening(temp.getIsUNHS())); babyMap.put("hearScrResult", temp.getHearScrResult()); - babyMap.put("isHighRisk", temp.isHighRisk()); - babyMap.put("highRiskResult", FunvCommonUtil.checkIsScreening(temp.getIsUNHS())); + babyMap.put("isHighRisk", temp.getIsHighRisk()); + babyMap.put("highRiskResult", temp.getHighRiskResult()); String isOtherScreen = ""; if (temp.getIsOtherScreen() != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java index 514b98f..62d112d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java @@ -210,12 +210,12 @@ public class DischargeAbstractSaveRequest { */ private Integer isUNHS; /** - * 听筛结果 + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 */ - private Map hearScrResult; + private Integer hearScrResult; //是否高危儿童 - private boolean isHighRisk; + private String isHighRisk; /** * 高危详情 */ @@ -235,12 +235,12 @@ public class DischargeAbstractSaveRequest { */ private String orderScreenDescription; - public boolean isHighRisk() { + public String getIsHighRisk() { return isHighRisk; } - public void setHighRisk(boolean highRisk) { - isHighRisk = highRisk; + public void setIsHighRisk(String isHighRisk) { + this.isHighRisk = isHighRisk; } public Map getHighRiskResult() { @@ -251,11 +251,11 @@ public class DischargeAbstractSaveRequest { this.highRiskResult = highRiskResult; } - public Map getHearScrResult() { + public Integer getHearScrResult() { return hearScrResult; } - public void setHearScrResult(Map hearScrResult) { + public void setHearScrResult(Integer hearScrResult) { this.hearScrResult = hearScrResult; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java index ff71991..7fb97e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java @@ -137,12 +137,12 @@ public class DischargeAbstractBabyQueryModel { private Integer isUNHS; /** - * 听筛结果 + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 */ - private Map hearScrResult; + private Integer hearScrResult; //是否高危儿童 - private boolean isHighRisk; + private String isHighRisk; /** * 高危详情 */ @@ -162,12 +162,12 @@ public class DischargeAbstractBabyQueryModel { */ private String orderScreenDescription; - public boolean isHighRisk() { + public String getIsHighRisk() { return isHighRisk; } - public void setHighRisk(boolean highRisk) { - isHighRisk = highRisk; + public void setIsHighRisk(String isHighRisk) { + this.isHighRisk = isHighRisk; } public Map getHighRiskResult() { @@ -178,11 +178,11 @@ public class DischargeAbstractBabyQueryModel { this.highRiskResult = highRiskResult; } - public Map getHearScrResult() { + public Integer getHearScrResult() { return hearScrResult; } - public void setHearScrResult(Map hearScrResult) { + public void setHearScrResult(Integer hearScrResult) { this.hearScrResult = hearScrResult; }