Commit 5e0f3650fef3939fa8bc889cc6d797200033d7bb
1 parent
91a655aaaa
Exists in
dev
#fix:优化产检高危因素同步问题
Showing 1 changed file with 15 additions and 3 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java
View file @
5e0f365
| ... | ... | @@ -210,6 +210,7 @@ |
| 210 | 210 | antExRecordModel.setNextCheckTime(antEx.getNextCheckTime()); |
| 211 | 211 | antExRecordModel.setCheckTime(antEx.getCheckDate()); |
| 212 | 212 | antExRecordModel.sethScore(0); |
| 213 | + Patients patients = patientsService.findOnePatientById(antEx.getParentId()); | |
| 213 | 214 | //取当次产检的风险因素 |
| 214 | 215 | List li = null; |
| 215 | 216 | try { |
| 216 | 217 | |
| 217 | 218 | |
| 218 | 219 | |
| ... | ... | @@ -221,12 +222,13 @@ |
| 221 | 222 | Map result = commonService.calculateRiskScore(li); |
| 222 | 223 | antExRecordModel.sethScore((Integer) result.get("score")); |
| 223 | 224 | antExRecordModel.sethLevel((List) result.get("levelList")); |
| 225 | + | |
| 224 | 226 | } |
| 225 | 227 | |
| 226 | - Patients patients = patientsService.findOnePatientById(antEx.getParentId()); | |
| 227 | 228 | |
| 229 | + | |
| 228 | 230 | if (null != patients) { |
| 229 | - if (patients.getType() == 1) { | |
| 231 | + if (patients.getType() == 1) { | |
| 230 | 232 | antExRecordModel.setStatus(2); |
| 231 | 233 | antExRecordModel.setDueStatus(2); |
| 232 | 234 | } else { |
| ... | ... | @@ -256,6 +258,11 @@ |
| 256 | 258 | antExRecordModel.setLastMenses(patients.getLastMenses()); |
| 257 | 259 | antExRecordModel.setDueDate(patients.getDueDate()); |
| 258 | 260 | antExRecordModel.setName(patients.getUsername()); |
| 261 | + if (null != li){ | |
| 262 | + patients.setRiskFactorId(antExRecordModel.gethRisk()); | |
| 263 | + patients.setRiskLevelId(JsonUtil.array2JsonString(antExRecordModel.gethLevel())); | |
| 264 | + patientsService.updatePatientOne(patients,patients.getId()); | |
| 265 | + } | |
| 259 | 266 | } else { |
| 260 | 267 | logger.info("antex find patient by id is null. parentId:" + antEx.getParentId()); |
| 261 | 268 | return null; |
| ... | ... | @@ -289,6 +296,7 @@ |
| 289 | 296 | antExRecordModel.setZywzzlContent(antExChuModel.getZywzzlContent()); |
| 290 | 297 | antExRecordModel.setZyatzlState(antExChuModel.getZyatzlState()); |
| 291 | 298 | antExRecordModel.setZyatzlContent(antExChuModel.getZyatzlContent()); |
| 299 | + Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); | |
| 292 | 300 | |
| 293 | 301 | //高危信息 |
| 294 | 302 | List li = null; |
| ... | ... | @@ -304,7 +312,6 @@ |
| 304 | 312 | antExRecordModel.sethLevel((List) result.get("levelList")); |
| 305 | 313 | } |
| 306 | 314 | |
| 307 | - Patients patients = patientsService.findOnePatientById(antExChuModel.getParentId()); | |
| 308 | 315 | if (null != patients) { |
| 309 | 316 | if (patients.getType() == 1) { |
| 310 | 317 | antExRecordModel.setStatus(2); |
| ... | ... | @@ -338,6 +345,11 @@ |
| 338 | 345 | antExRecordModel.setLastMenses(patients.getLastMenses()); |
| 339 | 346 | antExRecordModel.setDueDate(patients.getDueDate()); |
| 340 | 347 | antExRecordModel.setName(patients.getUsername()); |
| 348 | + if (null != li){ | |
| 349 | + patients.setRiskFactorId(antExRecordModel.gethRisk()); | |
| 350 | + patients.setRiskLevelId(JsonUtil.array2JsonString(antExRecordModel.gethLevel())); | |
| 351 | + patientsService.updatePatientOne(patients,patients.getId()); | |
| 352 | + } | |
| 341 | 353 | /* antExRecordModel.sethScore(null==patients.getRiskScore()?0:patients.getRiskScore()); |
| 342 | 354 | antExRecordModel.sethRisk(patients.getRiskFactorId()); |
| 343 | 355 | antExRecordModel.sethLevel(JsonUtil.toList(patients.getRiskLevelId(), List.class));*/ |