fangcheng / regional-platform

Download as
Browse Code »

Commit e5736a43a31dd375887f91445cf4b92b32a0196d

Authored by jiangjiazhi
1 parent 611466a0a8
Exists in master and in 1 other branch nobuildprocess

修改新电子病历

Showing 2 changed files with 26 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ e5736a4
... ... @@ -15,6 +15,8 @@
15 15 import com.lyms.platform.operate.web.result.SieveDetailResult;
16 16 import com.lyms.platform.operate.web.result.SieveListResult;
17 17 import com.lyms.platform.operate.web.result.SieveResult;
  18 +import com.lyms.platform.permission.model.Organization;
  19 +import com.lyms.platform.permission.service.OrganizationService;
18 20 import com.lyms.platform.pojo.*;
19 21 import com.lyms.platform.query.AntExChuQuery;
20 22 import com.lyms.platform.query.AntExQuery;
... ... @@ -29,6 +31,7 @@
29 31  
30 32 import java.util.ArrayList;
31 33 import java.util.Date;
  34 +import java.util.HashMap;
32 35 import java.util.List;
33 36  
34 37 /**
35 38  
36 39  
... ... @@ -40,12 +43,13 @@
40 43 public class SieveFacade {
41 44 @Autowired
42 45 private SieveService sieveService;
  46 +
43 47 @Autowired
44   - private PatientsService patientsService;
45   - @Autowired
46 48 private AutoMatchFacade autoMatchFacade;
47 49 @Autowired
48 50 private AntenatalExaminationService antenatalExaminationService;
  51 + @Autowired
  52 + private OrganizationService organizationService;
49 53  
50 54 /**
51 55 * 增加一条产筛结果记录
... ... @@ -85,8 +89,8 @@
85 89 SieveResult sieveResult=new SieveResult();
86 90 if(CollectionUtils.isNotEmpty(sb)){
87 91 SieveResultModel sieveResultModel=sb.get(0);
88   - Patients patients= patientsService.findOnePatientById(sieveResultModel.getParentId());
89   - sieveResult.convert(sieveResultModel,patients);
  92 +// Patients patients= patientsService.findOnePatientById(sieveResultModel.getParentId());
  93 + sieveResult.convert(sieveResultModel,null);
90 94 }
91 95 return new BaseObjectResponse().setData(sieveResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
92 96 }
93 97  
... ... @@ -102,7 +106,19 @@
102 106 SieveModel sieveModel= sieveModels.get(0);
103 107 // Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
104 108 sieveDetailResult.convert(sieveModel);
  109 + java.util.Map<String,String> map = new HashMap<>();
  110 + String diaUnit= sieveModel.getDiaUnit();
  111 + map.put("id","-1");
  112 + map.put("name",diaUnit);
  113 + if(StringUtils.isNotEmpty(diaUnit)&&NumberUtils.isNumber(diaUnit)){
  114 + Organization organization = organizationService.getOrganization(Integer.valueOf(diaUnit));
  115 + if(null!=organization){
  116 + map.put("id",organization.getId()+"");
  117 + map.put("name",organization.getName());
  118 + }
  119 + }
105 120  
  121 + sieveDetailResult.setDiaUnit(map);
106 122 }
107 123 return new BaseObjectResponse().setData(sieveDetailResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
108 124 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java View file @ e5736a4
... ... @@ -10,6 +10,7 @@
10 10  
11 11 import java.util.Date;
12 12 import java.util.List;
  13 +import java.util.Map;
13 14  
14 15 /**
15 16 *产前诊断结果
... ... @@ -52,7 +53,7 @@
52 53 // 诊断时间
53 54 private String diaTime;
54 55 //诊断单位
55   - private String diaUnit;
  56 + private java.util.Map<String,String> diaUnit;
56 57 //录入人员
57 58 private String publishName;
58 59  
59 60  
... ... @@ -112,11 +113,11 @@
112 113 this.diaTime = diaTime;
113 114 }
114 115  
115   - public String getDiaUnit() {
  116 + public Map<String, String> getDiaUnit() {
116 117 return diaUnit;
117 118 }
118 119  
119   - public void setDiaUnit(String diaUnit) {
  120 + public void setDiaUnit(Map<String, String> diaUnit) {
120 121 this.diaUnit = diaUnit;
121 122 }
122 123  
123 124  
... ... @@ -177,13 +178,13 @@
177 178 if(null!=sieveModel.getCqResult()){
178 179 setDiaresultText(ChanQResultEnums.getTitle(sieveModel.getCqResult()));
179 180 }
180   - setPregnancyOutcome(sieveModel.getRenShenResult()+"");
  181 + setPregnancyOutcome(sieveModel.getRenShenResult() + "");
181 182 if(null!=sieveModel.getRenShenResult()){
182 183 setPregnancyOutcomeText(RenShenJieJu1Enums.getTitle(sieveModel.getRenShenResult() + ""));
183 184 }
184 185 setStatus(sieveModel.getStatus());
185 186 setDiaTime(sieveModel.getDiaTime());
186   - setDiaUnit(sieveModel.getDiaUnit());
  187 +
187 188 setPublishName(sieveModel.getPublishName());
188 189 return this;
189 190 }