jiangjiazhi / center

Download as
Browse Code »

Commit a99c138a2188e4caff62667996bb74c855169add

Authored by xujiahong
1 parent 3bcb3cab01
Exists in master

儿童管理列表，叶酸发放基础

Showing 32 changed files with 1444 additions and 144 deletions

parent/hospital.mac/src/main/java/com/lyms/hospital/dao/assist/DiagnoseAssitMapper.xml View file @ a99c138
... ... @@ -42,11 +42,13 @@
42 42 <result column="IMAGE_BULTRASOUND" property="imageBultrasound" />
43 43 <result column="GONORRHOEA" property="gonorrhoea" />
44 44 <result column="IMAGE_XT" property="imageXt" />
  45 + <result column="CHILD_BONEZ" property="childBonez" />
  46 + <result column="CHILD_KGJ" property="childKgj" />
45 47 </resultMap>
46 48  
47 49 <!-- 通用查询结果列 -->
48 50 <sql id="Base_Column_List">
49   - ID AS id, DIAGNOSE_ID AS diagnoseId, DIAGNOSE_TYPE AS diagnoseType, BLOODROUTINE_XHDB AS bloodroutineXhdb, BLOODROUTINE_BXBJS AS bloodroutineBxbjs, BLOODROUTINE_XXBJS AS bloodroutineXxbjs, BLOODROUTINE_OTHER AS bloodroutineOther, PISS_NDB AS pissNdb, PISS_NT AS pissNt, PISS_NTT AS pissNtt, PISS_NQX AS pissNqx, PISS_OTHER AS pissOther, BLOODTYPE AS bloodtype, BLOODTYPE_RH AS bloodtypeRh, BLOODTYPE_XT AS bloodtypeXt, LIVER_XQGBZAM AS liverXqgbzam, LIVER_XQGCZAM AS liverXqgczam, LIVER_BDB AS liverBdb, LIVER_ZDHS AS liverZdhs, LIVER_ZHDHS AS liverZhdhs, LIVER_BG AS liverBg, HEPATITISB_YGBMKY AS hepatitisbYgbmky, HEPATITISB_YGBMKT AS hepatitisbYgbmkt, HEPATITISB_YGEKY AS hepatitisbYgeky, HEPATITISB_YGEKT AS hepatitisbYgekt, HEPATITISB_YGHXKT AS hepatitisbYghxkt, KIDNEY_XQJG AS kidneyXqjg, KIDNEY_XNSD AS kidneyXnsd, SYPHILIS_SYJG AS syphilisSyjg, SYPHILIS_HIV AS syphilisHiv, VAGINA_DC AS vaginaDc, VAGINA_JSJMJ AS vaginaJsjmj, VAGINA_OTHER AS vaginaOther, VAGINA_OTHER_TXT AS vaginaOtherTxt, VAGINA_YDQJD AS vaginaYdqjd, IMAGE_BULTRASOUND AS imageBultrasound, GONORRHOEA AS gonorrhoea, IMAGE_XT AS imageXt
  51 + ID AS id, DIAGNOSE_ID AS diagnoseId, DIAGNOSE_TYPE AS diagnoseType, BLOODROUTINE_XHDB AS bloodroutineXhdb, BLOODROUTINE_BXBJS AS bloodroutineBxbjs, BLOODROUTINE_XXBJS AS bloodroutineXxbjs, BLOODROUTINE_OTHER AS bloodroutineOther, PISS_NDB AS pissNdb, PISS_NT AS pissNt, PISS_NTT AS pissNtt, PISS_NQX AS pissNqx, PISS_OTHER AS pissOther, BLOODTYPE AS bloodtype, BLOODTYPE_RH AS bloodtypeRh, BLOODTYPE_XT AS bloodtypeXt, LIVER_XQGBZAM AS liverXqgbzam, LIVER_XQGCZAM AS liverXqgczam, LIVER_BDB AS liverBdb, LIVER_ZDHS AS liverZdhs, LIVER_ZHDHS AS liverZhdhs, LIVER_BG AS liverBg, HEPATITISB_YGBMKY AS hepatitisbYgbmky, HEPATITISB_YGBMKT AS hepatitisbYgbmkt, HEPATITISB_YGEKY AS hepatitisbYgeky, HEPATITISB_YGEKT AS hepatitisbYgekt, HEPATITISB_YGHXKT AS hepatitisbYghxkt, KIDNEY_XQJG AS kidneyXqjg, KIDNEY_XNSD AS kidneyXnsd, SYPHILIS_SYJG AS syphilisSyjg, SYPHILIS_HIV AS syphilisHiv, VAGINA_DC AS vaginaDc, VAGINA_JSJMJ AS vaginaJsjmj, VAGINA_OTHER AS vaginaOther, VAGINA_OTHER_TXT AS vaginaOtherTxt, VAGINA_YDQJD AS vaginaYdqjd, IMAGE_BULTRASOUND AS imageBultrasound, GONORRHOEA AS gonorrhoea, IMAGE_XT AS imageXt, CHILD_BONEZ AS childBonez,CHILD_KGJ AS childKgj
50 52 </sql>
51 53 </mapper>
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.java View file @ a99c138
... ... @@ -8,7 +8,8 @@
8 8 import com.baomidou.mybatisplus.mapper.BaseMapper;
9 9 import com.baomidou.mybatisplus.plugins.pagination.Pagination;
10 10 import com.lyms.hospital.entity.changehospital.HighriskChangeHospital;
11   -import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo;
  11 +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalChildVo;
  12 +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo;
12 13 /**
13 14 * <p>
14 15 * Mapper接口
... ... @@ -22,8 +23,10 @@
22 23  
23 24 public Integer deleteLogicById(Serializable id);
24 25  
25   - //查询转出孕妇列表（条件筛选、分页、多表关联）
26   - public List<HighriskChangeHospitalVo> listOfOutWomanVo(Pagination page,HighriskChangeHospitalVo vo);
  26 + //查询-高危转诊（转出、转入孕妇）
  27 + public List<HighriskChangeHospitalWomanVo> pageOfWoman(Pagination page,HighriskChangeHospitalWomanVo vo);
  28 + //查询-高危转诊（转出、转入儿童）
  29 + public List<HighriskChangeHospitalChildVo> pageOfChild(Pagination page,HighriskChangeHospitalChildVo vo);
27 30  
28 31  
29 32 }
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.xml View file @ a99c138
... ... @@ -5,7 +5,8 @@
5 5 <!-- 通用查询映射结果 -->
6 6 <resultMap id="BaseResultMap" type="com.lyms.hospital.entity.changehospital.HighriskChangeHospital">
7 7 <id column="ID" property="id" />
8   - <result column="WOMAN_ID" property="womanId" />
  8 + <result column="TARGET_TYPE" property="targetType" />
  9 + <result column="TARGET_ID" property=targetId />
9 10 <result column="OUT_ORGID" property="outOrgid" />
10 11 <result column="INTO_ORGID" property="intoOrgid" />
11 12 <result column="DESCRIPTION" property="description" />
12 13  
... ... @@ -17,10 +18,11 @@
17 18 <result column="STATUS" property="status" />
18 19 <result column="CREATE_TIME" property="createTime" />
19 20 <result column="RECEIVE_TIME" property="receiveTime" />
  21 + <result column="RECEIVE_DOCTORID" property="receiveDoctorid" />
20 22 </resultMap>
21 23  
22   - <!-- 转诊信息业务实体映射 -->
23   - <resultMap id="VoResultMap" type="com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo"
  24 + <!-- 孕妇转诊信息业务实体映射 -->
  25 + <resultMap id="WomanVoResultMap" type="com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo"
24 26 extends="BaseResultMap">
25 27 <result column="BASE_WOMAN_NAME" property="baseWomanName" />
26 28 <result column="BASE_WOMAN_BIRTH" property="baseWomanBirth" />
27 29  
28 30  
29 31  
30 32  
... ... @@ -28,22 +30,67 @@
28 30 <result column="outOrgName" property="outOrgName" />
29 31 <result column="intoOrgName" property="intoOrgName" />
30 32 </resultMap>
  33 +
  34 + <!-- 儿童转诊信息业务实体映射 -->
  35 + <resultMap id="ChildVoResultMap" type="com.lyms.hospital.entity.changehospital.HighriskChangeHospitalChildVo"
  36 + extends="BaseResultMap">
  37 + <result column="childId" property="childId" />
  38 + <result column="childName" property="childName" />
  39 + <result column="GENDER" property="gender" />
  40 + <result column="BIRTHDAY" property="birthday" />
  41 + <result column="BASE_WOMAN_NAME" property="baseWomanName" />
  42 + <result column="CONTACT_WOMAN_WAY" property="contactWomanWay" />
  43 + <result column="outOrgName" property="outOrgName" />
  44 + <result column="intoOrgName" property="intoOrgName" />
  45 + </resultMap>
31 46  
32 47 <!-- 通用查询结果列 -->
33 48 <sql id="Base_Column_List">
34   - ID AS id, WOMAN_ID AS womanId, OUT_ORGID AS outOrgid, INTO_ORGID AS intoOrgid, DESCRIPTION AS description, MUSTDESC AS mustdesc, RISK AS risk, CHANGEWAY AS changeway, APPLY_DOCTORID AS applyDoctorid, CREATE_ID AS createId, CREATE_TIME AS createTime, STATUS AS status, RECEIVE_TIME AS receiveTime
  49 + ID AS id, TARGET_TYPE AS targetType, TARGET_ID AS targetId, OUT_ORGID AS outOrgid, INTO_ORGID AS intoOrgid, DESCRIPTION AS description, MUSTDESC AS mustdesc, RISK AS risk, CHANGEWAY AS changeway, APPLY_DOCTORID AS applyDoctorid, CREATE_ID AS createId, CREATE_TIME AS createTime, STATUS AS status, RECEIVE_TIME AS receiveTime, RECEIVE_DOCTORID AS receiveDoctorid
35 50 </sql>
36 51  
37 52 <!-- 查询转出孕妇列表（条件筛选、分页、多表关联） -->
38   - <select id="listOfOutWomanVo" resultMap="VoResultMap"
39   - parameterType="com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo">
  53 + <select id="pageOfWoman" resultMap="WomanVoResultMap"
  54 + parameterType="com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo">
40 55 SELECT chg.*,woman.BASE_WOMAN_NAME,woman.BASE_WOMAN_BIRTH,woman.CONTACT_WOMAN_WAY,
41 56 outOrg.`NAME` AS outOrgName,intoOrg.`NAME` AS intoOrgName
42 57 FROM HIGHRISK_CHANGE_HOSPITAL AS chg
  58 + INNER JOIN WOMAN_FETATION_RECORD AS woman ON chg.`TARGET_ID`=woman.`ID`
43 59 INNER JOIN SYS_ORGANIZATIONS AS outOrg ON chg.OUT_ORGID = outOrg.`ID`
44 60 INNER JOIN SYS_ORGANIZATIONS AS intoOrg ON chg.`INTO_ORGID` = intoOrg.`ID`
45   - INNER JOIN WOMAN_FETATION_RECORD AS woman ON chg.`WOMAN_ID`=woman.`ID`
46   - WHERE chg.OUT_ORGID = #{outOrgid}
  61 + <where>
  62 + and chg.TARGET_TYPE = 1 <!-- 目标类型：1孕妇，2儿童 -->
  63 + <!-- 查询标识：1转出，2转入 -->
  64 + <if test="queryFlag==1">
  65 + and chg.OUT_ORGID = #{outOrgid}
  66 + </if>
  67 + <if test="queryFlag==2">
  68 + and chg.`INTO_ORGID` = #{intoOrgid}
  69 + </if>
  70 + </where>
  71 + </select>
  72 +
  73 + <!-- 查询-高危转诊（转出、转入儿童） -->
  74 + <select id="pageOfChild" resultMap="ChildVoResultMap"
  75 + parameterType="com.lyms.hospital.entity.changehospital.HighriskChangeHospitalChildVo">
  76 + SELECT chg.ID,chg.`MUSTDESC`,outOrg.`NAME` AS outOrgName,intoOrg.`NAME` AS intoOrgName,
  77 + chg.`CREATE_TIME`,chg.`RECEIVE_TIME`,chg.`STATUS`,
  78 + c.`ID` AS childId,c.`NAME` AS childName,c.`GENDER`,c.`BIRTHDAY`,
  79 + c.`BASE_WOMAN_NAME`,c.`CONTACT_WOMAN_WAY`
  80 + FROM HIGHRISK_CHANGE_HOSPITAL chg
  81 + INNER JOIN CHILDREN_PERSON c ON chg.`TARGET_ID`=c.`ID`
  82 + INNER JOIN SYS_ORGANIZATIONS AS outOrg ON chg.OUT_ORGID = outOrg.`ID`
  83 + INNER JOIN SYS_ORGANIZATIONS AS intoOrg ON chg.`INTO_ORGID` = intoOrg.`ID`
  84 + <where>
  85 + and chg.TARGET_TYPE = 2 <!-- 目标类型：1孕妇，2儿童 -->
  86 + <!-- 查询标识：1转出，2转入 -->
  87 + <if test="queryFlag==1">
  88 + and chg.OUT_ORGID = #{outOrgid}
  89 + </if>
  90 + <if test="queryFlag==2">
  91 + and chg.`INTO_ORGID` = #{intoOrgid}
  92 + </if>
  93 + </where>
47 94 </select>
48 95  
49 96  
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.java View file @ a99c138
... ... @@ -4,6 +4,8 @@
4 4 import com.baomidou.mybatisplus.mapper.BaseMapper;
5 5 import org.springframework.stereotype.Repository;
6 6 import java.io.Serializable;
  7 +import java.util.List;
  8 +import java.util.Map;
7 9 /**
8 10 * <p>
9 11 * Mapper接口
... ... @@ -16,6 +18,17 @@
16 18 public interface ChildrenExamMapper extends BaseMapper<ChildrenExam> {
17 19  
18 20 public Integer deleteLogicById(Serializable id);
  21 +
  22 + /**
  23 + * <li>@Description:查询-【某儿童】历史体格检查记录
  24 + * <li>@param child_id
  25 + * <li>@return
  26 + * <li>创建人：xujiahong
  27 + * <li>创建时间：2017年4月13日
  28 + * <li>修改人：
  29 + * <li>修改时间：
  30 + */
  31 + public List<Map<String,Object>> listOfHistoryExam(String childId);
