jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 929df81c287e881df3e1f3a97f0baa55fd4eb0e4

Authored by litao@lymsh.com
1 parent 031ddcd9bc
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

改bug

Showing 3 changed files with 38 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 929df81
... ... @@ -3,10 +3,12 @@
3 3 import com.lyms.platform.biz.SequenceConstant;
4 4 import com.lyms.platform.biz.service.*;
5 5 import com.lyms.platform.common.constants.ErrorCodeConstants;
6   -import com.lyms.platform.common.enums.*;
  6 +import com.lyms.platform.common.enums.OptActionEnums;
  7 +import com.lyms.platform.common.enums.QuickenEnums;
  8 +import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
  9 +import com.lyms.platform.common.enums.YnEnums;
7 10 import com.lyms.platform.common.result.BaseObjectResponse;
8 11 import com.lyms.platform.common.result.BaseResponse;
9   -import com.lyms.platform.common.result.PageResult;
10 12 import com.lyms.platform.common.utils.*;
11 13 import com.lyms.platform.operate.web.request.*;
12 14 import com.lyms.platform.operate.web.result.*;
... ... @@ -23,7 +25,6 @@
23 25 import org.apache.commons.collections.MapUtils;
24 26 import org.apache.commons.lang.StringUtils;
25 27 import org.apache.commons.lang.math.NumberUtils;
26   -import org.apache.tools.ant.taskdefs.Ant;
27 28 import org.slf4j.Logger;
28 29 import org.slf4j.LoggerFactory;
29 30 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -2214,6 +2215,8 @@
2214 2215 antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2);
2215 2216 antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
2216 2217  
  2218 + antenatalExaminationResult.setGenRemark(examinationModel.getGenRemark());
  2219 +
2217 2220 /* antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
2218 2221 Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
2219 2222 Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
... ... @@ -2294,6 +2297,9 @@
2294 2297 antexChuResult.setQuicken(antExChuModel.getQuicken());
2295 2298 antexChuResult.setQuickenRemark(antExChuModel.getQuickenRemark());
2296 2299 antexChuResult.setmHighRiskReason(mHighRiskReason);
  2300 +
  2301 + antexChuResult.setGenRemark(antExChuModel.getGenRemark());
  2302 + antexChuResult.setGynRemark(antExChuModel.getGynRemark());
2297 2303  
2298 2304 object = antexChuResult;
2299 2305 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 929df81
... ... @@ -15,6 +15,16 @@
15 15 */
16 16 public class AntenatalExaminationResult implements IBasicResultConvert<AntenatalExaminationResult, AntenatalExaminationModel> {
17 17  
  18 + private String genRemark; // 一般检查备注
  19 +
  20 + public String getGenRemark() {
  21 + return genRemark;
  22 + }
  23 +
  24 + public void setGenRemark(String genRemark) {
  25 + this.genRemark = genRemark;
  26 + }
  27 +
18 28 private List mHighRiskReason;
19 29  
20 30 /** 处理意见 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 929df81
... ... @@ -15,6 +15,25 @@
15 15 */
16 16 public class AntexChuResult {
17 17  
  18 + private String genRemark; // 一般检查备注
  19 + private String gynRemark; // 妇科检查备注
  20 +
  21 + public String getGenRemark() {
  22 + return genRemark;
  23 + }
  24 +
  25 + public void setGenRemark(String genRemark) {
  26 + this.genRemark = genRemark;
  27 + }
  28 +
  29 + public String getGynRemark() {
  30 + return gynRemark;
  31 + }
  32 +
  33 + public void setGynRemark(String gynRemark) {
  34 + this.gynRemark = gynRemark;
  35 + }
  36 +
18 37 private List mHighRiskReason;
19 38  
20 39 public List getmHighRiskReason() {