diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java
index 5211618..9489a06 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java
@@ -9,6 +9,7 @@ import com.lyms.platform.permission.model.CheckItem;
 import com.lyms.platform.permission.model.CheckItemManage;
 import com.lyms.platform.permission.model.CheckItemManageQuery;
 import com.lyms.platform.permission.service.CheckItemManageService;
+import com.lyms.platform.pojo.AntExChuModel;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -111,18 +112,20 @@ public class CheckItemManageServiceImpl implements CheckItemManageService {
 
         } else {
             //获取初诊
-            AntExChuModelTemp antExChuModelTemps = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModelTemp.class);
-            if (antExChuModelTemps != null && antExChuModelTemps.getConfigItemId() != null) {
-                String[] str = antExChuModelTemps.getConfigItemId().split(",");
-                for (String s2 : str) {
-                    List<CheckItem> list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s2).intValue());
-                    for (CheckItem checkItem : list1) {
-                        Map map = new HashMap();
-                        map.put("id", checkItem.getId());
-                        map.put("project", checkItem.getProject());
-                        map.put("projectInfo", checkItem.getProjectInfo());
-                        map.put("checkAttention", checkItem.getCheckAttention());
-                        list2.add(map);
+            AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModel.class);
+            if (antExChuModel != null && StringUtils.isNotEmpty(antExChuModel.getConfigItemId())) {
+                String[] str = antExChuModel.getConfigItemId().split(",");
+                if (null != str && str.length > 0) {
+                    for (String s2 : str) {
+                        List<CheckItem> list1 = checkItemMapper.xcxGetCheckItemList(Integer.valueOf(s2).intValue());
+                        for (CheckItem checkItem : list1) {
+                            Map map = new HashMap();
+                            map.put("id", checkItem.getId());
+                            map.put("project", checkItem.getProject());
+                            map.put("projectInfo", checkItem.getProjectInfo());
+                            map.put("checkAttention", checkItem.getCheckAttention());
+                            list2.add(map);
+                        }
                     }
                 }
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
index 17b34ba..52f00ec 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java
@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.io.UnsupportedEncodingException;
-import java.util.Map;
 
 
 /**
diff --git a/platform-operate-api/src/main/resources/qhdnb.xls b/platform-operate-api/src/main/resources/qhdnb.xls
index dc26558b5c11c08bef5f4111160a0f803369ed5b..1858ff0524f9e0cda9d035b803ac73a24e652611 100644
GIT binary patch
delta 35
rcmZp;!q{+yaYGIZn}J}%2JH`<i&(ZXa<DQmR3s(lRc<z5yO0b3=(G%o

delta 34
qcmZp;!q{+yaYGIZ+kwS@Rg>OtE@Iin$jr;YIQc-T)Mi(<-N^v_a}9<7