19 32  
20 33 }
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.xml View file @ a99c138
... ... @@ -66,5 +66,11 @@
66 66 <sql id="Base_Column_List">
67 67 ID AS id, CHILD_ID AS childId, EXAM_TIME AS examTime, ORG_ID AS orgId, FOSTER_MAJOR AS fosterMajor, FEED_TYPE AS feedType, URINE AS urine, SHIT AS shit, SLEEP AS sleep, OUTSIDE AS outside, VD AS vd, OTHER_FOOD AS otherFood, FAMILY_MEASURE AS familyMeasure, SICK_CONDITION AS sickCondition, IS_ALLERGIC AS isAllergic, ALLERGIC_QMS AS allergicQms, ALLERGIC_XFMS AS allergicXfms, ALLERGIC_HAL AS allergicHal, ALLERGIC_OTHER AS allergicOther, ALLERGIC_OTHER_TEXT AS allergicOtherText, BODY_TEMPERATURE AS bodyTemperature, HEIGHT AS height, WEIGHT AS weight, PARAM_HW AS paramHw, HEAD_CIRCLE AS headCircle, CHEST_CIRCLE AS chestCircle, GROWTH_EVALUATE AS growthEvaluate, JPDHS_HEAD AS jpdhsHead, JPDHS_CHEST AS jpdhsChest, JPDHS_BELLY AS jpdhsBelly, QX_HEAD AS qxHead, QX_SIZE_ONE AS qxSizeOne, QX_SIZE_TWO AS qxSizeTwo, TOOTH AS tooth, FACE_COLOR AS faceColor, SKIN AS skin, EYE_APPEARANCE AS eyeAppearance, VISION AS vision, EAR_APPEARANCE AS earAppearance, LISTENING AS listening, NECK AS neck, CHEST AS chest, BELLY AS belly, LIMB AS limb, ANUS AS anus, GAIT AS gait, KYGLBZZ AS kyglbzz, KYGLBTZ AS kyglbtz, NERVOUS_CHECK AS nervousCheck, DIAGNOSE AS diagnose, HANDLE_SUGGESTION AS handleSuggestion, GUIDE_SUGGESTION AS guideSuggestion, DOCTOR_ID AS doctorId, NEXT_TIME AS nextTime, CREATE_TIME AS createTime, IF_DEL AS ifDel
68 68 </sql>
  69 +
  70 + <select id="listOfHistoryExam" parameterType="java.util.String" resultType="map">
  71 + SELECT e.EXAM_TIME AS examTime,p.`BIRTHDAY` AS birthday FROM CHILDREN_EXAM e
  72 + INNER JOIN CHILDREN_PERSON p ON e.`CHILD_ID`=p.`ID`
  73 + WHERE e.CHILD_ID=#{childId}
  74 + </select>
69 75 </mapper>
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.java View file @ a99c138
1 1 package com.lyms.hospital.dao.children;
2 2  
3   -import com.lyms.hospital.entity.children.ChildrenPerson;
4   -import com.baomidou.mybatisplus.mapper.BaseMapper;
5   -import org.springframework.stereotype.Repository;
6 3 import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import org.springframework.stereotype.Repository;
  7 +
  8 +import com.baomidou.mybatisplus.mapper.BaseMapper;
  9 +import com.baomidou.mybatisplus.plugins.pagination.Pagination;
  10 +import com.lyms.hospital.entity.children.ChildrenPerson;
7 11 /**
8 12 * <p>
9 13 * Mapper接口
... ... @@ -16,6 +20,18 @@
16 20 public interface ChildrenPersonMapper extends BaseMapper<ChildrenPerson> {
17 21  
18 22 public Integer deleteLogicById(Serializable id);
  23 +
  24 + /**
  25 + * <li>@Description:查询-全部儿童管理
  26 + * <li>@param page
  27 + * <li>@param obj
  28 + * <li>@return
  29 + * <li>创建人：xujiahong
  30 + * <li>创建时间：2017年4月17日
  31 + * <li>修改人：
  32 + * <li>修改时间：
  33 + */
  34 + public List<ChildrenPerson> pageOfAllChildren(Pagination page,ChildrenPerson obj);
19 35  
20 36 }
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.xml View file @ a99c138
... ... @@ -18,11 +18,75 @@
18 18 <result column="CREATE_TIME" property="createTime" />
19 19 <result column="DOCTOR_ID" property="doctorId" />
20 20 <result column="IF_DEL" property="ifDel" />
  21 + <result column="BASE_WOMAN_NAME" property="baseWomanName" />
  22 + <result column="BASE_PAPERS_TYPE" property="basePapersType" />
  23 + <result column="BASE_PAPERS_NUMBER" property="basePapersNumber" />
  24 + <result column="BASE_WOMAN_BIRTH" property="baseWomanBirth" />
  25 + <result column="CONTACT_WOMAN_WAY" property="contactWomanWay" />
  26 + <result column="DEGREE" property="degree" />
  27 + <result column="OCCUPATION" property="occupation" />
  28 + <!--
  29 + //child_exam
  30 + private Date lastExamTime;//最后检查日期 LAST_EXAM_TIME
  31 + private String examDoctorId;//检查医生
  32 + private String examDoctorName;//检查医生名称
  33 + private Date nextTime;//下次预约日期
  34 + //高危等级（预留）
  35 + //child_record
  36 + private Integer serviceType;//服务类型
  37 + -->
  38 + <result column="EXAM_TIME" property="lastExamTime" />
  39 + <result column="examDoctorId" property="examDoctorId" />
  40 + <result column="examDoctorName" property="examDoctorName" />
  41 + <result column="NEXT_TIME" property="nextTime" />
  42 + <result column="SERVICE_TYPE" property="serviceType" />
21 43 </resultMap>
22 44  
23 45 <!-- 通用查询结果列 -->
24 46 <sql id="Base_Column_List">
25   - ID AS id, MOTHER_ID AS motherId, NAME AS name, GENDER AS gender, PAPERS_NUM AS papersNum, BIRTHDAY AS birthday, ADDRESS_PROVINCE AS addressProvince, ADDRESS_CITY AS addressCity, ADDRESS_AREA AS addressArea, ADDRESS_STREET AS addressStreet, ADDRESS_DETAIL AS addressDetail, CREATE_TIME AS createTime, DOCTOR_ID AS doctorId,IF_DEL AS ifDel
  47 + ID AS id, MOTHER_ID AS motherId, NAME AS name, GENDER AS gender, PAPERS_NUM AS papersNum, BIRTHDAY AS birthday, ADDRESS_PROVINCE AS addressProvince, ADDRESS_CITY AS addressCity, ADDRESS_AREA AS addressArea, ADDRESS_STREET AS addressStreet, ADDRESS_DETAIL AS addressDetail, CREATE_TIME AS createTime, DOCTOR_ID AS doctorId, IF_DEL AS ifDel, BASE_WOMAN_NAME AS baseWomanName, BASE_PAPERS_TYPE AS basePapersType, BASE_PAPERS_NUMBER AS basePapersNumber, BASE_WOMAN_BIRTH AS baseWomanBirth, CONTACT_WOMAN_WAY AS contactWomanWay, DEGREE AS degree, OCCUPATION AS occupation
