fangcheng / regional-platform

Download as
Browse Code »

Commit 18c0db68fd985e260ac7c1a21cdd002ced479a31

Authored by jiangjiazhi
2 parents a8fd9bab16 2b175b8bf3
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 18c0db6
... ... @@ -3,7 +3,6 @@
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
5 5 import com.lyms.platform.common.enums.RenShenJieJuEnums;
6   -import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
7 6 import com.lyms.platform.common.enums.YnEnums;
8 7 import com.lyms.platform.common.utils.BeanUtils;
9 8 import com.lyms.platform.common.utils.DateUtil;
... ... @@ -17,6 +16,7 @@
17 16 import com.lyms.platform.query.DischargeAbstractBabyQuery;
18 17 import com.lyms.platform.query.DischargeAbstractMotherQuery;
19 18 import com.lyms.platform.query.PatientsQuery;
  19 +import org.apache.commons.collections.CollectionUtils;
20 20 import org.springframework.beans.factory.annotation.Autowired;
21 21 import org.springframework.stereotype.Component;
22 22 import org.springframework.util.StringUtils;
... ... @@ -25,6 +25,7 @@
25 25 import java.util.ArrayList;
26 26 import java.util.Date;
27 27 import java.util.List;
  28 +import java.util.Map;
28 29  
29 30 /**
30 31 * @auther HuJiaqi
... ... @@ -49,6 +50,9 @@
49 50 @Autowired
50 51 private BabyService babyService;
51 52  
  53 + @Autowired
  54 + private AntenatalExaminationFacade antenatalExaminationFacade;
  55 +
52 56 public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest) {
53 57  
54 58 DischargeAbstractSaveResult dischargeAbstractSaveResult = new DischargeAbstractSaveResult();
... ... @@ -126,8 +130,27 @@
126 130 dischargeAbstractQueryResult.setUserName(patients.getUsername());
127 131 dischargeAbstractQueryResult.setAge(DateUtil.getAge(patients.getBirth(), new Date()));
128 132 dischargeAbstractQueryResult.setFmDate(DateUtil.getyyyy_MM_dd(patients.getFmDate()));
129   - List<RiskFactoryResultModel> riskFactoryResultModelList = getRiskFactory(patients.getRiskFactorId());
130   - dischargeAbstractQueryResult.setRiskFactoryResultModelList(riskFactoryResultModelList);
  133 +
  134 + // 这里之所以转换时以为前端已经写好了，并且这个循环也不是很慢
  135 + try {
  136 + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
  137 + List<RiskFactoryResultModel> riskFactoryResultModelList = new ArrayList<>();
  138 + if (highScoreResult != null && CollectionUtils.isNotEmpty(highScoreResult.getHighRisk())) {
  139 + // 这个必然是这个泛型，否则直接抛出异常
  140 + @SuppressWarnings("unchecked")
  141 + List<Map<String, String>> temp = highScoreResult.getHighRisk();
  142 + for (Map<String, String> map : temp) {
  143 + RiskFactoryResultModel riskFactoryResultModel = new RiskFactoryResultModel();
  144 + riskFactoryResultModel.setName(map.get("name"));
  145 + riskFactoryResultModel.setColor(map.get("color"));
  146 + riskFactoryResultModelList.add(riskFactoryResultModel);
  147 + }
  148 + }
  149 + dischargeAbstractQueryResult.setRiskFactoryResultModelList(riskFactoryResultModelList);
  150 + } catch (Exception e) {
  151 + // 什么都不干
  152 + }
  153 +
131 154 dischargeAbstractQueryResult.setGestationalWeeks(PredictedStatisticsFacade.getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus()));
132 155 dischargeAbstractQueryResult.setDueDate(new SimpleDateFormat("yyyy年MM月dd日").format(patients.getDueDate()));
133 156  
... ... @@ -179,36 +202,6 @@
179 202 dischargeAbstractQueryResult.setErrormsg("已分娩并且已经做过出院小结");
180 203  
181 204 return dischargeAbstractQueryResult;
182   - }
183   -
184   - private List<RiskFactoryResultModel> getRiskFactory(List<String> riskFactorIdList) {
185   -
186   - List<RiskFactoryResultModel> riskFactoryResultModelList = new ArrayList<>();
187   -
188   - if (riskFactorIdList != null && riskFactorIdList.size() > 0) {
189   - for (String riskFactoryId : riskFactorIdList) {
190   - RiskFactoryResultModel riskFactoryResultModel = new RiskFactoryResultModel();
191   - try {
192   - String name = basicConfigService.getOneBasicConfigById(riskFactoryId).getName();
193   - boolean flag = true;
194   - if (riskFactoryResultModelList.size() > 0) {
195   - for (RiskFactoryResultModel factoryResultModel : riskFactoryResultModelList) {
196   - if (factoryResultModel.getName().equals(name)) {
197   - flag = false;
198   - }
199   - }
200   - }
201   - if (flag) {
202   - riskFactoryResultModel.setName(name);
203   - riskFactoryResultModel.setColor("risk_" + RiskDefaultTypeEnum.getColor(name));
204   - riskFactoryResultModelList.add(riskFactoryResultModel);
205   - }
206   - } catch (Exception e) {
207   - // 什么都不干
208   - }
209   - }
210   - }
211   - return riskFactoryResultModelList;
212 205 }
213 206  
214 207 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractMotherQueryModel.java View file @ 18c0db6
... ... @@ -35,6 +35,16 @@
35 35 */
36 36 private Integer afterMakeBabyDays;
37 37  
  38 + private String inputMan;
  39 +
  40 + public String getInputMan() {
  41 + return inputMan;
  42 + }
  43 +
  44 + public void setInputMan(String inputMan) {
  45 + this.inputMan = inputMan;
  46 + }
  47 +
38 48 public String getId() {
39 49 return id;
40 50 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java View file @ 18c0db6
... ... @@ -79,7 +79,7 @@
79 79 * @createTime 2016年12月06日 14时15分
80 80 * @discription 高危评分
81 81 */
82   - private String riskScore;
  82 + private Integer riskScore;
83 83  
84 84 /**
85 85 * @auther HuJiaqi
86 86  
... ... @@ -165,11 +165,11 @@
165 165 this.riskFactoryResultModelList = riskFactoryResultModelList;
166 166 }
167 167  
168   - public String getRiskScore() {
  168 + public Integer getRiskScore() {
169 169 return riskScore;
170 170 }
171 171  
172   - public void setRiskScore(String riskScore) {
  172 + public void setRiskScore(Integer riskScore) {
173 173 this.riskScore = riskScore;
174 174 }
175 175