diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java index de61ca4..eb19b56 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java @@ -80,6 +80,8 @@ public class PostReviewModel extends BaseModel { private String ultrasonicExamination; // 诊断 private String diagnosis; + // 诊断其他 + private String diagOther; //处理意见 private String treatOpinion; @@ -100,6 +102,14 @@ public class PostReviewModel extends BaseModel { //操作人 private Integer operator; + public String getDiagOther() { + return diagOther; + } + + public void setDiagOther(String diagOther) { + this.diagOther = diagOther; + } + public Integer getOperator() { return operator; } 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 0081b64..265f4bf 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 @@ -2779,6 +2779,12 @@ public class ViewFacade { diagnosis = "-"; } map.put("diagnosis", diagnosis); + map.put("diagOther", data.getDiagOther()); + if(StringUtils.isEmpty(data.getDiagOther())){ + map.put("diagOther", diagnosis); + } + + map.put("treatOpinion", data.getTreatOpinion()); map.put("dirOpinion", data.getDirOpinion()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java index b4d0240..4152ba3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java @@ -1,14 +1,13 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; -import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.PostReviewModel; import org.hibernate.validator.constraints.NotEmpty; -import java.io.Serializable; import java.util.List; import java.util.Map; @@ -83,6 +82,8 @@ public class PostReviewRequest implements IBasicRequestConvert