26 48 </sql>
  49 +
  50 + <select id="pageOfAllChildren" parameterType="com.lyms.hospital.entity.children.ChildrenPerson" resultMap="BaseResultMap">
  51 + SELECT c.`ID`,c.`NAME`,c.`GENDER`,c.`BIRTHDAY`,c.`BASE_WOMAN_NAME`,
  52 + e.`EXAM_TIME`,e.`DOCTOR_ID` AS examDoctorId,e.`NEXT_TIME`,c.`CREATE_TIME`,c.`DOCTOR_ID`,r.`SERVICE_TYPE`,c.`CONTACT_WOMAN_WAY`
  53 + FROM CHILDREN_PERSON c
  54 + INNER JOIN CHILDREN_EXAM e ON e.`CHILD_ID`=c.`ID`
  55 + INNER JOIN CHILDREN_RECORD r ON r.`CHILD_ID`=c.`ID`
  56 + <where>
  57 + <if test="birthDateBegin!=null and birthDateEnd!=null">
  58 + <![CDATA[
  59 + and (c.`BIRTHDAY` > #{birthDateBegin} or c.`BIRTHDAY` = #{birthDateBegin})
  60 + and (c.`BIRTHDAY` < #{birthDateEnd} or c.`BIRTHDAY` = #{birthDateEnd})
  61 + ]]>
  62 + </if>
  63 + <if test="examDateBegin!=null and examDateEnd!=null">
  64 + <![CDATA[
  65 + and (e.`EXAM_TIME` > #{examDateBegin} or e.`EXAM_TIME` = #{examDateBegin})
  66 + and (e.`EXAM_TIME` < #{examDateEnd} or e.`EXAM_TIME` = #{examDateEnd})
  67 + ]]>
  68 + </if>
  69 + <!--
  70 + TODO <if test="examDoctorName!=null"></if> 根据【检查医生】姓名模糊查询
  71 + -->
  72 + <if test="nextDateBegin!=null and nextDateEnd!=null">
  73 + <![CDATA[
  74 + and (e.`NEXT_TIME` > #{nextDateBegin} or e.`NEXT_TIME` = #{nextDateBegin})
  75 + and (e.`NEXT_TIME` < #{nextDateEnd} or e.`NEXT_TIME` = #{nextDateEnd})
  76 + ]]>
  77 + </if>
  78 + <if test="serviceType!=null">r.`SERVICE_TYPE`=#{serviceType}</if>
  79 + <!-- 查询号（母亲证件号/姓名/联系方式/母亲姓名） -->
  80 + <if test="queryFlag!=null">
  81 + and (
  82 + c.BASE_PAPERS_NUMBER like concat('%',#{queryFlag},'%') or
  83 + c.`NAME` like concat('%',#{queryFlag},'%') or
  84 + c.`CONTACT_WOMAN_WAY` like concat('%',#{queryFlag},'%') or
  85 + c.BASE_WOMAN_NAME like concat('%',#{queryFlag},'%')
  86 + )
  87 +
  88 + </if>
  89 + </where>
  90 + </select>
27 91 </mapper>
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.xml View file @ a99c138
... ... @@ -121,7 +121,8 @@
121 121 <if test="contactWay!=null">and wr.`CONTACT_WOMAN_WAY` like concat('%',#{contactWay},'%')</if>
122 122 <if test="queryDateBegin!=null and queryDateEnd!=null">
123 123 <![CDATA[
124   - and i.`INSPECT_DATE` > #{queryDateBegin} and i.`INSPECT_DATE` < #{queryDateEnd}
  124 + and (i.`INSPECT_DATE` > #{queryDateBegin} or i.`INSPECT_DATE` = #{queryDateBegin})
  125 + and (i.`INSPECT_DATE` < #{queryDateEnd} or i.`INSPECT_DATE` = #{queryDateEnd})
125 126 ]]>
126 127 </if>
127 128 <if test="medicalSuggestion!=null">and i.`MEDICAL_SUGGESTION` like concat('%',#{medicalSuggestion},'%')</if>
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.java View file @ a99c138
  1 +package com.lyms.hospital.dao.woman;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import org.springframework.stereotype.Repository;
  7 +
  8 +import com.baomidou.mybatisplus.mapper.BaseMapper;
  9 +import com.baomidou.mybatisplus.plugins.pagination.Pagination;
  10 +import com.lyms.hospital.entity.woman.WomanFolicAcid;
  11 +/**
  12 + * <p>
  13 + * Mapper接口
  14 + * </p>
  15 + *
  16 + * @author xujiahong
  17 + * @since 2017-04-17
  18 + */
  19 +@Repository
  20 +public interface WomanFolicAcidMapper extends BaseMapper<WomanFolicAcid> {
  21 +
  22 + public Integer deleteLogicById(Serializable id);
  23 +
  24 + public List<WomanFolicAcid> pageOfFolicAcid(Pagination page, WomanFolicAcid query);
  25 +
  26 +}
parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.xml View file @ a99c138
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.lyms.hospital.dao.woman.WomanFolicAcidMapper">
  4 +
  5 + <!-- 通用查询映射结果 -->
  6 + <resultMap id="BaseResultMap" type="com.lyms.hospital.entity.woman.WomanFolicAcid">
  7 + <id column="ID" property="id" />
  8 + <result column="WOMAN_PERSON_ID" property="womanPersonId" />
  9 + <result column="WOMAN_NAME" property="womanName" />
  10 + <result column="WOMAN_PAPERS_TYPE" property="womanPapersType" />
  11 + <result column="WOMAN_PAPERS_NUM" property="womanPapersNum" />
  12 + <result column="WOMAN_BIRTHDAY" property="womanBirthday" />
  13 + <result column="WOMAN_CONTACT_WAY" property="womanContactWay" />
  14 + <result column="RECEIVE_NUM" property="receiveNum" />
  15 + <result column="RECEIVE_WEEK_TYPE" property="receiveWeekType" />
  16 + <result column="RECEIVE_WEEK" property="receiveWeek" />
  17 + <result column="HIGHRISK" property="highrisk" />
  18 + <result column="ORG_ID" property="orgId" />
  19 + <result column="DOCTOR_ID" property="doctorId" />
  20 + <result column="RECEIVE_TIME" property="receiveTime" />
  21 + <result column="CREATE_TIME" property="createTime" />
  22 + <result column="IF_DEL" property="ifDel" />
  23 + </resultMap>
  24 +
  25 + <!-- 通用查询结果列 -->
  26 + <sql id="Base_Column_List">
  27 + ID AS id, WOMAN_PERSON_ID AS womanPersonId, WOMAN_NAME AS womanName, WOMAN_PAPERS_TYPE AS womanPapersType, WOMAN_PAPERS_NUM AS womanPapersNum, WOMAN_BIRTHDAY AS womanBirthday, WOMAN_CONTACT_WAY AS womanContactWay, RECEIVE_NUM AS receiveNum, RECEIVE_WEEK_TYPE AS receiveWeekType, RECEIVE_WEEK AS receiveWeek, HIGHRISK AS highrisk, ORG_ID AS orgId, DOCTOR_ID AS doctorId, RECEIVE_TIME AS receiveTime, CREATE_TIME AS createTime, IF_DEL AS ifDel
  28 + </sql>
  29 +</mapper>
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java View file @ a99c138
... ... @@ -17,6 +17,11 @@
17 17 public class DiagnoseAssit implements Serializable {
18 18  
19 19 private static final long serialVersionUID = 1L;
  20 +
  21 + //诊断类型：1婚前检查，2产检，3儿保检查
  22 + public static final int DIAGNOSE_TYPE_MARRY = 1;
  23 + public static final int DIAGNOSE_TYPE_BIRTH = 2;
  24 + public static final int DIAGNOSE_TYPE_CHILD = 3;
20 25  
21 26 /**
22 27 * （辅助检查）
... ... @@ -29,7 +34,7 @@
29 34 @TableField(value="DIAGNOSE_ID")
30 35 private String diagnoseId;
31 36 /**
32   - * 诊断类型：1婚前检查，2产检
  37 + * 诊断类型：1婚前检查，2产检，3儿保检查
33 38 */
34 39 @TableField(value="DIAGNOSE_TYPE")
35 40 private Integer diagnoseType;
36 41  
... ... @@ -208,8 +213,18 @@
208 213 */
209 214 @TableField(value="IMAGE_XT")
210 215 private String imageXt;
  216 + /**
  217 + * 骨密度Z值（儿保）
  218 + */
  219 + @TableField(value="CHILD_BONEZ")
  220 + private String childBonez;
  221 + /**
  222 + * 髋关节检查（儿保）
  223 + */
  224 + @TableField(value="CHILD_KGJ")
  225 + private String childKgj;
  226 +
211 227  
212   -
213 228 public String getId() {
214 229 return id;
215 230 }
... ... @@ -513,6 +528,23 @@
513 528 public void setImageXt(String imageXt) {
514 529 this.imageXt = imageXt;
515 530 }
  531 +
  532 + public String getChildBonez() {
  533 + return childBonez;
  534 + }
  535 +
  536 + public void setChildBonez(String childBonez) {
  537 + this.childBonez = childBonez;
  538 + }
  539 +
  540 + public String getChildKgj() {
  541 + return childKgj;
  542 + }
  543 +
  544 + public void setChildKgj(String childKgj) {
  545 + this.childKgj = childKgj;
  546 + }
  547 +
516 548  
517 549 }
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospital.java View file @ a99c138
... ... @@ -19,6 +19,10 @@
19 19 public class HighriskChangeHospital implements Serializable {
20 20  
21 21 private static final long serialVersionUID = 1L;
  22 + public static final int QUERY_FLAG_OUT = 1;
  23 + public static final int QUERY_FLAG_INTO = 2;
  24 +
  25 + private int queryFlag;//查询标识：1转出，2转入
22 26  
23 27 /**
24 28 *
25 29  
26 30  
27 31  
28 32  
... ... @@ -26,17 +30,22 @@
26 30 @TableId(value="ID")
27 31 private String id;
28 32 /**
29   - *
  33 + * 目标类型：1孕妇，2儿童
30 34 */
31   - @TableField(value="WOMAN_ID")
32   - private String womanId;
  35 + @TableField(value="TARGET_TYPE")
  36 + private Integer targetType;
33 37 /**
34   - *
  38 + * 孕妇ID或儿童ID
35 39 */
  40 + @TableField(value="TARGET_ID")
  41 + private String targetId;
  42 + /**
  43 + * 转出医院ID
  44 + */
36 45 @TableField(value="OUT_ORGID")
37 46 private String outOrgid;
38 47 /**
39   - *
  48 + * 转入医院ID
40 49 */
41 50 @TableField(value="INTO_ORGID")
42 51 private String intoOrgid;
... ... @@ -85,6 +94,11 @@
85 94 */
86 95 @TableField(value="RECEIVE_TIME")
87 96 private Date receiveTime;
  97 + /**
  98 + * 接收医生
  99 + */
  100 + @TableField(value="RECEIVE_DOCTORID")
  101 + private String receiveDoctorid;
88 102  
89 103  
90 104 public String getId() {
... ... @@ -95,14 +109,6 @@
95 109 this.id = id;
96 110 }
97 111  
98   - public String getWomanId() {
99   - return womanId;
100   - }
101   -
102   - public void setWomanId(String womanId) {
103   - this.womanId = womanId;
104   - }
105   -
106 112 public String getOutOrgid() {
107 113 return outOrgid;
108 114 }
... ... @@ -189,6 +195,29 @@
189 195  
190 196 public void setReceiveTime(Date receiveTime) {
191 197 this.receiveTime = receiveTime;
  198 + }
  199 +
  200 + public Integer getTargetType() {
  201 + return targetType;
  202 + }
  203 +
  204 + public void setTargetType(Integer targetType) {
  205 + this.targetType = targetType;
  206 + }
  207 +
  208 + public String getTargetId() {
  209 + return targetId;
  210 + }
  211 +
  212 + public void setTargetId(String targetId) {
  213 + this.targetId = targetId;
  214 + }
  215 +
  216 + public int getQueryFlag() {
  217 + return queryFlag;
  218 + }
  219 + public void setQueryFlag(int queryFlag) {
  220 + this.queryFlag = queryFlag;
192 221 }
193 222  
194 223 }
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalChildVo.java View file @ a99c138
  1 +package com.lyms.hospital.entity.changehospital;
  2 +
  3 +import java.util.Date;
  4 +
  5 +public class HighriskChangeHospitalChildVo extends HighriskChangeHospital {
  6 +
  7 + private static final long serialVersionUID = 1L;
  8 +
  9 + //children_person
  10 + private String childId;//儿童ID
  11 + private String childName;//儿童姓名
  12 + private Integer gender;//性别
  13 + private Integer monthAge;//实际月龄
  14 + private Date birthday;//出生日期
  15 + private String baseWomanName;//孕妇名称
  16 + private String contactWomanWay;//孕妇联联系方式
  17 + private String outOrgName;//转出医院名称
  18 + private String intoOrgName;//转入医院名称
  19 +
  20 + //other
  21 + private String highriskInfo;//高危诊断（文本）
  22 + private Integer changeMonthAge;//转诊月龄
  23 +
  24 + //from parent
  25 + //转出医院
  26 + //转院必要性
  27 + //转诊日期
  28 + //接收日期
  29 + //接收医生
  30 + //状态
  31 +
  32 +
  33 + public String getChildId() {
  34 + return childId;
  35 + }
  36 + public void setChildId(String childId) {
  37 + this.childId = childId;
  38 + }
  39 + public String getChildName() {
  40 + return childName;
  41 + }
  42 + public void setChildName(String childName) {
  43 + this.childName = childName;
  44 + }
  45 + public Integer getGender() {
  46 + return gender;
  47 + }
  48 + public void setGender(Integer gender) {
  49 + this.gender = gender;
  50 + }
  51 + public Integer getMonthAge() {
  52 + return monthAge;
  53 + }
  54 + public void setMonthAge(Integer monthAge) {
  55 + this.monthAge = monthAge;
  56 + }
  57 + public Date getBirthday() {
  58 + return birthday;
  59 + }
  60 + public void setBirthday(Date birthday) {
  61 + this.birthday = birthday;
  62 + }
  63 + public String getHighriskInfo() {
  64 + return highriskInfo;
  65 + }
  66 + public void setHighriskInfo(String highriskInfo) {
  67 + this.highriskInfo = highriskInfo;
  68 + }
  69 + public Integer getChangeMonthAge() {
  70 + return changeMonthAge;
  71 + }
  72 + public void setChangeMonthAge(Integer changeMonthAge) {
  73 + this.changeMonthAge = changeMonthAge;
  74 + }
  75 + public String getBaseWomanName() {
  76 + return baseWomanName;
  77 + }
  78 + public void setBaseWomanName(String baseWomanName) {
  79 + this.baseWomanName = baseWomanName;
  80 + }
  81 + public String getContactWomanWay() {
  82 + return contactWomanWay;
  83 + }
  84 + public void setContactWomanWay(String contactWomanWay) {
  85 + this.contactWomanWay = contactWomanWay;
  86 + }
  87 + public String getOutOrgName() {
  88 + return outOrgName;
  89 + }
  90 + public void setOutOrgName(String outOrgName) {
  91 + this.outOrgName = outOrgName;
  92 + }
  93 + public String getIntoOrgName() {
  94 + return intoOrgName;
  95 + }
  96 + public void setIntoOrgName(String intoOrgName) {
  97 + this.intoOrgName = intoOrgName;
  98 + }
  99 +
  100 +}
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalVo.java View file @ a99c138
1   -package com.lyms.hospital.entity.changehospital;
2   -
3   -import java.util.Date;
4   -/**
5   - * 转诊信息业务实体
6   - * @author xujiahong
7   - *
8   - */
9   -public class HighriskChangeHospitalVo extends HighriskChangeHospital {
10   -
11   - private static final long serialVersionUID = 1L;
12   -
13   - private String baseWomanName;//孕妇名称
14   - private Date baseWomanBirth;//孕妇生日
15   - private String contactWomanWay;//孕妇联联系方式
16   - private String outOrgName;//转出医院名称
17   - private String intoOrgName;//转入医院名称
18   -
19   - public String getBaseWomanName() {
20   - return baseWomanName;
21   - }
22   - public void setBaseWomanName(String baseWomanName) {
23   - this.baseWomanName = baseWomanName;
24   - }
25   - public Date getBaseWomanBirth() {
26   - return baseWomanBirth;
27   - }
28   - public void setBaseWomanBirth(Date baseWomanBirth) {
29   - this.baseWomanBirth = baseWomanBirth;
30   - }
31   - public String getContactWomanWay() {
32   - return contactWomanWay;
33   - }
34   - public void setContactWomanWay(String contactWomanWay) {
35   - this.contactWomanWay = contactWomanWay;
36   - }
37   - public String getOutOrgName() {
38   - return outOrgName;
39   - }
40   - public void setOutOrgName(String outOrgName) {
41   - this.outOrgName = outOrgName;
42   - }
43   - public String getIntoOrgName() {
44   - return intoOrgName;
45   - }
46   - public void setIntoOrgName(String intoOrgName) {
47   - this.intoOrgName = intoOrgName;
48   - }
49   -
50   -}
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalWomanVo.java View file @ a99c138
  1 +package com.lyms.hospital.entity.changehospital;
  2 +
  3 +import java.util.Date;
  4 +/**
  5 + * 孕妇转诊-业务实体
  6 + * @author xujiahong
  7 + *
  8 + */
  9 +public class HighriskChangeHospitalWomanVo extends HighriskChangeHospital {
  10 +
  11 + private static final long serialVersionUID = 1L;
  12 +
  13 + private String baseWomanName;//孕妇名称
  14 + private Date baseWomanBirth;//孕妇生日
  15 + private String contactWomanWay;//孕妇联联系方式
  16 + private String outOrgName;//转出医院名称
  17 + private String intoOrgName;//转入医院名称
  18 +
  19 +
  20 +
  21 + public String getBaseWomanName() {
  22 + return baseWomanName;
  23 + }
  24 + public void setBaseWomanName(String baseWomanName) {
  25 + this.baseWomanName = baseWomanName;
  26 + }
  27 + public Date getBaseWomanBirth() {
  28 + return baseWomanBirth;
  29 + }
  30 + public void setBaseWomanBirth(Date baseWomanBirth) {
  31 + this.baseWomanBirth = baseWomanBirth;
  32 + }
  33 + public String getContactWomanWay() {
  34 + return contactWomanWay;
  35 + }
  36 + public void setContactWomanWay(String contactWomanWay) {
  37 + this.contactWomanWay = contactWomanWay;
  38 + }
  39 + public String getOutOrgName() {
  40 + return outOrgName;
  41 + }
  42 + public void setOutOrgName(String outOrgName) {
  43 + this.outOrgName = outOrgName;
  44 + }
  45 + public String getIntoOrgName() {
  46 + return intoOrgName;
  47 + }
  48 + public void setIntoOrgName(String intoOrgName) {
  49 + this.intoOrgName = intoOrgName;
  50 + }
  51 +
  52 +
  53 +}
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenExamVo.java View file @ a99c138
  1 +package com.lyms.hospital.entity.children;
  2 +
  3 +import com.lyms.hospital.entity.assist.DiagnoseAssit;
  4 +
  5 +/**
  6 + * 儿保检查业务对象
  7 + * @author xujiahong
  8 + *
  9 + */
  10 +public class ChildrenExamVo {
  11 +
  12 + private ChildrenExam exam;//儿保检查基础
  13 + private DiagnoseAssit assist;//辅助检查
  14 +
  15 + public ChildrenExam getExam() {
  16 + return exam;
  17 + }
  18 + public void setExam(ChildrenExam exam) {
  19 + this.exam = exam;
  20 + }
  21 + public DiagnoseAssit getAssist() {
  22 + return assist;
  23 + }
  24 + public void setAssist(DiagnoseAssit assist) {
  25 + this.assist = assist;
  26 + }
  27 +
  28 +
  29 +
  30 +}
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenPerson.java View file @ a99c138
... ... @@ -12,7 +12,7 @@
12 12 * </p>
13 13 *
14 14 * @author xujiahong
15   - * @since 2017-04-12
  15 + * @since 2017-04-13
16 16 */
17 17 @TableName("CHILDREN_PERSON")
18 18 public class ChildrenPerson implements Serializable {
... ... @@ -89,6 +89,64 @@
89 89 */
90 90 @TableField(value="IF_DEL")
91 91 private Integer ifDel;
  92 + /**
  93 + * 母亲姓名
  94 + */
  95 + @TableField(value="BASE_WOMAN_NAME")
  96 + private String baseWomanName;
  97 + /**
  98 + * 母亲证件类型
  99 + */
  100 + @TableField(value="BASE_PAPERS_TYPE")
  101 + private Integer basePapersType;
  102 + /**
  103 + * 母亲证件号
  104 + */
  105 + @TableField(value="BASE_PAPERS_NUMBER")
  106 + private String basePapersNumber;
  107 + /**
  108 + * 母亲出生日期
  109 + */
  110 + @TableField(value="BASE_WOMAN_BIRTH")
  111 + private Date baseWomanBirth;
  112 + /**
  113 + * 母亲联系方式
  114 + */
  115 + @TableField(value="CONTACT_WOMAN_WAY")
  116 + private String contactWomanWay;
  117 + /**
  118 + * 母亲文化程度
  119 + */
  120 + @TableField(value="DEGREE")
  121 + private Integer degree;
  122 + /**
  123 + * 母亲职业类别
  124 + */
  125 + @TableField(value="OCCUPATION")
  126 + private Integer occupation;
  127 +
  128 + //=========查询冗余（需要ResultMap）==============
  129 + //child_exam
  130 + private Date lastExamTime;//最后检查日期 LAST_EXAM_TIME
  131 + private String examDoctorId;//检查医生
  132 + private String examDoctorName;//检查医生名称
  133 + private Date nextTime;//下次预约日期
  134 + //高危等级（预留）
  135 + //child_record
  136 + private Integer serviceType;//服务类型
  137 +
  138 + //=========查询冗余（不需要ResultMap）==============
  139 +
  140 + private String birthDateBegin;//查询-出生日期范围开始
  141 + private String birthDateEnd;//查询-出生日期范围结束
  142 + //月龄转换为出生日期来查询
  143 +// private Integer monthAgeBegin;//查询-当前月龄开始
  144 +// private Integer monthAgeEnd;//查询-当前月龄结束
  145 + private String examDateBegin;//查询-最后检查日期范围开始
  146 + private String examDateEnd;//查询-最后检查日期范围结束
  147 + private String nextDateBegin;//查询-下次预约日期范围开始
  148 + private String nextDateEnd;//查询-下次预约日期范围结束
  149 + private String queryFlag;//查询号（母亲证件号/姓名/联系方式/母亲姓名）
92 150  
93 151 public String getId() {
94 152 return id;
... ... @@ -200,6 +258,174 @@
200 258  
201 259 public void setIfDel(Integer ifDel) {
202 260 this.ifDel = ifDel;
  261 + }
  262 +
  263 + public String getBaseWomanName() {
  264 + return baseWomanName;
  265 + }
  266 +
  267 + public void setBaseWomanName(String baseWomanName) {
  268 + this.baseWomanName = baseWomanName;
  269 + }
  270 +
  271 + public Integer getBasePapersType() {
  272 + return basePapersType;
  273 + }
  274 +
  275 + public void setBasePapersType(Integer basePapersType) {
  276 + this.basePapersType = basePapersType;
  277 + }
  278 +
  279 + public String getBasePapersNumber() {
  280 + return basePapersNumber;
  281 + }
  282 +
  283 + public void setBasePapersNumber(String basePapersNumber) {
  284 + this.basePapersNumber = basePapersNumber;
  285 + }
  286 +
  287 + public Date getBaseWomanBirth() {
  288 + return baseWomanBirth;
  289 + }
  290 +
  291 + public void setBaseWomanBirth(Date baseWomanBirth) {
  292 + this.baseWomanBirth = baseWomanBirth;
  293 + }
  294 +
  295 + public String getContactWomanWay() {
  296 + return contactWomanWay;
  297 + }
  298 +
  299 + public void setContactWomanWay(String contactWomanWay) {
  300 + this.contactWomanWay = contactWomanWay;
  301 + }
  302 +
  303 + public Integer getDegree() {
  304 + return degree;
  305 + }
  306 +
  307 + public void setDegree(Integer degree) {
  308 + this.degree = degree;
  309 + }
  310 +
  311 + public Integer getOccupation() {
  312 + return occupation;
  313 + }
  314 +
  315 + public void setOccupation(Integer occupation) {
  316 + this.occupation = occupation;
  317 + }
  318 +
  319 + public Date getLastExamTime() {
  320 + return lastExamTime;
  321 + }
  322 +
  323 + public void setLastExamTime(Date lastExamTime) {
  324 + this.lastExamTime = lastExamTime;
  325 + }
  326 +
  327 + public String getExamDoctorId() {
  328 + return examDoctorId;
  329 + }
  330 +
  331 + public void setExamDoctorId(String examDoctorId) {
  332 + this.examDoctorId = examDoctorId;
  333 + }
  334 +
  335 + public String getExamDoctorName() {
  336 + return examDoctorName;
  337 + }
  338 +
  339 + public void setExamDoctorName(String examDoctorName) {
  340 + this.examDoctorName = examDoctorName;
  341 + }
  342 +
  343 + public Date getNextTime() {
  344 + return nextTime;
  345 + }
  346 +
  347 + public void setNextTime(Date nextTime) {
  348 + this.nextTime = nextTime;
  349 + }
  350 +
  351 + public Integer getServiceType() {
  352 + return serviceType;
  353 + }
  354 +
  355 + public void setServiceType(Integer serviceType) {
  356 + this.serviceType = serviceType;
  357 + }
  358 +
  359 + public String getBirthDateBegin() {
  360 + return birthDateBegin;
  361 + }
  362 +
  363 + public void setBirthDateBegin(String birthDateBegin) {
  364 + this.birthDateBegin = birthDateBegin;
  365 + }
  366 +
  367 + public String getBirthDateEnd() {
  368 + return birthDateEnd;
  369 + }
  370 +
  371 + public void setBirthDateEnd(String birthDateEnd) {
  372 + this.birthDateEnd = birthDateEnd;
  373 + }
  374 +
  375 +// public Integer getMonthAgeBegin() {
  376 +// return monthAgeBegin;
  377 +// }
  378 +//
  379 +// public void setMonthAgeBegin(Integer monthAgeBegin) {
  380 +// this.monthAgeBegin = monthAgeBegin;
  381 +// }
  382 +//
  383 +// public Integer getMonthAgeEnd() {
  384 +// return monthAgeEnd;
  385 +// }
  386 +//
  387 +// public void setMonthAgeEnd(Integer monthAgeEnd) {
  388 +// this.monthAgeEnd = monthAgeEnd;
  389 +// }
  390 +
  391 + public String getExamDateBegin() {
  392 + return examDateBegin;
  393 + }
  394 +
  395 + public void setExamDateBegin(String examDateBegin) {
  396 + this.examDateBegin = examDateBegin;
  397 + }
  398 +
  399 + public String getExamDateEnd() {
  400 + return examDateEnd;
  401 + }
  402 +
  403 + public void setExamDateEnd(String examDateEnd) {
  404 + this.examDateEnd = examDateEnd;
  405 + }
  406 +
  407 + public String getNextDateBegin() {
  408 + return nextDateBegin;
  409 + }
  410 +
  411 + public void setNextDateBegin(String nextDateBegin) {
  412 + this.nextDateBegin = nextDateBegin;
  413 + }
  414 +
  415 + public String getNextDateEnd() {
  416 + return nextDateEnd;
  417 + }
  418 +
  419 + public void setNextDateEnd(String nextDateEnd) {
  420 + this.nextDateEnd = nextDateEnd;
  421 + }
  422 +
  423 + public String getQueryFlag() {
  424 + return queryFlag;
  425 + }
  426 +
  427 + public void setQueryFlag(String queryFlag) {
  428 + this.queryFlag = queryFlag;
203 429 }
204 430  
205 431  
parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFolicAcid.java View file @ a99c138
  1 +package com.lyms.hospital.entity.woman;
  2 +
  3 +import com.baomidou.mybatisplus.annotations.TableId;
  4 +import com.baomidou.mybatisplus.annotations.TableField;
  5 +import com.baomidou.mybatisplus.annotations.TableName;
  6 +import java.io.Serializable;
  7 +import java.util.Date;
  8 +
  9 +/**
  10 + * <p>
  11 + *
  12 + * </p>
  13 + *
  14 + * @author xujiahong
  15 + * @since 2017-04-17
  16 + */
  17 +@TableName("WOMAN_FOLIC_ACID")
  18 +public class WomanFolicAcid implements Serializable {
  19 +
  20 + private static final long serialVersionUID = 1L;
  21 +
  22 + /**
  23 + * ID（叶酸发放表）
  24 + */
  25 + @TableId(value="ID")
  26 + private String id;
  27 + /**
  28 + * 女性居民ID
  29 + */
  30 + @TableField(value="WOMAN_PERSON_ID")
  31 + private String womanPersonId;
  32 + /**
  33 + * 妇女姓名
  34 + */
  35 + @TableField(value="WOMAN_NAME")
  36 + private String womanName;
  37 + /**
  38 + * 证件类型
  39 + */
  40 + @TableField(value="WOMAN_PAPERS_TYPE")
  41 + private String womanPapersType;
  42 + /**
  43 + * 证件号
  44 + */
  45 + @TableField(value="WOMAN_PAPERS_NUM")
  46 + private String womanPapersNum;
  47 + /**
  48 + * 出生日期
  49 + */
  50 + @TableField(value="WOMAN_BIRTHDAY")
  51 + private Date womanBirthday;
  52 + /**
  53 + * 联系方式
  54 + */
  55 + @TableField(value="WOMAN_CONTACT_WAY")
  56 + private String womanContactWay;
  57 + /**
  58 + * 领取数量
  59 + */
  60 + @TableField(value="RECEIVE_NUM")
  61 + private Integer receiveNum;
  62 + /**
  63 + * 领取孕周类型：1孕前，2孕周
  64 + */
  65 + @TableField(value="RECEIVE_WEEK_TYPE")
  66 + private Integer receiveWeekType;
  67 + /**
  68 + * 具体领取孕周（0~42）
  69 + */
  70 + @TableField(value="RECEIVE_WEEK")
  71 + private Integer receiveWeek;
  72 + /**
  73 + * 高危风险
  74 + */
  75 + @TableField(value="HIGHRISK")
  76 + private String highrisk;
  77 + /**
  78 + * 发放单位
  79 + */
  80 + @TableField(value="ORG_ID")
  81 + private String orgId;
  82 + /**
  83 + * 发放医生
  84 + */
  85 + @TableField(value="DOCTOR_ID")
  86 + private String doctorId;
  87 + /**
  88 + * 领取日期
  89 + */
  90 + @TableField(value="RECEIVE_TIME")
  91 + private Date receiveTime;
  92 + /**
  93 + * 创建时间
  94 + */
  95 + @TableField(value="CREATE_TIME")
  96 + private Date createTime;
  97 + /**
  98 + * 逻辑删除标识
  99 + */
  100 + @TableField(value="IF_DEL")
  101 + private Integer ifDel;
  102 +
  103 + //======查询冗余======
  104 + private String queryDateBegin;//查询-领取日期范围开始
  105 + private String queryDateEnd;//查询-领取日期范围结束
  106 +
  107 + public String getId() {
  108 + return id;
  109 + }
  110 +
  111 + public void setId(String id) {
  112 + this.id = id;
  113 + }
  114 +
  115 + public String getWomanPersonId() {
  116 + return womanPersonId;
  117 + }
  118 +
  119 + public void setWomanPersonId(String womanPersonId) {
  120 + this.womanPersonId = womanPersonId;
  121 + }
  122 +
  123 + public String getWomanName() {
  124 + return womanName;
  125 + }
  126 +
  127 + public void setWomanName(String womanName) {
  128 + this.womanName = womanName;
  129 + }
  130 +
  131 + public String getWomanPapersType() {
  132 + return womanPapersType;
  133 + }
  134 +
  135 + public void setWomanPapersType(String womanPapersType) {
  136 + this.womanPapersType = womanPapersType;
  137 + }
  138 +
  139 + public String getWomanPapersNum() {
  140 + return womanPapersNum;
  141 + }
  142 +
  143 + public void setWomanPapersNum(String womanPapersNum) {
  144 + this.womanPapersNum = womanPapersNum;
  145 + }
  146 +
  147 + public Date getWomanBirthday() {
  148 + return womanBirthday;
  149 + }
  150 +
  151 + public void setWomanBirthday(Date womanBirthday) {
  152 + this.womanBirthday = womanBirthday;
  153 + }
  154 +
  155 + public String getWomanContactWay() {
  156 + return womanContactWay;
  157 + }
  158 +
  159 + public void setWomanContactWay(String womanContactWay) {
  160 + this.womanContactWay = womanContactWay;
  161 + }
  162 +
  163 + public Integer getReceiveNum() {
  164 + return receiveNum;
  165 + }
  166 +
  167 + public void setReceiveNum(Integer receiveNum) {
  168 + this.receiveNum = receiveNum;
  169 + }
  170 +
  171 + public Integer getReceiveWeekType() {
  172 + return receiveWeekType;
  173 + }
  174 +
  175 + public void setReceiveWeekType(Integer receiveWeekType) {
  176 + this.receiveWeekType = receiveWeekType;
  177 + }
  178 +
  179 + public Integer getReceiveWeek() {
  180 + return receiveWeek;
  181 + }
  182 +
  183 + public void setReceiveWeek(Integer receiveWeek) {
  184 + this.receiveWeek = receiveWeek;
  185 + }
  186 +
  187 + public String getHighrisk() {
  188 + return highrisk;
  189 + }
  190 +
  191 + public void setHighrisk(String highrisk) {
  192 + this.highrisk = highrisk;
  193 + }
  194 +
  195 + public String getOrgId() {
  196 + return orgId;
  197 + }
  198 +
  199 + public void setOrgId(String orgId) {
  200 + this.orgId = orgId;
  201 + }
  202 +
  203 + public String getDoctorId() {
  204 + return doctorId;
  205 + }
  206 +
  207 + public void setDoctorId(String doctorId) {
  208 + this.doctorId = doctorId;
  209 + }
  210 +
  211 + public Date getReceiveTime() {
  212 + return receiveTime;
  213 + }
  214 +
  215 + public void setReceiveTime(Date receiveTime) {
  216 + this.receiveTime = receiveTime;
  217 + }
  218 +
  219 + public Date getCreateTime() {
  220 + return createTime;
  221 + }
  222 +
  223 + public void setCreateTime(Date createTime) {
  224 + this.createTime = createTime;
  225 + }
  226 +
  227 + public Integer getIfDel() {
  228 + return ifDel;
  229 + }
  230 +
  231 + public void setIfDel(Integer ifDel) {
  232 + this.ifDel = ifDel;
  233 + }
  234 +
  235 + public String getQueryDateBegin() {
  236 + return queryDateBegin;
  237 + }
  238 +
  239 + public void setQueryDateBegin(String queryDateBegin) {
  240 + this.queryDateBegin = queryDateBegin;
  241 + }
  242 +
  243 + public String getQueryDateEnd() {
  244 + return queryDateEnd;
  245 + }
  246 +
  247 + public void setQueryDateEnd(String queryDateEnd) {
  248 + this.queryDateEnd = queryDateEnd;
  249 + }
  250 +
  251 +}
parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/DiagnoseAssitService.java View file @ a99c138
... ... @@ -67,7 +67,19 @@
67 67 * <li>修改人：
68 68 * <li>修改时间：
69 69 */
  70 + @Deprecated
70 71 public DiagnoseAssit getDetailByDiagnoseId(String diagnoseId);
  72 +
  73 + /**
  74 + * <li>@Description:查询-根据诊断信息查询详情
  75 + * <li>@param diagnoseId
  76 + * <li>@return
  77 + * <li>创建人：xujiahong
  78 + * <li>创建时间：2017年3月31日
  79 + * <li>修改人：
  80 + * <li>修改时间：
  81 + */
  82 + public DiagnoseAssit getDetailByDiagnoseInfo(String diagnoseId,Integer diagnoseType);
71 83  
72 84 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/impl/DiagnoseAssitServiceImpl.java View file @ a99c138
... ... @@ -69,5 +69,16 @@
69 69 }
70 70 return CollectionUtils.isEmpty(list)?null:list.get(0);
71 71 }
  72 +
  73 + @Override
  74 + public DiagnoseAssit getDetailByDiagnoseInfo(String diagnoseId, Integer diagnoseType) {
  75 + if(StringUtils.isEmpty(diagnoseId) || diagnoseType==null){
  76 + return null;
  77 + }
  78 + EntityWrapper<DiagnoseAssit> wrapper = new EntityWrapper<>();
  79 + wrapper.eq("DIAGNOSE_ID", diagnoseId);
  80 + wrapper.eq("DIAGNOSE_TYPE", diagnoseType);
  81 + return selectOne(wrapper);
  82 + }
72 83 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java View file @ a99c138
... ... @@ -4,7 +4,8 @@
4 4  
5 5 import com.baomidou.mybatisplus.plugins.Page;
6 6 import com.lyms.hospital.entity.changehospital.HighriskChangeHospital;
7   -import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo;
  7 +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalChildVo;
  8 +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo;
8 9 import com.lyms.web.service.BaseService;
9 10  
10 11 /**
... ... @@ -12,8 +13,10 @@
12 13 * 【高危转诊服务类】
13 14 * 新增“转诊申请单”
14 15 * 查询“转诊申请单”
15   - * 查询“转入”列表
16   - * 查询“转出”列表
  16 + * 设置状态为“已接收”
  17 + *
  18 + * []查询-高危转诊（转出、转入孕妇）
  19 + * []查询-高危转诊（转出、转入儿童）
17 20 * </p>
18 21 *
19 22 * @author xujiahong
20 23  
21 24  
22 25  
... ... @@ -50,30 +53,17 @@
50 53 */
51 54 public HighriskChangeHospital getDetailById(String id);
52 55  
53   - /**
54   - * <li>@Description:查询“转入”列表
55   - * <li>@param orgId
56   - * <li>@return
57   - * <li>创建人：xujiahong
58   - * <li>创建时间：2017年3月30日
59   - * <li>修改人：
60   - * <li>修改时间：
  56 + /*
  57 + * 查询-高危转诊（转出、转入孕妇）
61 58 */
62   - public Page<HighriskChangeHospital> pageOfIn(String orgId,Page<HighriskChangeHospital> page);
  59 + public Page<HighriskChangeHospitalWomanVo> pageOfOutWoman(HighriskChangeHospitalWomanVo vo,Page<HighriskChangeHospitalWomanVo> page);
  60 + public Page<HighriskChangeHospitalWomanVo> pageOfIntoWoman(HighriskChangeHospitalWomanVo vo,Page<HighriskChangeHospitalWomanVo> page);
63 61  
64   - /**
65   - * <li>@Description:查询“转出”列表
66   - * <li>@param orgId
67   - * <li>@return
68   - * <li>创建人：xujiahong
69   - * <li>创建时间：2017年3月30日
70   - * <li>修改人：
71   - * <li>修改时间：
  62 + /*
  63 + * 查询-高危转诊（转出、转入儿童）
72 64 */
73   - public Page<HighriskChangeHospital> pageOfOut(String orgId,Page<HighriskChangeHospital> page);
74   -
75   - public Page<HighriskChangeHospitalVo> pageOfOutVo(HighriskChangeHospitalVo vo,Page<HighriskChangeHospitalVo> page);
76   -
77   -
  65 + public Page<HighriskChangeHospitalChildVo> pageOfOutChild(HighriskChangeHospitalChildVo vo,Page<HighriskChangeHospitalChildVo> page);
  66 + public Page<HighriskChangeHospitalChildVo> pageOfIntoChild(HighriskChangeHospitalChildVo vo,Page<HighriskChangeHospitalChildVo> page);
  67 +
78 68 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java View file @ a99c138
... ... @@ -7,13 +7,13 @@
7 7 import org.springframework.beans.factory.annotation.Autowired;
8 8 import org.springframework.stereotype.Service;
9 9  
10   -import com.baomidou.mybatisplus.mapper.EntityWrapper;
11 10 import com.baomidou.mybatisplus.plugins.Page;
12 11 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
13 12 import com.lyms.exception.SystemException;
14 13 import com.lyms.hospital.dao.changehospital.HighriskChangeHospitalMapper;
15 14 import com.lyms.hospital.entity.changehospital.HighriskChangeHospital;
16   -import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo;
  15 +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalChildVo;
  16 +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo;
17 17 import com.lyms.hospital.enums.HighRiskChangeHospitalStatusEnum;
18 18 import com.lyms.hospital.service.changehospital.HighriskChangeHospitalService;
19 19 import com.lyms.util.StrUtils;
... ... @@ -42,6 +42,9 @@
42 42 if (change == null) {
43 43 throw new SystemException("转诊信息为空");
44 44 }
  45 + if(change.getTargetType()==null){
  46 + throw new SystemException("转诊目标类型为空");//目标类型：1孕妇，2儿童
  47 + }
45 48 /*
46 49 * 初始化
47 50 */
48 51  
49 52  
50 53  
51 54  
52 55  
... ... @@ -63,33 +66,57 @@
63 66 }
64 67  
65 68 @Override
66   - public Page<HighriskChangeHospital> pageOfIn(String orgId, Page<HighriskChangeHospital> page) {
67   - return this.pageOfInOrOut(orgId, "INTO_ORGID",page);
  69 + public Page<HighriskChangeHospitalWomanVo> pageOfOutWoman(HighriskChangeHospitalWomanVo vo,
  70 + Page<HighriskChangeHospitalWomanVo> page) {
  71 + return this.pageOfWoman(vo, page, HighriskChangeHospital.QUERY_FLAG_OUT);
68 72 }
69 73  
70 74 @Override
71   - public Page<HighriskChangeHospital> pageOfOut(String orgId, Page<HighriskChangeHospital> page) {
72   - return this.pageOfInOrOut(orgId, "OUT_ORGID",page);
  75 + public Page<HighriskChangeHospitalWomanVo> pageOfIntoWoman(HighriskChangeHospitalWomanVo vo,
  76 + Page<HighriskChangeHospitalWomanVo> page) {
  77 + return this.pageOfWoman(vo, page, HighriskChangeHospital.QUERY_FLAG_INTO);
73 78 }
74 79  
75   - private Page<HighriskChangeHospital> pageOfInOrOut(String orgId, String flag, Page<HighriskChangeHospital> page) {
76   - List<HighriskChangeHospital> list = baseMapper.selectPage(page,
77   - new EntityWrapper<HighriskChangeHospital>().eq(flag, orgId).orderBy("CREATE_TIME", false));
78   - page.setRecords(list);
79   - return page;
  80 + @Override
  81 + public Page<HighriskChangeHospitalChildVo> pageOfOutChild(HighriskChangeHospitalChildVo vo,
  82 + Page<HighriskChangeHospitalChildVo> page) {
  83 + return this.pageOfChild(vo, page, HighriskChangeHospital.QUERY_FLAG_OUT);
80 84 }
81 85  
82 86 @Override
83   - public Page<HighriskChangeHospitalVo> pageOfOutVo(HighriskChangeHospitalVo vo,
84   - Page<HighriskChangeHospitalVo> page) {
85   - if(vo==null||vo.getOutOrgid()==null){
  87 + public Page<HighriskChangeHospitalChildVo> pageOfIntoChild(HighriskChangeHospitalChildVo vo,
  88 + Page<HighriskChangeHospitalChildVo> page) {
  89 + return this.pageOfChild(vo, page, HighriskChangeHospital.QUERY_FLAG_INTO);
  90 + }
  91 +
  92 + // ========================华丽的分割线（以下是私有方法）========================
  93 +
  94 + /*
  95 + * 查询-高危转诊（转出、转入孕妇）
  96 + */
  97 + private Page<HighriskChangeHospitalWomanVo> pageOfWoman(HighriskChangeHospitalWomanVo vo,
  98 + Page<HighriskChangeHospitalWomanVo> page,int flag) {
  99 + if(vo==null||(vo.getOutOrgid()==null&&vo.getIntoOrgid()==null)){
86 100 throw new SystemException("查询条件【机构ID】不能为空");
87 101 }
88   -
89   - List<HighriskChangeHospitalVo> list = mapper.listOfOutWomanVo(page,vo);
  102 + vo.setQueryFlag(flag);
  103 + List<HighriskChangeHospitalWomanVo> list = mapper.pageOfWoman(page,vo);
90 104 page.setRecords(list);
91 105 return page;
92 106 }
93 107  
  108 + /*
  109 + * 查询-高危转诊（转出、转入儿童）
  110 + */
  111 + private Page<HighriskChangeHospitalChildVo> pageOfChild(HighriskChangeHospitalChildVo vo,
  112 + Page<HighriskChangeHospitalChildVo> page,int flag) {
  113 + if(vo==null||(vo.getOutOrgid()==null&&vo.getIntoOrgid()==null)){
  114 + throw new SystemException("查询条件【机构ID】不能为空");
  115 + }
  116 + vo.setQueryFlag(flag);
  117 + List<HighriskChangeHospitalChildVo> list = mapper.pageOfChild(page,vo);
  118 + page.setRecords(list);
  119 + return page;
  120 + }
94 121 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenExamService.java View file @ a99c138
1 1 package com.lyms.hospital.service.children;
2 2  
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +import java.util.Map;
  6 +
3 7 import com.lyms.hospital.entity.children.ChildrenExam;
  8 +import com.lyms.hospital.entity.children.ChildrenExamVo;
4 9 import com.lyms.web.service.BaseService;
5   -import java.io.Serializable;
6 10  
7 11 /**
8 12 * <p>
9 13 * 服务类
  14 + * []儿保检查基础信息（单表新增、逻辑删除）
10 15 *
11   - * 查询-【某儿童】历史体格检查记录
  16 + * []新增-体格检查VO
  17 + * []修改-体格检查VO
  18 + * []查询-体格检查VO
  19 + * []查询-【某儿童】历史体格检查记录
12 20 * </p>
13 21 *
14 22 * @author xujiahong
... ... @@ -22,6 +30,52 @@
22 30 * <li>@return 大于0修改成功，否则为失败
23 31 */
24 32 public Integer deleteLogicById(Serializable id);
25   -
  33 +
  34 + public String create(ChildrenExam obj);
  35 +
  36 + /**
  37 + * <li>@Description:新增-体格检查VO
  38 + * <li>@param vo
  39 + * <li>@return
  40 + * <li>创建人：xujiahong
  41 + * <li>创建时间：2017年4月13日
  42 + * <li>修改人：
  43 + * <li>修改时间：
  44 + */
  45 + public String createVo(ChildrenExamVo vo);
  46 +
  47 + /**
  48 + * <li>@Description:修改-体格检查VO
  49 + * <li>@param vo
  50 + * <li>@return
  51 + * <li>创建人：xujiahong
  52 + * <li>创建时间：2017年4月13日
  53 + * <li>修改人：
  54 + * <li>修改时间：
  55 + */
  56 + public boolean updateVo(ChildrenExamVo vo);
  57 +
  58 + /**
  59 + * <li>@Description:查询-体格检查VO
  60 + * <li>@param id
  61 + * <li>@return
  62 + * <li>创建人：xujiahong
  63 + * <li>创建时间：2017年4月13日
  64 + * <li>修改人：
  65 + * <li>修改时间：
  66 + */
  67 + public ChildrenExamVo selectVoById(String id);
  68 +
  69 + /**
  70 + * <li>@Description:查询-【某儿童】历史体格检查记录
  71 + * <li>@param child_id
  72 + * <li>@return
  73 + * <li>创建人：xujiahong
  74 + * <li>创建时间：2017年4月13日
  75 + * <li>修改人：
  76 + * <li>修改时间：
  77 + */
  78 + public List<Map<String,Object>> listOfHistoryExam(String childId);
  79 +
26 80 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenPersonService.java View file @ a99c138
1 1 package com.lyms.hospital.service.children;
2 2  
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +
  6 +import com.baomidou.mybatisplus.plugins.Page;
3 7 import com.lyms.hospital.entity.children.ChildrenPerson;
4 8 import com.lyms.hospital.entity.children.ChildrenVo;
  9 +import com.lyms.hospital.entity.woman.WomanPerson;
5 10 import com.lyms.web.service.BaseService;
6   -import java.io.Serializable;
7 11  
8 12 /**
9 13 * <p>
... ... @@ -15,6 +19,9 @@
15 19 * []新增-儿童建档VO
16 20 * []修改-儿童建档VO
17 21 * []查询-儿童建档VO
  22 + *
  23 + * []查询-通过母亲证件信息查询儿童列表
  24 + * []查询-全部儿童管
18 25 * </p>
19 26 *
20 27 * @author xujiahong
... ... @@ -61,6 +68,34 @@
61 68 * <li>修改时间：
62 69 */
63 70 public ChildrenVo selectVoById(String id);
64   -
  71 +
  72 + /**
  73 + * <li>@Description:查询-通过母亲证件信息查询儿童列表
  74 + * <li>@param person
  75 + * <li>@return
  76 + * <li>创建人：xujiahong
  77 + * <li>创建时间：2017年4月13日
  78 + * <li>修改人：
  79 + * <li>修改时间：
  80 + */
  81 + public List<ChildrenPerson> selectChildListByMother(ChildrenPerson person);
  82 +
  83 + /**
  84 + * <li>@Description:查询-全部儿童管理
  85 + * <li>@param page
  86 + * <li>@param obj
  87 + * <li>@return
  88 + * <li>创建人：xujiahong
  89 + * <li>创建时间：2017年4月17日
  90 + * <li>修改人：
  91 + * <li>修改时间：
  92 + */
  93 + public Page<ChildrenPerson> pageOfAllChildren(Page<ChildrenPerson> page,ChildrenPerson obj);
  94 +
  95 + /**
  96 + * 如果，根据传入的【证件类型、证件号】【姓名、联系方式】组合可以找到对应记录，则更新ChildrenPerson对象的motherId
  97 + * 用于：儿童建档、叶酸发放
  98 + */
  99 + public String selectMotherId(WomanPerson w);
65 100 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenExamServiceImpl.java View file @ a99c138
1 1 package com.lyms.hospital.service.children.impl;
2 2  
3   -import com.lyms.hospital.entity.children.ChildrenExam;
  3 +import java.io.Serializable;
  4 +import java.util.List;
  5 +import java.util.Map;
  6 +
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
  9 +import org.springframework.util.StringUtils;
  10 +
  11 +import com.baomidou.mybatisplus.service.impl.ServiceImpl;
  12 +import com.lyms.exception.SystemException;
4 13 import com.lyms.hospital.dao.children.ChildrenExamMapper;
  14 +import com.lyms.hospital.entity.assist.DiagnoseAssit;
  15 +import com.lyms.hospital.entity.children.ChildrenExam;
  16 +import com.lyms.hospital.entity.children.ChildrenExamVo;
  17 +import com.lyms.hospital.enums.IfdelEnum;
  18 +import com.lyms.hospital.service.assist.DiagnoseAssitService;
5 19 import com.lyms.hospital.service.children.ChildrenExamService;
6   -import com.baomidou.mybatisplus.service.impl.ServiceImpl;
7   -import org.springframework.stereotype.Service;
8   -import java.io.Serializable;
  20 +import com.lyms.util.StrUtils;
9 21  
10 22 /**
11 23 * <p>
12 24  
... ... @@ -18,8 +30,79 @@
18 30 @Service
19 31 public class ChildrenExamServiceImpl extends ServiceImpl<ChildrenExamMapper, ChildrenExam> implements ChildrenExamService {
20 32  
  33 + @Autowired
  34 + private DiagnoseAssitService assistService;
  35 +
21 36 public Integer deleteLogicById(Serializable id){
22   - return baseMapper.deleteLogicById(id);
  37 + if(id==null){
  38 + throw new SystemException("输入参数为空");
  39 + }
  40 + ChildrenExam exam = selectById(id);
  41 + return baseMapper.updateById(exam);
  42 + }
  43 +
  44 + @Override
  45 + public String create(ChildrenExam obj) {
  46 + if (obj == null) {
  47 + throw new SystemException("儿保检查信息为空");
  48 + }
  49 + String id = StrUtils.uuid();
  50 + obj.setId(id);
  51 + obj.setIfDel(IfdelEnum.NO.getStatus());
  52 + obj.setCreateTime(new java.util.Date());
  53 + if(obj.getExamTime()==null){
  54 + obj.setExamTime(obj.getCreateTime());
  55 + }
  56 + if (insert(obj)) {
  57 + return id;
  58 + }
  59 + return null;
  60 + }
  61 +
  62 + @Override
  63 + public String createVo(ChildrenExamVo vo) {
  64 + if (vo == null || vo.getExam() == null) {
  65 + throw new SystemException("输入参数为空");
  66 + }
  67 + String exam_id = create(vo.getExam());
  68 + DiagnoseAssit assist = vo.getAssist();
  69 + if(assist!=null){
  70 + assist.setDiagnoseId(exam_id);
  71 + assist.setDiagnoseType(DiagnoseAssit.DIAGNOSE_TYPE_CHILD);//儿保检查-辅助检查
  72 + assistService.create(assist);
  73 + }
  74 + return exam_id;
  75 + }
  76 +
  77 + @Override
  78 + public boolean updateVo(ChildrenExamVo vo) {
  79 + if (vo == null || vo.getExam() == null) {
  80 + throw new SystemException("输入参数为空");
  81 + }
  82 + boolean flag = updateById(vo.getExam());
  83 + flag = flag && assistService.updateById(vo.getAssist());
  84 + return flag;
  85 + }
  86 +
  87 + @Override
  88 + public ChildrenExamVo selectVoById(String id) {
  89 + if(StringUtils.isEmpty(id)){
  90 + throw new SystemException("输入参数为空");
  91 + }
  92 + ChildrenExamVo vo = new ChildrenExamVo();
  93 + ChildrenExam exam = selectById(id);//儿保检查基础
  94 + DiagnoseAssit assist = assistService.getDetailByDiagnoseInfo(id,DiagnoseAssit.DIAGNOSE_TYPE_CHILD);//辅助检查
  95 + vo.setExam(exam);
  96 + vo.setAssist(assist);
  97 + return vo;
  98 + }
  99 +
  100 + @Override
  101 + public List<Map<String, Object>> listOfHistoryExam(String childId) {
  102 + if(StringUtils.isEmpty(childId)){
  103 + throw new SystemException("输入参数为空");
  104 + }
  105 + return this.listOfHistoryExam(childId);
23 106 }
24 107 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenPersonServiceImpl.java View file @ a99c138
1 1 package com.lyms.hospital.service.children.impl;
2 2  
3 3 import java.io.Serializable;
  4 +import java.util.List;
4 5  
5 6 import org.springframework.beans.factory.annotation.Autowired;
6 7 import org.springframework.stereotype.Service;
... ... @@ -8,6 +9,7 @@
8 9 import org.springframework.util.StringUtils;
9 10  
10 11 import com.baomidou.mybatisplus.mapper.EntityWrapper;
  12 +import com.baomidou.mybatisplus.plugins.Page;
11 13 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
12 14 import com.lyms.exception.SystemException;
13 15 import com.lyms.hospital.dao.children.ChildrenPersonMapper;
... ... @@ -41,6 +43,8 @@
41 43 private ChildrenRecordService recordService;
42 44 @Autowired
43 45 private WomanPersonService womanPersonService;
  46 + @Autowired
  47 + private ChildrenPersonMapper childPersonMapper;
44 48  
45 49 @Override
46 50 @Transactional
... ... @@ -98,7 +102,6 @@
98 102 }
99 103 boolean flag = updateById(vo.getPerson()) && fatherService.updateById(vo.getFather())
100 104 && recordService.updateById(vo.getRecord());
101   -
102 105 return flag;
103 106 }
104 107  
105 108  
... ... @@ -117,10 +120,34 @@
117 120 return vo;
118 121 }
119 122  
  123 + @Override
  124 + public List<ChildrenPerson> selectChildListByMother(ChildrenPerson person) {
  125 + if (person==null) {
  126 + throw new SystemException("输入参数为空");
  127 + }
  128 + /*
  129 + * （1）先根据本表母亲信息查询列表1
  130 + * （2）TODO 根据女性居民表匹配出的motherId查询列表2（预留）
  131 + * （3）TODO 取并集返回（预留）
  132 + */
  133 + //（1）先根据本表母亲信息查询列表1
  134 + EntityWrapper<ChildrenPerson> wrapper = new EntityWrapper<>();
  135 + if(person.getBasePapersType()!=null){
  136 + wrapper.eq("BASE_PAPERS_TYPE", person.getBasePapersType());
  137 + }
  138 + if(!StringUtils.isEmpty(person.getBasePapersNumber())){
  139 + wrapper.eq("BASE_PAPERS_NUMBER", person.getBasePapersNumber());
  140 + }
  141 + return baseMapper.selectList(wrapper);
  142 + }
  143 +
120 144 // ==================华丽的分割线（以下是私有方法）========================
121 145  
122   - // 如果，根据传入的【证件类型、证件号】【姓名、联系方式】组合可以找到对应记录，则更新ChildrenPerson对象的motherId
123   - private String selectMotherId(WomanPerson w){
  146 + /*
  147 + * 如果，根据传入的【证件类型、证件号】【姓名、联系方式】组合可以找到对应记录，则更新ChildrenPerson对象的motherId
  148 + * 用于：儿童建档、叶酸发放
  149 + */
  150 + public String selectMotherId(WomanPerson w){
124 151 if(w==null){
125 152 return null;
126 153 }
... ... @@ -144,6 +171,13 @@
144 171 }else{
145 172 return null;
146 173 }
  174 + }
  175 +
  176 + @Override
  177 + public Page<ChildrenPerson> pageOfAllChildren(Page<ChildrenPerson> page, ChildrenPerson obj) {
  178 + List<ChildrenPerson> records = childPersonMapper.pageOfAllChildren(page, obj);
  179 + page.setRecords(records);
  180 + return page;
147 181 }
148 182  
149 183 }
parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFolicAcidService.java View file @ a99c138
  1 +package com.lyms.hospital.service.woman;
  2 +
  3 +import com.baomidou.mybatisplus.plugins.Page;
  4 +import com.lyms.hospital.entity.woman.WomanFolicAcid;
  5 +import com.lyms.web.service.BaseService;
  6 +import java.io.Serializable;
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * <p>
  11 + * 叶酸发放-服务类
  12 + *
  13 + * []逻辑删除-叶酸发放
  14 + * []保存-叶酸发放
  15 + * 修改-叶酸发放
  16 + * []查询-某人历史发放记录
  17 + * 查询-某医院叶酸发放管理列表
  18 + * </p>
  19 + *
  20 + * @author xujiahong
  21 + * @since 2017-04-17
  22 + */
  23 +public interface WomanFolicAcidService extends BaseService<WomanFolicAcid> {
  24 +
  25 + /**
  26 + * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
  27 + * <li>@param id 删除主键id
  28 + * <li>@return 大于0修改成功，否则为失败
  29 + */
  30 + public Integer deleteLogicById(Serializable id);
  31 +
  32 + /**
  33 + * <li>@Description:保存-叶酸发放
  34 + * <li>@param obj
  35 + * <li>@return
  36 + * <li>创建人：xujiahong
  37 + * <li>创建时间：2017年4月17日
  38 + * <li>修改人：
  39 + * <li>修改时间：
  40 + */
  41 + public String create(WomanFolicAcid obj);
  42 +
  43 + /**
  44 + * <li>@Description:查询-某人历史发放记录
  45 + * <li>@param query
  46 + * <li>@return
  47 + * <li>创建人：xujiahong
  48 + * <li>创建时间：2017年4月17日
  49 + * <li>修改人：
  50 + * <li>修改时间：
  51 + */
  52 + public List<WomanFolicAcid> listOfHistoroy(WomanFolicAcid query);
  53 +
  54 + /**
  55 + * <li>@Description:查询-某医院叶酸发放管理列表
  56 + * <li>@param page
  57 + * <li>@param query
  58 + * <li>@return
  59 + * <li>创建人：xujiahong
  60 + * <li>创建时间：2017年4月17日
  61 + * <li>修改人：
  62 + * <li>修改时间：
  63 + */
  64 + public Page<WomanFolicAcid> pageOfFolicAcid(Page<WomanFolicAcid> page,WomanFolicAcid query);
  65 +}
parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFolicAcidServiceImpl.java View file @ a99c138
  1 +package com.lyms.hospital.service.woman.impl;
  2 +
  3 +import java.io.Serializable;
  4 +import java.util.Date;
  5 +import java.util.List;
  6 +
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +import com.baomidou.mybatisplus.mapper.EntityWrapper;
  11 +import com.baomidou.mybatisplus.plugins.Page;
  12 +import com.baomidou.mybatisplus.service.impl.ServiceImpl;
  13 +import com.lyms.exception.SystemException;
  14 +import com.lyms.hospital.dao.woman.WomanFolicAcidMapper;
  15 +import com.lyms.hospital.entity.woman.WomanFolicAcid;
  16 +import com.lyms.hospital.entity.woman.WomanPerson;
  17 +import com.lyms.hospital.enums.IfdelEnum;
  18 +import com.lyms.hospital.service.children.ChildrenPersonService;
  19 +import com.lyms.hospital.service.woman.WomanFolicAcidService;
  20 +import com.lyms.util.StrUtils;
  21 +
  22 +/**
  23 + * <p>
  24 + * 服务实现类
  25 + * </p>
  26 + *
  27 + * @author xujiahong
  28 + * @since 2017-04-17
  29 + */
  30 +@Service
  31 +public class WomanFolicAcidServiceImpl extends ServiceImpl<WomanFolicAcidMapper, WomanFolicAcid> implements WomanFolicAcidService {
  32 +
  33 + @Autowired
  34 + private ChildrenPersonService childrenPersonService;
  35 + @Autowired
  36 + private WomanFolicAcidMapper mapper;
  37 +
  38 + public Integer deleteLogicById(Serializable id){
  39 + WomanFolicAcid entity = selectById(id);
  40 + entity.setIfDel(IfdelEnum.YES.getStatus());
  41 + return baseMapper.updateById(entity);
  42 + }
  43 +
  44 + @Override
  45 + public String create(WomanFolicAcid obj) {
  46 + if (obj == null || obj.getOrgId()==null) {
  47 + throw new SystemException("发放单位不能为空");
  48 + }
  49 + // 如果，根据传入的【证件类型、证件号】【姓名、联系方式】组合可以找到对应记录，则更新WomanFolicAcid 对象的womanPersonId
  50 + WomanPerson woman = new WomanPerson();//母亲基本信息（女性居民表）
  51 + woman.setBasePapersType(obj.getWomanPapersType());
  52 + woman.setBasePapersNumber(obj.getWomanPapersNum());
  53 + woman.setBaseWomanName(obj.getWomanName());
  54 + woman.setContactWomanWay(obj.getWomanContactWay());
  55 + obj.setWomanPersonId(childrenPersonService.selectMotherId(woman));
  56 + //初始化
  57 + String id = StrUtils.uuid();
  58 + obj.setId(id);
  59 + obj.setIfDel(IfdelEnum.NO.getStatus());
  60 + obj.setCreateTime(new Date());
  61 + if(obj.getReceiveTime()==null){//领取日期
  62 + obj.setReceiveTime(new Date());
  63 + }
  64 + if (insert(obj)) {
  65 + return id;
  66 + }
  67 + return null;
  68 + }
  69 +
  70 + @Override
  71 + public List<WomanFolicAcid> listOfHistoroy(WomanFolicAcid query) {
  72 + if(query==null){
  73 + throw new SystemException("查询参数为空");
  74 + }
  75 + EntityWrapper<WomanFolicAcid> wrapper = new EntityWrapper<>();
  76 + if(query.getWomanPersonId()!=null){
  77 + wrapper.eq("WOMAN_PERSON_ID", query.getWomanPersonId());
  78 + }
  79 + if(query.getWomanPapersType()!=null && query.getWomanPapersNum()!=null){
  80 + wrapper.eq("WOMAN_PAPERS_TYPE", query.getWomanPapersType());
  81 + wrapper.eq("WOMAN_PAPERS_NUM", query.getWomanPapersNum());
  82 + }
  83 + return selectList(wrapper);
  84 + }
  85 +
  86 + @Override
  87 + public Page<WomanFolicAcid> pageOfFolicAcid(Page<WomanFolicAcid> page, WomanFolicAcid query) {
  88 + List<WomanFolicAcid> records = mapper.pageOfFolicAcid(page, query);
  89 + page.setRecords(records);
  90 + return page;
  91 + }
  92 +}
parent/hospital.web/src/main/java/com/lyms/hospital/controller/changehospital/HighriskChangeHospitalController.java View file @ a99c138
... ... @@ -6,7 +6,7 @@
6 6 import org.springframework.web.bind.annotation.RestController;
7 7  
8 8 import com.baomidou.mybatisplus.plugins.Page;
9   -import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo;
  9 +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo;
10 10 import com.lyms.hospital.service.changehospital.HighriskChangeHospitalService;
11 11 import com.lyms.hospital.util.AggridUtils;
12 12 import com.lyms.hospital.util.RequestUtil;
13 13  
... ... @@ -32,9 +32,9 @@
32 32 // Page<HighriskChangeHospital> page = service.pageOfOut("1",new
33 33 // Page<HighriskChangeHospital>(1,20));
34 34  
35   - HighriskChangeHospitalVo vo = new HighriskChangeHospitalVo();
  35 + HighriskChangeHospitalWomanVo vo = new HighriskChangeHospitalWomanVo();
36 36 vo.setOutOrgid("2");
37   - Page<HighriskChangeHospitalVo> page = service.pageOfOutVo(vo, new Page<HighriskChangeHospitalVo>(1, 3));
  37 + Page<HighriskChangeHospitalWomanVo> page = service.pageOfOutWoman(vo, new Page<HighriskChangeHospitalWomanVo>(1, 3));
38 38 return AggridUtils.toAggrid(page);
39 39  
40 40 }
parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanFolicAcidController.java View file @ a99c138
  1 +package com.lyms.hospital.controller.woman;
  2 +
  3 +import org.springframework.stereotype.Controller;
  4 +import org.springframework.web.bind.annotation.RequestMapping;
  5 +import com.lyms.web.controller.BaseController;
  6 +
  7 +/**
  8 + * <p>
  9 + * 前端控制器
  10 + * </p>
  11 + *
  12 + * @author xujiahong
  13 + * @since 2017-04-17
  14 + */
  15 +@Controller
  16 +@RequestMapping("/womanFolicAcid")
  17 +public class WomanFolicAcidController extends BaseController {
  18 +
  19 +}
parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java View file @ a99c138
... ... @@ -38,8 +38,8 @@
38 38  
39 39 @Test
40 40 public void list(){
41   - Page<HighriskChangeHospital> page = service.pageOfIn("1", new Page<HighriskChangeHospital>(2,3));
42   - outJson(page);
  41 +// Page<HighriskChangeHospital> page = service.pageOfIn("1", new Page<HighriskChangeHospital>(2,3));
  42 +// outJson(page);
43 43 /*
44 44 cs033012-Thu Mar 30 15:11:38 CST 2017
45 45 cs033017-Thu Mar 30 15:11:38 CST 2017
parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java View file @ a99c138
... ... @@ -48,12 +48,12 @@
48 48  
49 49 // strategy.setInclude(new String[] {
50 50 // "SYS_USERS","SYS_USER_ROLE_MAPS","SYS_ROLES" }); // 需要生成的表
51   - strategy.setInclude(new String[] { "CHILDREN_EXAM"}); // 需要生成的表
  51 + strategy.setInclude(new String[] { "WOMAN_FOLIC_ACID"}); // 需要生成的表
52 52 pc.setParent("com.lyms.hospital");
53 53 // pc.setParent("com.lyms.base.common");
54 54  
55 55 // 加在controller后面
56   - pc.setFunctionName("children"); // com.lyms.hospital.web.controller.sys
  56 + pc.setFunctionName("woman"); // com.lyms.hospital.web.controller.sys
57 57 // pc.setModuleName("sys"); //com.lyms.hospital.sys.controller
58 58 // 加在controller前面
59 59