jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9665e7a74db24cc485498eb323cbc43851aae7a0

Authored by hujiaqi
2 parents 615b58e74b 1b3c665a76
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 9665e7a
... ... @@ -117,6 +117,34 @@
117 117 iPatientDao.updatePatientOneCol(id, colValue);
118 118 }
119 119  
  120 + /**
  121 + * 修改下次检查时间
  122 + *
  123 + * @param nextCheckTime
  124 + * @param id
  125 + */
  126 + public void updateNextCheckTime(String nextCheckTime,String id){
  127 + if(StringUtils.isNotEmpty(id)){
  128 + Patients patients= findOnePatientById(id);
  129 + //修改主档
  130 + if(null!=patients&&StringUtils.isNotEmpty(patients.getSource())){
  131 + Patients p = findOnePatientById(patients.getSource());
  132 + updatePatientOneCol(p.getId(),com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime) == true ? null : DateUtil.parseYMD(nextCheckTime));
  133 + }else if(null!=patients){
  134 + PatientsQuery patientsQuery1=new PatientsQuery();
  135 + patientsQuery1.setSource(id);
  136 + patientsQuery1.setYn(YnEnums.YES.getId());
  137 + List<Patients> list= queryPatient(patientsQuery1);
  138 + if(CollectionUtils.isNotEmpty(list)){
  139 + for(Patients p:list){
  140 + updatePatientOneCol(p.getId(),com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime) == true ? null : DateUtil.parseYMD(nextCheckTime));
  141 + }
  142 + }
  143 + }
  144 + updatePatientOneCol(id,com.lyms.platform.common.utils.StringUtils.isEmpty(nextCheckTime) == true ? null : DateUtil.parseYMD(nextCheckTime));
  145 + }
  146 + }
  147 +
120 148 public void updatePatientLastCheckEmployeeIdOne(String id, String lastCheckEmployeeId) {
121 149 iPatientDao.updatePatientLastCheckEmployeeIdOne(id, lastCheckEmployeeId);
122 150 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 9665e7a
... ... @@ -186,6 +186,10 @@
186 186 }
187 187 model.setParentId(parentId);
188 188 antExAddRequest.setParentId(parentId);
  189 + Patients p=patientsService.findOnePatientById(parentId);
  190 +
  191 + //加入产筛
  192 + patientsService.validata(p);
189 193 }
190 194  
191 195  
... ... @@ -343,6 +347,11 @@
343 347 antExChuModel.setParentId(parentId);
344 348 excAddRequest.setParentId(parentId);
345 349  
  350 + Patients p=patientsService.findOnePatientById(parentId);
  351 +
  352 + //加入产筛
  353 + patientsService.validata(p);
  354 +
346 355 }
347 356 antExChuModel.setOperator(userId);
348 357 if (StringUtils.isNotEmpty(antExChuModel.getId()) && StringUtils.isNotEmpty(antExChuModel.getParentId())) {
... ... @@ -360,7 +369,7 @@
360 369 //修改患者风险等级
361 370 // updatePatientRiskLevel(antExChuModel, patients);
362 371 patientsService.updatePatient(patients);
363   - patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(excAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(excAddRequest.getNextCheckTime()));
  372 + patientsService.updateNextCheckTime(patients.getId(), excAddRequest.getNextCheckTime());
364 373  
365 374 //修改本系统最后的高危
366 375 updateLastRisk(patients.getId());
367 376  
... ... @@ -423,9 +432,9 @@
423 432 //修改患者风险等级
424 433  
425 434 patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor());
426   -// updatePatientRiskLevel(antExChuModel, patients);
  435 +
427 436 patientsService.updatePatient(patients);
428   - patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(excAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(excAddRequest.getNextCheckTime()));
  437 + patientsService.updateNextCheckTime(patients.getId(), excAddRequest.getNextCheckTime());
429 438 updateLastRisk(patients.getId());
430 439  
431 440 //修改本院最后一次定义高危
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ 9665e7a
... ... @@ -143,7 +143,7 @@
143 143 patientsService.updatePatient(patients2);
144 144 }
145 145  
146   - patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(postReviewRequest.getNextCheckTime()));
  146 + patientsService.updateNextCheckTime(patients.getId(), postReviewRequest.getNextCheckTime());
147 147  
148 148 if (null != patients.getBuildType() && patients.getBuildType() == 3) {
149 149 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();