Commit 2b2c4b233abbaf4482109ec9ca28aeb6e605bd8c
1 parent
74ebec2581
Exists in
master
and in
6 other branches
区域统计添加街道条件
Showing 2 changed files with 19 additions and 8 deletions
platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java
View file @
2b2c4b2
| ... | ... | @@ -746,8 +746,8 @@ |
| 746 | 746 | } |
| 747 | 747 | if (map.get("FE_LBLOODPRESSURE") != null || map.get("FE_HBLOODPRESSURE") != null) { |
| 748 | 748 | Map<String, String> bpmap = new HashMap<>(); |
| 749 | - bpmap.put("szy", map.get("FE_LBLOODPRESSURE") == null ? "" : DataUtil.getString(map.get("FE_LBLOODPRESSURE"))); | |
| 750 | - bpmap.put("ssy", map.get("FE_HBLOODPRESSURE") == null ? "" : DataUtil.getString(map.get("FE_HBLOODPRESSURE"))); | |
| 749 | + bpmap.put("szy", map.get("FE_LBLOODPRESSURE") == null ? "" : DataUtil.getString(map.get("FE_LBLOODPRESSURE"))); | |
| 750 | + bpmap.put("ssy", map.get("FE_HBLOODPRESSURE") == null ? "" : DataUtil.getString(map.get("FE_HBLOODPRESSURE"))); | |
| 751 | 751 | chuModel.setBp(JsonUtil.obj2Str(bpmap)); |
| 752 | 752 | } |
| 753 | 753 | |
| ... | ... | @@ -831,7 +831,15 @@ |
| 831 | 831 | antxModel.setCheckDate(DataUtil.getDate(map.get("CHECKDATE"))); |
| 832 | 832 | antxModel.setNextCheckTime(DataUtil.getDate(map.get("NEXTCHECKTIME"))); |
| 833 | 833 | antxModel.setYn(DataUtil.getInteger(map.get("YN"))); |
| 834 | - antxModel.setCreated(DataUtil.getDate(map.get("CREATED"))); | |
| 834 | + if (map.get("CREATED") == null) | |
| 835 | + { | |
| 836 | + antxModel.setCreated(DataUtil.getDate(map.get("CHECKDATE"))); | |
| 837 | + } | |
| 838 | + else | |
| 839 | + { | |
| 840 | + antxModel.setCreated(DataUtil.getDate(map.get("CREATED"))); | |
| 841 | + } | |
| 842 | + | |
| 835 | 843 | antxModel.setModified(DataUtil.getDate(map.get("MODIFIED"))); |
| 836 | 844 | |
| 837 | 845 | String hid = DataUtil.getString(map.get("HOSPITALID")); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
2b2c4b2
| ... | ... | @@ -248,6 +248,7 @@ |
| 248 | 248 | Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); |
| 249 | 249 | |
| 250 | 250 | patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); |
| 251 | + patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); | |
| 251 | 252 | patientsService.updatePatient(patients); |
| 252 | 253 | patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime())? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); |
| 253 | 254 | //修改孕妇高危等级 |
| 254 | 255 | |
| ... | ... | @@ -257,8 +258,8 @@ |
| 257 | 258 | updateLastRhTime(patients.getId(), hospitalId); |
| 258 | 259 | //修改最后一次检查时间 |
| 259 | 260 | setLashCTimes(antExAddRequest.getParentId()); |
| 260 | - patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); | |
| 261 | 261 | |
| 262 | + | |
| 262 | 263 | //修改数据 |
| 263 | 264 | syncMaster(antExAddRequest.getParentId(),antExAddRequest.getNextCheckTime()); |
| 264 | 265 | |
| 265 | 266 | |
| ... | ... | @@ -301,9 +302,10 @@ |
| 301 | 302 | if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { |
| 302 | 303 | patients.setEnable("1"); |
| 303 | 304 | } |
| 305 | + patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); | |
| 304 | 306 | patientsService.updatePatient(patients); |
| 305 | 307 | // patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); |
| 306 | - patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); | |
| 308 | + | |
| 307 | 309 | antenatalExaminationService.addOneBabyAnt(model); |
| 308 | 310 | |
| 309 | 311 | /** 验证产检券是否可用 可用就改为已使用状态 */ |
| 310 | 312 | |
| 311 | 313 | |
| ... | ... | @@ -437,9 +439,10 @@ |
| 437 | 439 | } |
| 438 | 440 | //修改患者风险等级 |
| 439 | 441 | // updatePatientRiskLevel(antExChuModel, patients); |
| 440 | - patientsService.updatePatient(patients); | |
| 441 | 442 | patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(),patients.getId()); |
| 443 | + patientsService.updatePatient(patients); | |
| 442 | 444 | |
| 445 | + | |
| 443 | 446 | //修改本系统最后的高危 |
| 444 | 447 | updateLastRisk(patients.getId()); |
| 445 | 448 | //修改本院最后一次定义高危 |
| 446 | 449 | |
| ... | ... | @@ -509,9 +512,9 @@ |
| 509 | 512 | //修改患者风险等级 |
| 510 | 513 | |
| 511 | 514 | patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); |
| 512 | - | |
| 513 | - patientsService.updatePatient(patients); | |
| 514 | 515 | patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId()); |
| 516 | + patientsService.updatePatient(patients); | |
| 517 | + | |
| 515 | 518 | updateLastRisk(patients.getId()); |
| 516 | 519 | |
| 517 | 520 | //修改本院最后一次定义高危 |