jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit c60ff8ce7e2e44e71c76e15076d4a21f2c339818

Authored by yangfei
2 parents 33667ab80f fb87fb6577
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java View file @ c60ff8c
... ... @@ -16,6 +16,7 @@
16 16 import com.lyms.platform.query.PatientsQuery;
17 17 import com.lyms.platform.query.VisitQuery;
18 18 import org.apache.commons.collections.CollectionUtils;
  19 +import org.apache.commons.lang.StringUtils;
19 20 import org.springframework.beans.factory.annotation.Autowired;
20 21 import org.springframework.data.domain.Sort;
21 22 import org.springframework.stereotype.Service;
... ... @@ -143,6 +144,9 @@
143 144 */
144 145 public void handleCheckPoint(String pid)
145 146 {
  147 + if(StringUtils.isEmpty(pid)){
  148 + return;
  149 + }
146 150 PatientsQuery patientsQuery = new PatientsQuery();
147 151 patientsQuery.setYn(YnEnums.YES.getId());
148 152 patientsQuery.setPid(pid);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ c60ff8c
... ... @@ -323,8 +323,8 @@
323 323 patients1.setId(patients.getId());
324 324 patients1.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor());
325 325  
326   - model.setPid(patients1.getPid());
327   - if (StringUtils.isNotEmpty(patients1.getEnable()) && "0".equals(patients1.getEnable())) {
  326 + model.setPid(patients.getPid());
  327 + if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) {
328 328 patients1.setEnable("1");
329 329 }
330 330