jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 939161cf0ddf3a3e6484024a2cb91faf969e4e12

Authored by jiangjiazhi
1 parent 9086d80f91
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

修改新电子病历

Showing 2 changed files with 5 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 939161c
... ... @@ -100,8 +100,8 @@
100 100  
101 101 if(CollectionUtils.isNotEmpty(sieveModels)){
102 102 SieveModel sieveModel= sieveModels.get(0);
103   - Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
104   - sieveDetailResult.convert(sieveModel,patients);
  103 +// Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
  104 + sieveDetailResult.convert(sieveModel);
105 105  
106 106 }
107 107 return new BaseObjectResponse().setData(sieveDetailResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java View file @ 939161c
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.common.utils.DateUtil;
7 7 import com.lyms.platform.pojo.Patients;
8 8 import com.lyms.platform.pojo.SieveModel;
  9 +import org.codehaus.jackson.annotate.JsonIgnore;
9 10  
10 11 import java.util.Date;
11 12 import java.util.List;
... ... @@ -42,7 +43,7 @@
42 43 private String diaresultText;
43 44 //妊娠结局
44 45 private String pregnancyOutcome;
45   -
  46 + @JsonIgnore
46 47 private String pregnancyOutcomeText;
47 48 //1 待产筛 2 产筛中 3 完成产筛 4 完成产诊
48 49 private Integer status;
... ... @@ -134,7 +135,7 @@
134 135 this.status = status;
135 136 }
136 137  
137   - public SieveDetailResult convert(SieveModel sieveModel,Patients patients) {
  138 + public SieveDetailResult convert(SieveModel sieveModel) {
138 139 /* try {
139 140 if(null!=patients.getBirth()){
140 141 setAge(DateUtil.getAge(patients.getBirth()));