diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 2f64f30..bec4492 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -384,10 +384,14 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (patient.getType() == 3) {//已经分娩,就是X temp.put("cqsc", 2);//产前筛查){ - } else {//未分娩, - int week = DateUtil.getWeek2(patient.getLastMenses(), new Date()); - if (week > 20) {//不能做产前筛查追访,产前检查追访 - temp.put("cqsc", 2);//未做产筛 + } else {//未分娩 + if(patient.getLastMenses()!=null){ + int week = DateUtil.getWeek2(patient.getLastMenses(), new Date()); + if (week > 20) {//不能做产前筛查追访,产前检查追访 + temp.put("cqsc", 2);//未做产筛 + } + }else{ + System.out.println("没有末次月经的建档:"+patient.getId()); } }