Commit 1d4221717a36244da8c27bcab055979bdd412a5a
1 parent
699783fc0c
Exists in
master
and in
8 other branches
添加了一个字段
Showing 2 changed files with 34 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java
View file @
1d42217
... | ... | @@ -84,7 +84,9 @@ |
84 | 84 | PredictedStatisticsQueryModel predictedStatisticsQueryModel = new PredictedStatisticsQueryModel(); |
85 | 85 | BeanUtils.copy(patients, predictedStatisticsQueryModel); |
86 | 86 | predictedStatisticsQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
87 | - predictedStatisticsQueryModel.setRiskLevelResultModelList(getRiskLevel(patients.getRiskLevelId())); | |
87 | + List<RiskLevelResultModel> riskLevelResultModelList = getRiskLevel(patients.getRiskLevelId()); | |
88 | + predictedStatisticsQueryModel.setRiskLevelResultModelList(riskLevelResultModelList); | |
89 | + predictedStatisticsQueryModel.setRiskLevelNameString(getRiskLevelString(riskLevelResultModelList)); | |
88 | 90 | predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getFirstRiskFactorId())); |
89 | 91 | predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId())); |
90 | 92 | predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses())); |
... | ... | @@ -179,6 +181,20 @@ |
179 | 181 | } |
180 | 182 | } |
181 | 183 | return riskLevelResultModelList; |
184 | + } | |
185 | + | |
186 | + private String getRiskLevelString(List<RiskLevelResultModel> riskLevelResultModelList) { | |
187 | + String str = ""; | |
188 | + if (riskLevelResultModelList != null && riskLevelResultModelList.size() > 0) { | |
189 | + for (RiskLevelResultModel riskLevelResultModel : riskLevelResultModelList) { | |
190 | + str += riskLevelResultModel.getName(); | |
191 | + str += ","; | |
192 | + } | |
193 | + } | |
194 | + if (str.length() > 0) { | |
195 | + return str.substring(0, str.length() - 1); | |
196 | + } | |
197 | + return ""; | |
182 | 198 | } |
183 | 199 | |
184 | 200 | private String getRiskFactor(List<String> list) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java
View file @
1d42217
... | ... | @@ -41,8 +41,17 @@ |
41 | 41 | */ |
42 | 42 | // 需要计算 |
43 | 43 | private List<RiskLevelResultModel> riskLevelResultModelList; |
44 | + | |
44 | 45 | /** |
45 | 46 | * @auther HuJiaqi |
47 | + * @createTime 2016年12月01日 08时47分 | |
48 | + * @discription 风险等级拼接字符串 | |
49 | + */ | |
50 | + // 需要计算 | |
51 | + private String riskLevelNameString; | |
52 | + | |
53 | + /** | |
54 | + * @auther HuJiaqi | |
46 | 55 | * @createTime 2016年11月29日 17时06分 |
47 | 56 | * @discription 风险因素 |
48 | 57 | */ |
... | ... | @@ -56,6 +65,14 @@ |
56 | 65 | private String lastCheckEmployee; |
57 | 66 | |
58 | 67 | private String pid; |
68 | + | |
69 | + public String getRiskLevelNameString() { | |
70 | + return riskLevelNameString; | |
71 | + } | |
72 | + | |
73 | + public void setRiskLevelNameString(String riskLevelNameString) { | |
74 | + this.riskLevelNameString = riskLevelNameString; | |
75 | + } | |
59 | 76 | |
60 | 77 | public String getPid() { |
61 | 78 | return pid; |