Commit c7498d25e1ca61144a127a22e93408b7cee52507

Authored by jiangjiazhi
1 parent beddd95809

1

Showing 1 changed file with 9 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ c7498d2
... ... @@ -156,7 +156,7 @@
156 156 }
157 157  
158 158 //当非建档医院修改初诊信息时,需要同步给建档医院
159   - private void syncMaster(String parentId) {
  159 + private void syncMaster(String parentId,String nextCheckTime) {
160 160  
161 161 //当前非建档医院最新的状态
162 162 Patients patients = patientsService.findOnePatientById(parentId);
163 163  
... ... @@ -173,12 +173,12 @@
173 173 p1.setRiskFactorId(patients.getRiskFactorId());
174 174 p1.setRiskLevelId(patients.getRiskLevelId());
175 175 p1.setRiskScore(patients.getRiskScore());
176   - p1.setNextCheckTime(patients.getNextCheckTime());
  176 + p1.setNextCheckTime(nextCheckTime==null?null:DateUtil.parseYMD(nextCheckTime));
177 177 p1.setFmDate(patients.getFmDate());
178 178 p1.setServiceStatus(patients.getServiceStatus());
179 179 p1.setLastCheckEmployeeId(patients.getLastCheckEmployeeId());
180 180 patientsService.updatePatient(p1);
181   - patientsService.updatePatientOneCol(masterPatients.getId(), patients.getNextCheckTime());
  181 + patientsService.updatePatientOneCol(masterPatients.getId(), nextCheckTime);
182 182 }else{
183 183 PatientsQuery patientsQuery1=new PatientsQuery();
184 184 patientsQuery1.setSource(parentId);
185 185  
... ... @@ -196,12 +196,12 @@
196 196 p1.setRiskFactorId(patients.getRiskFactorId());
197 197 p1.setRiskLevelId(patients.getRiskLevelId());
198 198 p1.setRiskScore(patients.getRiskScore());
199   - p1.setNextCheckTime(patients.getNextCheckTime());
  199 + p1.setNextCheckTime(nextCheckTime==null?null:DateUtil.parseYMD(nextCheckTime));
200 200 p1.setFmDate(patients.getFmDate());
201 201 p1.setServiceStatus(patients.getServiceStatus());
202 202 p1.setLastCheckEmployeeId(patients.getLastCheckEmployeeId());
203 203 patientsService.updatePatient(p1);
204   - patientsService.updatePatientOneCol(p.getId(), patients.getNextCheckTime());
  204 + patientsService.updatePatientOneCol(p.getId(), nextCheckTime);
205 205 }
206 206 }
207 207 }
... ... @@ -253,7 +253,7 @@
253 253 //修改最后一次检查时间
254 254 setLashCTimes(antExAddRequest.getParentId());
255 255 //修改数据
256   - syncMaster(antExAddRequest.getParentId());
  256 + syncMaster(antExAddRequest.getParentId(),antExAddRequest.getNextCheckTime());
257 257  
258 258 //复诊,修改产检管理
259 259 antenatalExaminationService.updateAntExRecord(antExAddRequest.getId(), 2);
... ... @@ -312,7 +312,7 @@
312 312 updateLastRhTime(patients.getId(), hospitalId);
313 313  
314 314 //修改数据
315   - syncMaster(antExAddRequest.getParentId());
  315 + syncMaster(antExAddRequest.getParentId(),antExAddRequest.getNextCheckTime());
316 316 //复诊,修改产检管理
317 317 antenatalExaminationService.updateAntExRecord(model.getId(), 2);
318 318 if (null != patients.getBuildType() && patients.getBuildType() == 3) {
... ... @@ -419,7 +419,7 @@
419 419  
420 420 antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1);
421 421 //修改数据
422   - syncMaster(excAddRequest.getParentId());
  422 + syncMaster(excAddRequest.getParentId(),excAddRequest.getNextCheckTime());
423 423 } else {
424 424 AntExChuQuery antExChuQuery1 = new AntExChuQuery();
425 425 antExChuQuery1.setParentId(excAddRequest.getParentId());
... ... @@ -479,7 +479,7 @@
479 479 setLashCTimes(antExChuModel.getParentId());
480 480  
481 481 antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1);
482   - syncMaster(excAddRequest.getParentId());
  482 + syncMaster(excAddRequest.getParentId(),excAddRequest.getNextCheckTime());
483 483 if (null != patients.getBuildType() && patients.getBuildType() == 3) {
484 484 Patients patients1 = new Patients();
485 485 patients1.setEnable("1");