diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseAssitService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseAssitService.java
new file mode 100644
index 0000000..e1fa8af
--- /dev/null
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseAssitService.java
@@ -0,0 +1,25 @@
+package com.lyms.hospital.service.diagnose;
+
+import java.io.Serializable;
+
+import com.lyms.hospital.entity.diagnose.DiagnoseAssit;
+import com.lyms.web.service.BaseService;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author jiangjiazhi
+ * @since 2017-03-29
+ */
+public interface DiagnoseAssitService extends BaseService<DiagnoseAssit> {
+
+    /** 
+      * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
+      * <li>@param id 删除主键id
+      * <li>@return 大于0修改成功，否则为失败
+      */
+    public Integer deleteLogicById(Serializable id);
+
+}
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
new file mode 100644
index 0000000..0a3be46
--- /dev/null
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
@@ -0,0 +1,24 @@
+package com.lyms.hospital.service.diagnose;
+
+import com.lyms.hospital.entity.diagnose.DiagnoseInfo;
+import com.lyms.web.service.BaseService;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author jiangjiazhi
+ * @since 2017-03-28
+ */
+public interface DiagnoseInfoService extends BaseService<DiagnoseInfo> {
+
+  /** 
+    * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
+    * <li>@param id 删除主键id
+    * <li>@return 大于0修改成功，否则为失败
+    */
+  public Integer deleteLogicById(Serializable id);
+	
+}
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseAssitServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseAssitServiceImpl.java
new file mode 100644
index 0000000..4bc5871
--- /dev/null
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseAssitServiceImpl.java
@@ -0,0 +1,27 @@
+package com.lyms.hospital.service.diagnose.impl;
+
+import java.io.Serializable;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.hospital.dao.woman.DiagnoseAssitMapper;
+import com.lyms.hospital.entity.diagnose.DiagnoseAssit;
+import com.lyms.hospital.service.diagnose.DiagnoseAssitService;
+
+/**
+ * <p>
+ * 辅助检查项  服务实现类
+ * </p>
+ *
+ * @author jiangjiazhi
+ * @since 2017-03-29
+ */
+@Service
+public class DiagnoseAssitServiceImpl extends ServiceImpl<DiagnoseAssitMapper, DiagnoseAssit> implements
+                                                                                             DiagnoseAssitService {
+
+    public Integer deleteLogicById(Serializable id) {
+        return baseMapper.deleteLogicById(id);
+    }
+}
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
new file mode 100644
index 0000000..41a12ab
--- /dev/null
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
@@ -0,0 +1,105 @@
+package com.lyms.hospital.service.diagnose.impl;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.hospital.dao.diagnose.DiagnoseInfoMapper;
+import com.lyms.hospital.entity.diagnose.DiagnoseAssit;
+import com.lyms.hospital.entity.diagnose.DiagnoseInfo;
+import com.lyms.hospital.service.diagnose.DiagnoseAssitService;
+import com.lyms.hospital.service.diagnose.DiagnoseInfoService;
+import com.lyms.util.StrUtils;
+
+/**
+ * <p>
+ * 诊断信息表，包含初诊、复诊信息  服务实现类
+ * </p>
+ *
+ * @author jiangjiazhi
+ * @link DiagnoseTypeEnums 初诊  复诊 分类接口
+ * @since 2017-03-28
+ */
+@Service
+public class DiagnoseInfoServiceImpl extends ServiceImpl<DiagnoseInfoMapper, DiagnoseInfo> implements
+                                                                                          DiagnoseInfoService {
+
+    @Autowired
+    private DiagnoseAssitService diagnoseAssitService;
+
+    public Integer deleteLogicById(Serializable id) {
+        return baseMapper.deleteLogicById(id);
+    }
+
+    @Transactional
+    public void addOrUpdate(DiagnoseInfo dInfo, DiagnoseAssit diagnoseAssit) {
+        if (StringUtils.isEmpty(dInfo.getId())) {
+            dInfo.setId(StrUtils.uuid());
+            insert(dInfo);
+            if (StringUtils.isEmpty(diagnoseAssit.getId())) {
+                diagnoseAssit.setId(StrUtils.uuid());
+            }
+            diagnoseAssit.setDiagnoseId(dInfo.getId());
+            diagnoseAssitService.insert(diagnoseAssit);
+        } else {
+            updateById(dInfo);
+            diagnoseAssitService.updateById(diagnoseAssit);
+        }
+    }
+
+    /**
+     *  根据建档记录id查询所有有效的产检记录
+     *   
+     * <li>@param parentId  建档id
+     * <li>@return
+     * <li>创建人：Administrator
+     * <li>创建时间：2017-3-31
+     * <li>修改人：
+     * <li>修改时间：
+     */
+    public List<DiagnoseInfo> findListByParentId(String parentId) {
+        EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
+        ew.where("WOMAN_ID={0}", parentId);
+        return selectList(ew);
+    }
+
+    /**
+     * 
+     * 根据条件查询产检信息
+     * 
+     * <li>@param type
+     * <li>@param cardNum
+     * <li>@return
+     * <li>创建人：Administrator
+     * <li>创建时间：2017-3-31
+     * <li>修改人：
+     * <li>修改时间：
+     */
+    public DiagnoseInfo findByCond(int type, String cardNum) {
+        EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
+        ew.where("type={0}", type).and("BASE_PAPERS_NUMBER={0}", cardNum).orderBy("DIAGNOSE_TIME", Boolean.FALSE);
+        return (DiagnoseInfo) selectObj(ew);
+    }
+
+    /**
+     * 查询这个人所有的产检记录
+     * 
+     * <li>@param pid
+     * <li>@return
+     * <li>创建人：Administrator
+     * <li>创建时间：2017-3-31
+     * <li>修改人：
+     * <li>修改时间：
+     */
+    public List<DiagnoseInfo> findListByPid(String pid) {
+        EntityWrapper<DiagnoseInfo> ew = new EntityWrapper<DiagnoseInfo>();
+        ew.where("pid={0}", pid);
+        return selectList(ew);
+    }
+}
\ No newline at end of file