From a99c138a2188e4caff62667996bb74c855169add Mon Sep 17 00:00:00 2001 From: xujiahong Date: Mon, 17 Apr 2017 17:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=8F=B6=E9=85=B8=E5=8F=91=E6=94=BE=E5=9F=BA?= =?UTF-8?q?=E7=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hospital/dao/assist/DiagnoseAssitMapper.xml | 4 +- .../HighriskChangeHospitalMapper.java | 9 +- .../HighriskChangeHospitalMapper.xml | 63 +++++- .../hospital/dao/children/ChildrenExamMapper.java | 13 ++ .../hospital/dao/children/ChildrenExamMapper.xml | 6 + .../dao/children/ChildrenPersonMapper.java | 22 +- .../hospital/dao/children/ChildrenPersonMapper.xml | 66 +++++- .../hospital/dao/inspect/MarrybeInspectMapper.xml | 3 +- .../hospital/dao/woman/WomanFolicAcidMapper.java | 26 +++ .../hospital/dao/woman/WomanFolicAcidMapper.xml | 29 +++ .../lyms/hospital/entity/assist/DiagnoseAssit.java | 36 ++- .../changehospital/HighriskChangeHospital.java | 55 +++-- .../HighriskChangeHospitalChildVo.java | 100 ++++++++ .../changehospital/HighriskChangeHospitalVo.java | 50 ---- .../HighriskChangeHospitalWomanVo.java | 53 +++++ .../hospital/entity/children/ChildrenExamVo.java | 30 +++ .../hospital/entity/children/ChildrenPerson.java | 228 ++++++++++++++++++- .../lyms/hospital/entity/woman/WomanFolicAcid.java | 251 +++++++++++++++++++++ .../service/assist/DiagnoseAssitService.java | 12 + .../assist/impl/DiagnoseAssitServiceImpl.java | 11 + .../HighriskChangeHospitalService.java | 40 ++-- .../impl/HighriskChangeHospitalServiceImpl.java | 59 +++-- .../service/children/ChildrenExamService.java | 60 ++++- .../service/children/ChildrenPersonService.java | 39 +++- .../children/impl/ChildrenExamServiceImpl.java | 93 +++++++- .../children/impl/ChildrenPersonServiceImpl.java | 40 +++- .../service/woman/WomanFolicAcidService.java | 65 ++++++ .../woman/impl/WomanFolicAcidServiceImpl.java | 92 ++++++++ .../HighriskChangeHospitalController.java | 6 +- .../controller/woman/WomanFolicAcidController.java | 19 ++ .../service/HighriskChangeHospitalTest.java | 4 +- .../mybatisplus/test/generator/MysqlGenerator.java | 4 +- 32 files changed, 1444 insertions(+), 144 deletions(-) create mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.java create mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.xml create mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalChildVo.java delete mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalVo.java create mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalWomanVo.java create mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenExamVo.java create mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFolicAcid.java create mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFolicAcidService.java create mode 100644 parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFolicAcidServiceImpl.java create mode 100644 parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanFolicAcidController.java diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/assist/DiagnoseAssitMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/assist/DiagnoseAssitMapper.xml index c931125..ad1ee24 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/assist/DiagnoseAssitMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/assist/DiagnoseAssitMapper.xml @@ -42,10 +42,12 @@ + + - 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 + 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 diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.java index 118afcd..17f0044 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.java @@ -8,7 +8,8 @@ import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.baomidou.mybatisplus.plugins.pagination.Pagination; import com.lyms.hospital.entity.changehospital.HighriskChangeHospital; -import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalChildVo; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo; /** *

* Mapper接口 @@ -22,8 +23,10 @@ public interface HighriskChangeHospitalMapper extends BaseMapper listOfOutWomanVo(Pagination page,HighriskChangeHospitalVo vo); + //查询-高危转诊（转出、转入孕妇） + public List pageOfWoman(Pagination page,HighriskChangeHospitalWomanVo vo); + //查询-高危转诊（转出、转入儿童） + public List pageOfChild(Pagination page,HighriskChangeHospitalChildVo vo); } \ No newline at end of file diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.xml index d4c5aaa..a908d73 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/changehospital/HighriskChangeHospitalMapper.xml @@ -5,7 +5,8 @@ - + + @@ -17,10 +18,11 @@ + - - + @@ -28,22 +30,67 @@ + + + + + + + + + + + + - 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 + 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 - SELECT chg.*,woman.BASE_WOMAN_NAME,woman.BASE_WOMAN_BIRTH,woman.CONTACT_WOMAN_WAY, outOrg.`NAME` AS outOrgName,intoOrg.`NAME` AS intoOrgName FROM HIGHRISK_CHANGE_HOSPITAL AS chg + INNER JOIN WOMAN_FETATION_RECORD AS woman ON chg.`TARGET_ID`=woman.`ID` + INNER JOIN SYS_ORGANIZATIONS AS outOrg ON chg.OUT_ORGID = outOrg.`ID` + INNER JOIN SYS_ORGANIZATIONS AS intoOrg ON chg.`INTO_ORGID` = intoOrg.`ID` + + and chg.TARGET_TYPE = 1 + + + and chg.OUT_ORGID = #{outOrgid} + + + and chg.`INTO_ORGID` = #{intoOrgid} + + + + + + diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.java index 71a5879..724274b 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.java @@ -4,6 +4,8 @@ import com.lyms.hospital.entity.children.ChildrenExam; import com.baomidou.mybatisplus.mapper.BaseMapper; import org.springframework.stereotype.Repository; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** *

* Mapper接口 @@ -16,5 +18,16 @@ import java.io.Serializable; public interface ChildrenExamMapper extends BaseMapper { public Integer deleteLogicById(Serializable id); + + /** + *

  • @Description:查询-【某儿童】历史体格检查记录 + *
  • @param child_id + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月13日 + *
  • 修改人： + *
  • 修改时间： + */ + public List> listOfHistoryExam(String childId); } \ No newline at end of file diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.xml index 5ebfe65..8ecab33 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenExamMapper.xml @@ -66,4 +66,10 @@ 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 + + diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.java index 6b3340b..36f76be 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.java @@ -1,9 +1,13 @@ package com.lyms.hospital.dao.children; -import com.lyms.hospital.entity.children.ChildrenPerson; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; import java.io.Serializable; +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.plugins.pagination.Pagination; +import com.lyms.hospital.entity.children.ChildrenPerson; /** *

    * Mapper接口 @@ -16,5 +20,17 @@ import java.io.Serializable; public interface ChildrenPersonMapper extends BaseMapper { public Integer deleteLogicById(Serializable id); + + /** + *

  • @Description:查询-全部儿童管理 + *
  • @param page + *
  • @param obj + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月17日 + *
  • 修改人： + *
  • 修改时间： + */ + public List pageOfAllChildren(Pagination page,ChildrenPerson obj); } \ No newline at end of file diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.xml index ddf33eb..5f497d2 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/children/ChildrenPersonMapper.xml @@ -18,10 +18,74 @@ + + + + + + + + + + + + + - 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 + 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 + + diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.xml index 3fc776b..bc0d426 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.xml @@ -121,7 +121,8 @@ and wr.`CONTACT_WOMAN_WAY` like concat('%',#{contactWay},'%') #{queryDateBegin} and i.`INSPECT_DATE` < #{queryDateEnd} + and (i.`INSPECT_DATE` > #{queryDateBegin} or i.`INSPECT_DATE` = #{queryDateBegin}) + and (i.`INSPECT_DATE` < #{queryDateEnd} or i.`INSPECT_DATE` = #{queryDateEnd}) ]]> and i.`MEDICAL_SUGGESTION` like concat('%',#{medicalSuggestion},'%') diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.java new file mode 100644 index 0000000..1157829 --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.java @@ -0,0 +1,26 @@ +package com.lyms.hospital.dao.woman; + +import java.io.Serializable; +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.plugins.pagination.Pagination; +import com.lyms.hospital.entity.woman.WomanFolicAcid; +/** + *

    + * Mapper接口 + *

    + * + * @author xujiahong + * @since 2017-04-17 + */ +@Repository +public interface WomanFolicAcidMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + + public List pageOfFolicAcid(Pagination page, WomanFolicAcid query); + +} \ No newline at end of file diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.xml new file mode 100644 index 0000000..343eeca --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFolicAcidMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java index 1e45034..3be53ab 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/assist/DiagnoseAssit.java @@ -17,6 +17,11 @@ import java.io.Serializable; public class DiagnoseAssit implements Serializable { private static final long serialVersionUID = 1L; + + //诊断类型：1婚前检查，2产检，3儿保检查 + public static final int DIAGNOSE_TYPE_MARRY = 1; + public static final int DIAGNOSE_TYPE_BIRTH = 2; + public static final int DIAGNOSE_TYPE_CHILD = 3; /** * （辅助检查） @@ -29,7 +34,7 @@ public class DiagnoseAssit implements Serializable { @TableField(value="DIAGNOSE_ID") private String diagnoseId; /** - * 诊断类型：1婚前检查，2产检 + * 诊断类型：1婚前检查，2产检，3儿保检查 */ @TableField(value="DIAGNOSE_TYPE") private Integer diagnoseType; @@ -208,7 +213,17 @@ public class DiagnoseAssit implements Serializable { */ @TableField(value="IMAGE_XT") private String imageXt; - + /** + * 骨密度Z值（儿保） + */ + @TableField(value="CHILD_BONEZ") + private String childBonez; + /** + * 髋关节检查（儿保） + */ + @TableField(value="CHILD_KGJ") + private String childKgj; + public String getId() { return id; @@ -514,4 +529,21 @@ public class DiagnoseAssit implements Serializable { this.imageXt = imageXt; } + public String getChildBonez() { + return childBonez; + } + + public void setChildBonez(String childBonez) { + this.childBonez = childBonez; + } + + public String getChildKgj() { + return childKgj; + } + + public void setChildKgj(String childKgj) { + this.childKgj = childKgj; + } + + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospital.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospital.java index a01866b..a6a7537 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospital.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospital.java @@ -19,6 +19,10 @@ import com.baomidou.mybatisplus.annotations.TableName; public class HighriskChangeHospital implements Serializable { private static final long serialVersionUID = 1L; + public static final int QUERY_FLAG_OUT = 1; + public static final int QUERY_FLAG_INTO = 2; + + private int queryFlag;//查询标识：1转出，2转入 /** * @@ -26,17 +30,22 @@ public class HighriskChangeHospital implements Serializable { @TableId(value="ID") private String id; /** - * + * 目标类型：1孕妇，2儿童 */ - @TableField(value="WOMAN_ID") - private String womanId; + @TableField(value="TARGET_TYPE") + private Integer targetType; /** - * + * 孕妇ID或儿童ID + */ + @TableField(value="TARGET_ID") + private String targetId; + /** + * 转出医院ID */ @TableField(value="OUT_ORGID") private String outOrgid; /** - * + * 转入医院ID */ @TableField(value="INTO_ORGID") private String intoOrgid; @@ -85,6 +94,11 @@ public class HighriskChangeHospital implements Serializable { */ @TableField(value="RECEIVE_TIME") private Date receiveTime; + /** + * 接收医生 + */ + @TableField(value="RECEIVE_DOCTORID") + private String receiveDoctorid; public String getId() { @@ -95,14 +109,6 @@ public class HighriskChangeHospital implements Serializable { this.id = id; } - public String getWomanId() { - return womanId; - } - - public void setWomanId(String womanId) { - this.womanId = womanId; - } - public String getOutOrgid() { return outOrgid; } @@ -191,4 +197,27 @@ public class HighriskChangeHospital implements Serializable { this.receiveTime = receiveTime; } + public Integer getTargetType() { + return targetType; + } + + public void setTargetType(Integer targetType) { + this.targetType = targetType; + } + + public String getTargetId() { + return targetId; + } + + public void setTargetId(String targetId) { + this.targetId = targetId; + } + + public int getQueryFlag() { + return queryFlag; + } + public void setQueryFlag(int queryFlag) { + this.queryFlag = queryFlag; + } + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalChildVo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalChildVo.java new file mode 100644 index 0000000..fe6b31c --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalChildVo.java @@ -0,0 +1,100 @@ +package com.lyms.hospital.entity.changehospital; + +import java.util.Date; + +public class HighriskChangeHospitalChildVo extends HighriskChangeHospital { + + private static final long serialVersionUID = 1L; + + //children_person + private String childId;//儿童ID + private String childName;//儿童姓名 + private Integer gender;//性别 + private Integer monthAge;//实际月龄 + private Date birthday;//出生日期 + private String baseWomanName;//孕妇名称 + private String contactWomanWay;//孕妇联联系方式 + private String outOrgName;//转出医院名称 + private String intoOrgName;//转入医院名称 + + //other + private String highriskInfo;//高危诊断（文本） + private Integer changeMonthAge;//转诊月龄 + + //from parent + //转出医院 + //转院必要性 + //转诊日期 + //接收日期 + //接收医生 + //状态 + + + public String getChildId() { + return childId; + } + public void setChildId(String childId) { + this.childId = childId; + } + public String getChildName() { + return childName; + } + public void setChildName(String childName) { + this.childName = childName; + } + public Integer getGender() { + return gender; + } + public void setGender(Integer gender) { + this.gender = gender; + } + public Integer getMonthAge() { + return monthAge; + } + public void setMonthAge(Integer monthAge) { + this.monthAge = monthAge; + } + public Date getBirthday() { + return birthday; + } + public void setBirthday(Date birthday) { + this.birthday = birthday; + } + public String getHighriskInfo() { + return highriskInfo; + } + public void setHighriskInfo(String highriskInfo) { + this.highriskInfo = highriskInfo; + } + public Integer getChangeMonthAge() { + return changeMonthAge; + } + public void setChangeMonthAge(Integer changeMonthAge) { + this.changeMonthAge = changeMonthAge; + } + public String getBaseWomanName() { + return baseWomanName; + } + public void setBaseWomanName(String baseWomanName) { + this.baseWomanName = baseWomanName; + } + public String getContactWomanWay() { + return contactWomanWay; + } + public void setContactWomanWay(String contactWomanWay) { + this.contactWomanWay = contactWomanWay; + } + public String getOutOrgName() { + return outOrgName; + } + public void setOutOrgName(String outOrgName) { + this.outOrgName = outOrgName; + } + public String getIntoOrgName() { + return intoOrgName; + } + public void setIntoOrgName(String intoOrgName) { + this.intoOrgName = intoOrgName; + } + +} diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalVo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalVo.java deleted file mode 100644 index eb1a7b3..0000000 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.lyms.hospital.entity.changehospital; - -import java.util.Date; -/** - * 转诊信息业务实体 - * @author xujiahong - * - */ -public class HighriskChangeHospitalVo extends HighriskChangeHospital { - - private static final long serialVersionUID = 1L; - - private String baseWomanName;//孕妇名称 - private Date baseWomanBirth;//孕妇生日 - private String contactWomanWay;//孕妇联联系方式 - private String outOrgName;//转出医院名称 - private String intoOrgName;//转入医院名称 - - public String getBaseWomanName() { - return baseWomanName; - } - public void setBaseWomanName(String baseWomanName) { - this.baseWomanName = baseWomanName; - } - public Date getBaseWomanBirth() { - return baseWomanBirth; - } - public void setBaseWomanBirth(Date baseWomanBirth) { - this.baseWomanBirth = baseWomanBirth; - } - public String getContactWomanWay() { - return contactWomanWay; - } - public void setContactWomanWay(String contactWomanWay) { - this.contactWomanWay = contactWomanWay; - } - public String getOutOrgName() { - return outOrgName; - } - public void setOutOrgName(String outOrgName) { - this.outOrgName = outOrgName; - } - public String getIntoOrgName() { - return intoOrgName; - } - public void setIntoOrgName(String intoOrgName) { - this.intoOrgName = intoOrgName; - } - -} diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalWomanVo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalWomanVo.java new file mode 100644 index 0000000..f8a055c --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalWomanVo.java @@ -0,0 +1,53 @@ +package com.lyms.hospital.entity.changehospital; + +import java.util.Date; +/** + * 孕妇转诊-业务实体 + * @author xujiahong + * + */ +public class HighriskChangeHospitalWomanVo extends HighriskChangeHospital { + + private static final long serialVersionUID = 1L; + + private String baseWomanName;//孕妇名称 + private Date baseWomanBirth;//孕妇生日 + private String contactWomanWay;//孕妇联联系方式 + private String outOrgName;//转出医院名称 + private String intoOrgName;//转入医院名称 + + + + public String getBaseWomanName() { + return baseWomanName; + } + public void setBaseWomanName(String baseWomanName) { + this.baseWomanName = baseWomanName; + } + public Date getBaseWomanBirth() { + return baseWomanBirth; + } + public void setBaseWomanBirth(Date baseWomanBirth) { + this.baseWomanBirth = baseWomanBirth; + } + public String getContactWomanWay() { + return contactWomanWay; + } + public void setContactWomanWay(String contactWomanWay) { + this.contactWomanWay = contactWomanWay; + } + public String getOutOrgName() { + return outOrgName; + } + public void setOutOrgName(String outOrgName) { + this.outOrgName = outOrgName; + } + public String getIntoOrgName() { + return intoOrgName; + } + public void setIntoOrgName(String intoOrgName) { + this.intoOrgName = intoOrgName; + } + + +} diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenExamVo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenExamVo.java new file mode 100644 index 0000000..a7a1844 --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenExamVo.java @@ -0,0 +1,30 @@ +package com.lyms.hospital.entity.children; + +import com.lyms.hospital.entity.assist.DiagnoseAssit; + +/** + * 儿保检查业务对象 + * @author xujiahong + * + */ +public class ChildrenExamVo { + + private ChildrenExam exam;//儿保检查基础 + private DiagnoseAssit assist;//辅助检查 + + public ChildrenExam getExam() { + return exam; + } + public void setExam(ChildrenExam exam) { + this.exam = exam; + } + public DiagnoseAssit getAssist() { + return assist; + } + public void setAssist(DiagnoseAssit assist) { + this.assist = assist; + } + + + +} diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenPerson.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenPerson.java index 512a04f..ea6b878 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenPerson.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/children/ChildrenPerson.java @@ -12,7 +12,7 @@ import java.util.Date; *

    * * @author xujiahong - * @since 2017-04-12 + * @since 2017-04-13 */ @TableName("CHILDREN_PERSON") public class ChildrenPerson implements Serializable { @@ -89,6 +89,64 @@ public class ChildrenPerson implements Serializable { */ @TableField(value="IF_DEL") private Integer ifDel; + /** + * 母亲姓名 + */ + @TableField(value="BASE_WOMAN_NAME") + private String baseWomanName; + /** + * 母亲证件类型 + */ + @TableField(value="BASE_PAPERS_TYPE") + private Integer basePapersType; + /** + * 母亲证件号 + */ + @TableField(value="BASE_PAPERS_NUMBER") + private String basePapersNumber; + /** + * 母亲出生日期 + */ + @TableField(value="BASE_WOMAN_BIRTH") + private Date baseWomanBirth; + /** + * 母亲联系方式 + */ + @TableField(value="CONTACT_WOMAN_WAY") + private String contactWomanWay; + /** + * 母亲文化程度 + */ + @TableField(value="DEGREE") + private Integer degree; + /** + * 母亲职业类别 + */ + @TableField(value="OCCUPATION") + private Integer occupation; + + //=========查询冗余（需要ResultMap）============== + //child_exam + private Date lastExamTime;//最后检查日期 LAST_EXAM_TIME + private String examDoctorId;//检查医生 + private String examDoctorName;//检查医生名称 + private Date nextTime;//下次预约日期 + //高危等级（预留） + //child_record + private Integer serviceType;//服务类型 + + //=========查询冗余（不需要ResultMap）============== + + private String birthDateBegin;//查询-出生日期范围开始 + private String birthDateEnd;//查询-出生日期范围结束 + //月龄转换为出生日期来查询 +// private Integer monthAgeBegin;//查询-当前月龄开始 +// private Integer monthAgeEnd;//查询-当前月龄结束 + private String examDateBegin;//查询-最后检查日期范围开始 + private String examDateEnd;//查询-最后检查日期范围结束 + private String nextDateBegin;//查询-下次预约日期范围开始 + private String nextDateEnd;//查询-下次预约日期范围结束 + private String queryFlag;//查询号（母亲证件号/姓名/联系方式/母亲姓名） public String getId() { return id; @@ -201,6 +259,174 @@ public class ChildrenPerson implements Serializable { public void setIfDel(Integer ifDel) { this.ifDel = ifDel; } + + public String getBaseWomanName() { + return baseWomanName; + } + + public void setBaseWomanName(String baseWomanName) { + this.baseWomanName = baseWomanName; + } + + public Integer getBasePapersType() { + return basePapersType; + } + + public void setBasePapersType(Integer basePapersType) { + this.basePapersType = basePapersType; + } + + public String getBasePapersNumber() { + return basePapersNumber; + } + + public void setBasePapersNumber(String basePapersNumber) { + this.basePapersNumber = basePapersNumber; + } + + public Date getBaseWomanBirth() { + return baseWomanBirth; + } + + public void setBaseWomanBirth(Date baseWomanBirth) { + this.baseWomanBirth = baseWomanBirth; + } + + public String getContactWomanWay() { + return contactWomanWay; + } + + public void setContactWomanWay(String contactWomanWay) { + this.contactWomanWay = contactWomanWay; + } + + public Integer getDegree() { + return degree; + } + + public void setDegree(Integer degree) { + this.degree = degree; + } + + public Integer getOccupation() { + return occupation; + } + + public void setOccupation(Integer occupation) { + this.occupation = occupation; + } + + public Date getLastExamTime() { + return lastExamTime; + } + + public void setLastExamTime(Date lastExamTime) { + this.lastExamTime = lastExamTime; + } + + public String getExamDoctorId() { + return examDoctorId; + } + + public void setExamDoctorId(String examDoctorId) { + this.examDoctorId = examDoctorId; + } + + public String getExamDoctorName() { + return examDoctorName; + } + + public void setExamDoctorName(String examDoctorName) { + this.examDoctorName = examDoctorName; + } + + public Date getNextTime() { + return nextTime; + } + + public void setNextTime(Date nextTime) { + this.nextTime = nextTime; + } + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + + public String getBirthDateBegin() { + return birthDateBegin; + } + + public void setBirthDateBegin(String birthDateBegin) { + this.birthDateBegin = birthDateBegin; + } + + public String getBirthDateEnd() { + return birthDateEnd; + } + + public void setBirthDateEnd(String birthDateEnd) { + this.birthDateEnd = birthDateEnd; + } + +// public Integer getMonthAgeBegin() { +// return monthAgeBegin; +// } +// +// public void setMonthAgeBegin(Integer monthAgeBegin) { +// this.monthAgeBegin = monthAgeBegin; +// } +// +// public Integer getMonthAgeEnd() { +// return monthAgeEnd; +// } +// +// public void setMonthAgeEnd(Integer monthAgeEnd) { +// this.monthAgeEnd = monthAgeEnd; +// } + + public String getExamDateBegin() { + return examDateBegin; + } + + public void setExamDateBegin(String examDateBegin) { + this.examDateBegin = examDateBegin; + } + + public String getExamDateEnd() { + return examDateEnd; + } + + public void setExamDateEnd(String examDateEnd) { + this.examDateEnd = examDateEnd; + } + + public String getNextDateBegin() { + return nextDateBegin; + } + + public void setNextDateBegin(String nextDateBegin) { + this.nextDateBegin = nextDateBegin; + } + + public String getNextDateEnd() { + return nextDateEnd; + } + + public void setNextDateEnd(String nextDateEnd) { + this.nextDateEnd = nextDateEnd; + } + + public String getQueryFlag() { + return queryFlag; + } + + public void setQueryFlag(String queryFlag) { + this.queryFlag = queryFlag; + } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFolicAcid.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFolicAcid.java new file mode 100644 index 0000000..b42b1e8 --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFolicAcid.java @@ -0,0 +1,251 @@ +package com.lyms.hospital.entity.woman; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; +import java.util.Date; + +/** + *

    + * + *

    + * + * @author xujiahong + * @since 2017-04-17 + */ +@TableName("WOMAN_FOLIC_ACID") +public class WomanFolicAcid implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID（叶酸发放表） + */ + @TableId(value="ID") + private String id; + /** + * 女性居民ID + */ + @TableField(value="WOMAN_PERSON_ID") + private String womanPersonId; + /** + * 妇女姓名 + */ + @TableField(value="WOMAN_NAME") + private String womanName; + /** + * 证件类型 + */ + @TableField(value="WOMAN_PAPERS_TYPE") + private String womanPapersType; + /** + * 证件号 + */ + @TableField(value="WOMAN_PAPERS_NUM") + private String womanPapersNum; + /** + * 出生日期 + */ + @TableField(value="WOMAN_BIRTHDAY") + private Date womanBirthday; + /** + * 联系方式 + */ + @TableField(value="WOMAN_CONTACT_WAY") + private String womanContactWay; + /** + * 领取数量 + */ + @TableField(value="RECEIVE_NUM") + private Integer receiveNum; + /** + * 领取孕周类型：1孕前，2孕周 + */ + @TableField(value="RECEIVE_WEEK_TYPE") + private Integer receiveWeekType; + /** + * 具体领取孕周（0~42） + */ + @TableField(value="RECEIVE_WEEK") + private Integer receiveWeek; + /** + * 高危风险 + */ + @TableField(value="HIGHRISK") + private String highrisk; + /** + * 发放单位 + */ + @TableField(value="ORG_ID") + private String orgId; + /** + * 发放医生 + */ + @TableField(value="DOCTOR_ID") + private String doctorId; + /** + * 领取日期 + */ + @TableField(value="RECEIVE_TIME") + private Date receiveTime; + /** + * 创建时间 + */ + @TableField(value="CREATE_TIME") + private Date createTime; + /** + * 逻辑删除标识 + */ + @TableField(value="IF_DEL") + private Integer ifDel; + + //======查询冗余====== + private String queryDateBegin;//查询-领取日期范围开始 + private String queryDateEnd;//查询-领取日期范围结束 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getWomanPersonId() { + return womanPersonId; + } + + public void setWomanPersonId(String womanPersonId) { + this.womanPersonId = womanPersonId; + } + + public String getWomanName() { + return womanName; + } + + public void setWomanName(String womanName) { + this.womanName = womanName; + } + + public String getWomanPapersType() { + return womanPapersType; + } + + public void setWomanPapersType(String womanPapersType) { + this.womanPapersType = womanPapersType; + } + + public String getWomanPapersNum() { + return womanPapersNum; + } + + public void setWomanPapersNum(String womanPapersNum) { + this.womanPapersNum = womanPapersNum; + } + + public Date getWomanBirthday() { + return womanBirthday; + } + + public void setWomanBirthday(Date womanBirthday) { + this.womanBirthday = womanBirthday; + } + + public String getWomanContactWay() { + return womanContactWay; + } + + public void setWomanContactWay(String womanContactWay) { + this.womanContactWay = womanContactWay; + } + + public Integer getReceiveNum() { + return receiveNum; + } + + public void setReceiveNum(Integer receiveNum) { + this.receiveNum = receiveNum; + } + + public Integer getReceiveWeekType() { + return receiveWeekType; + } + + public void setReceiveWeekType(Integer receiveWeekType) { + this.receiveWeekType = receiveWeekType; + } + + public Integer getReceiveWeek() { + return receiveWeek; + } + + public void setReceiveWeek(Integer receiveWeek) { + this.receiveWeek = receiveWeek; + } + + public String getHighrisk() { + return highrisk; + } + + public void setHighrisk(String highrisk) { + this.highrisk = highrisk; + } + + public String getOrgId() { + return orgId; + } + + public void setOrgId(String orgId) { + this.orgId = orgId; + } + + public String getDoctorId() { + return doctorId; + } + + public void setDoctorId(String doctorId) { + this.doctorId = doctorId; + } + + public Date getReceiveTime() { + return receiveTime; + } + + public void setReceiveTime(Date receiveTime) { + this.receiveTime = receiveTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Integer getIfDel() { + return ifDel; + } + + public void setIfDel(Integer ifDel) { + this.ifDel = ifDel; + } + + public String getQueryDateBegin() { + return queryDateBegin; + } + + public void setQueryDateBegin(String queryDateBegin) { + this.queryDateBegin = queryDateBegin; + } + + public String getQueryDateEnd() { + return queryDateEnd; + } + + public void setQueryDateEnd(String queryDateEnd) { + this.queryDateEnd = queryDateEnd; + } + +} diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/DiagnoseAssitService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/DiagnoseAssitService.java index a5df4f4..8ea99ae 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/DiagnoseAssitService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/DiagnoseAssitService.java @@ -67,6 +67,18 @@ public interface DiagnoseAssitService extends BaseService { *
  • 修改人： *
  • 修改时间： */ + @Deprecated public DiagnoseAssit getDetailByDiagnoseId(String diagnoseId); + + /** + *
  • @Description:查询-根据诊断信息查询详情 + *
  • @param diagnoseId + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年3月31日 + *
  • 修改人： + *
  • 修改时间： + */ + public DiagnoseAssit getDetailByDiagnoseInfo(String diagnoseId,Integer diagnoseType); } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/impl/DiagnoseAssitServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/impl/DiagnoseAssitServiceImpl.java index 46aac84..781d8e1 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/impl/DiagnoseAssitServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/assist/impl/DiagnoseAssitServiceImpl.java @@ -69,4 +69,15 @@ public class DiagnoseAssitServiceImpl extends ServiceImpl wrapper = new EntityWrapper<>(); + wrapper.eq("DIAGNOSE_ID", diagnoseId); + wrapper.eq("DIAGNOSE_TYPE", diagnoseType); + return selectOne(wrapper); + } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java index b123fef..6ddfcf2 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java @@ -4,7 +4,8 @@ import java.io.Serializable; import com.baomidou.mybatisplus.plugins.Page; import com.lyms.hospital.entity.changehospital.HighriskChangeHospital; -import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalChildVo; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo; import com.lyms.web.service.BaseService; /** @@ -12,8 +13,10 @@ import com.lyms.web.service.BaseService; * 【高危转诊服务类】 * 新增“转诊申请单” * 查询“转诊申请单” - * 查询“转入”列表 - * 查询“转出”列表 + * 设置状态为“已接收” + * + * []查询-高危转诊（转出、转入孕妇） + * []查询-高危转诊（转出、转入儿童） *

    * * @author xujiahong @@ -50,29 +53,16 @@ public interface HighriskChangeHospitalService extends BaseService@Description:查询“转入”列表 - *
  • @param orgId - *
  • @return - *
  • 创建人：xujiahong - *
  • 创建时间：2017年3月30日 - *
  • 修改人： - *
  • 修改时间： + /* + * 查询-高危转诊（转出、转入孕妇） */ - public Page pageOfIn(String orgId,Page page); + public Page pageOfOutWoman(HighriskChangeHospitalWomanVo vo,Page page); + public Page pageOfIntoWoman(HighriskChangeHospitalWomanVo vo,Page page); - /** - *
  • @Description:查询“转出”列表 - *
  • @param orgId - *
  • @return - *
  • 创建人：xujiahong - *
  • 创建时间：2017年3月30日 - *
  • 修改人： - *
  • 修改时间： + /* + * 查询-高危转诊（转出、转入儿童） */ - public Page pageOfOut(String orgId,Page page); - - public Page pageOfOutVo(HighriskChangeHospitalVo vo,Page page); - - + public Page pageOfOutChild(HighriskChangeHospitalChildVo vo,Page page); + public Page pageOfIntoChild(HighriskChangeHospitalChildVo vo,Page page); + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java index 179abfd..c7340ac 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java @@ -7,13 +7,13 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.exception.SystemException; import com.lyms.hospital.dao.changehospital.HighriskChangeHospitalMapper; import com.lyms.hospital.entity.changehospital.HighriskChangeHospital; -import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalChildVo; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo; import com.lyms.hospital.enums.HighRiskChangeHospitalStatusEnum; import com.lyms.hospital.service.changehospital.HighriskChangeHospitalService; import com.lyms.util.StrUtils; @@ -42,6 +42,9 @@ public class HighriskChangeHospitalServiceImpl extends ServiceImpl pageOfIn(String orgId, Page page) { - return this.pageOfInOrOut(orgId, "INTO_ORGID",page); + public Page pageOfOutWoman(HighriskChangeHospitalWomanVo vo, + Page page) { + return this.pageOfWoman(vo, page, HighriskChangeHospital.QUERY_FLAG_OUT); } @Override - public Page pageOfOut(String orgId, Page page) { - return this.pageOfInOrOut(orgId, "OUT_ORGID",page); + public Page pageOfIntoWoman(HighriskChangeHospitalWomanVo vo, + Page page) { + return this.pageOfWoman(vo, page, HighriskChangeHospital.QUERY_FLAG_INTO); } - private Page pageOfInOrOut(String orgId, String flag, Page page) { - List list = baseMapper.selectPage(page, - new EntityWrapper().eq(flag, orgId).orderBy("CREATE_TIME", false)); - page.setRecords(list); - return page; + @Override + public Page pageOfOutChild(HighriskChangeHospitalChildVo vo, + Page page) { + return this.pageOfChild(vo, page, HighriskChangeHospital.QUERY_FLAG_OUT); } @Override - public Page pageOfOutVo(HighriskChangeHospitalVo vo, - Page page) { - if(vo==null||vo.getOutOrgid()==null){ + public Page pageOfIntoChild(HighriskChangeHospitalChildVo vo, + Page page) { + return this.pageOfChild(vo, page, HighriskChangeHospital.QUERY_FLAG_INTO); + } + + // ========================华丽的分割线（以下是私有方法）======================== + + /* + * 查询-高危转诊（转出、转入孕妇） + */ + private Page pageOfWoman(HighriskChangeHospitalWomanVo vo, + Page page,int flag) { + if(vo==null||(vo.getOutOrgid()==null&&vo.getIntoOrgid()==null)){ throw new SystemException("查询条件【机构ID】不能为空"); } - - List list = mapper.listOfOutWomanVo(page,vo); + vo.setQueryFlag(flag); + List list = mapper.pageOfWoman(page,vo); page.setRecords(list); return page; } + /* + * 查询-高危转诊（转出、转入儿童） + */ + private Page pageOfChild(HighriskChangeHospitalChildVo vo, + Page page,int flag) { + if(vo==null||(vo.getOutOrgid()==null&&vo.getIntoOrgid()==null)){ + throw new SystemException("查询条件【机构ID】不能为空"); + } + vo.setQueryFlag(flag); + List list = mapper.pageOfChild(page,vo); + page.setRecords(list); + return page; + } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenExamService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenExamService.java index ff4a749..f1f5973 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenExamService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenExamService.java @@ -1,14 +1,22 @@ package com.lyms.hospital.service.children; +import java.io.Serializable; +import java.util.List; +import java.util.Map; + import com.lyms.hospital.entity.children.ChildrenExam; +import com.lyms.hospital.entity.children.ChildrenExamVo; import com.lyms.web.service.BaseService; -import java.io.Serializable; /** *

    * 服务类 + * []儿保检查基础信息（单表新增、逻辑删除） * - * 查询-【某儿童】历史体格检查记录 + * []新增-体格检查VO + * []修改-体格检查VO + * []查询-体格检查VO + * []查询-【某儿童】历史体格检查记录 *

    * * @author xujiahong @@ -22,5 +30,51 @@ public interface ChildrenExamService extends BaseService { *
  • @return 大于0修改成功，否则为失败 */ public Integer deleteLogicById(Serializable id); - + + public String create(ChildrenExam obj); + + /** + *
  • @Description:新增-体格检查VO + *
  • @param vo + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月13日 + *
  • 修改人： + *
  • 修改时间： + */ + public String createVo(ChildrenExamVo vo); + + /** + *
  • @Description:修改-体格检查VO + *
  • @param vo + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月13日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean updateVo(ChildrenExamVo vo); + + /** + *
  • @Description:查询-体格检查VO + *
  • @param id + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月13日 + *
  • 修改人： + *
  • 修改时间： + */ + public ChildrenExamVo selectVoById(String id); + + /** + *
  • @Description:查询-【某儿童】历史体格检查记录 + *
  • @param child_id + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月13日 + *
  • 修改人： + *
  • 修改时间： + */ + public List> listOfHistoryExam(String childId); + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenPersonService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenPersonService.java index 9f124c0..03c24e5 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenPersonService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/ChildrenPersonService.java @@ -1,9 +1,13 @@ package com.lyms.hospital.service.children; +import java.io.Serializable; +import java.util.List; + +import com.baomidou.mybatisplus.plugins.Page; import com.lyms.hospital.entity.children.ChildrenPerson; import com.lyms.hospital.entity.children.ChildrenVo; +import com.lyms.hospital.entity.woman.WomanPerson; import com.lyms.web.service.BaseService; -import java.io.Serializable; /** *

    @@ -15,6 +19,9 @@ import java.io.Serializable; * []新增-儿童建档VO * []修改-儿童建档VO * []查询-儿童建档VO + * + * []查询-通过母亲证件信息查询儿童列表 + * []查询-全部儿童管 *

    * * @author xujiahong @@ -61,5 +68,33 @@ public interface ChildrenPersonService extends BaseService { *
  • 修改时间： */ public ChildrenVo selectVoById(String id); - + + /** + *
  • @Description:查询-通过母亲证件信息查询儿童列表 + *
  • @param person + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月13日 + *
  • 修改人： + *
  • 修改时间： + */ + public List selectChildListByMother(ChildrenPerson person); + + /** + *
  • @Description:查询-全部儿童管理 + *
  • @param page + *
  • @param obj + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月17日 + *
  • 修改人： + *
  • 修改时间： + */ + public Page pageOfAllChildren(Page page,ChildrenPerson obj); + + /** + * 如果，根据传入的【证件类型、证件号】【姓名、联系方式】组合可以找到对应记录，则更新ChildrenPerson对象的motherId + * 用于：儿童建档、叶酸发放 + */ + public String selectMotherId(WomanPerson w); } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenExamServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenExamServiceImpl.java index 4a988f7..cf7d5c8 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenExamServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenExamServiceImpl.java @@ -1,11 +1,23 @@ package com.lyms.hospital.service.children.impl; -import com.lyms.hospital.entity.children.ChildrenExam; +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.exception.SystemException; import com.lyms.hospital.dao.children.ChildrenExamMapper; +import com.lyms.hospital.entity.assist.DiagnoseAssit; +import com.lyms.hospital.entity.children.ChildrenExam; +import com.lyms.hospital.entity.children.ChildrenExamVo; +import com.lyms.hospital.enums.IfdelEnum; +import com.lyms.hospital.service.assist.DiagnoseAssitService; import com.lyms.hospital.service.children.ChildrenExamService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import java.io.Serializable; +import com.lyms.util.StrUtils; /** *

    @@ -18,7 +30,78 @@ import java.io.Serializable; @Service public class ChildrenExamServiceImpl extends ServiceImpl implements ChildrenExamService { + @Autowired + private DiagnoseAssitService assistService; + public Integer deleteLogicById(Serializable id){ - return baseMapper.deleteLogicById(id); + if(id==null){ + throw new SystemException("输入参数为空"); + } + ChildrenExam exam = selectById(id); + return baseMapper.updateById(exam); + } + + @Override + public String create(ChildrenExam obj) { + if (obj == null) { + throw new SystemException("儿保检查信息为空"); + } + String id = StrUtils.uuid(); + obj.setId(id); + obj.setIfDel(IfdelEnum.NO.getStatus()); + obj.setCreateTime(new java.util.Date()); + if(obj.getExamTime()==null){ + obj.setExamTime(obj.getCreateTime()); + } + if (insert(obj)) { + return id; + } + return null; + } + + @Override + public String createVo(ChildrenExamVo vo) { + if (vo == null || vo.getExam() == null) { + throw new SystemException("输入参数为空"); + } + String exam_id = create(vo.getExam()); + DiagnoseAssit assist = vo.getAssist(); + if(assist!=null){ + assist.setDiagnoseId(exam_id); + assist.setDiagnoseType(DiagnoseAssit.DIAGNOSE_TYPE_CHILD);//儿保检查-辅助检查 + assistService.create(assist); + } + return exam_id; + } + + @Override + public boolean updateVo(ChildrenExamVo vo) { + if (vo == null || vo.getExam() == null) { + throw new SystemException("输入参数为空"); + } + boolean flag = updateById(vo.getExam()); + flag = flag && assistService.updateById(vo.getAssist()); + return flag; + } + + @Override + public ChildrenExamVo selectVoById(String id) { + if(StringUtils.isEmpty(id)){ + throw new SystemException("输入参数为空"); + } + ChildrenExamVo vo = new ChildrenExamVo(); + ChildrenExam exam = selectById(id);//儿保检查基础 + DiagnoseAssit assist = assistService.getDetailByDiagnoseInfo(id,DiagnoseAssit.DIAGNOSE_TYPE_CHILD);//辅助检查 + vo.setExam(exam); + vo.setAssist(assist); + return vo; + } + + @Override + public List> listOfHistoryExam(String childId) { + if(StringUtils.isEmpty(childId)){ + throw new SystemException("输入参数为空"); + } + return this.listOfHistoryExam(childId); } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenPersonServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenPersonServiceImpl.java index e77fd1a..cc7d421 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenPersonServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/children/impl/ChildrenPersonServiceImpl.java @@ -1,6 +1,7 @@ package com.lyms.hospital.service.children.impl; import java.io.Serializable; +import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -8,6 +9,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.exception.SystemException; import com.lyms.hospital.dao.children.ChildrenPersonMapper; @@ -41,6 +43,8 @@ public class ChildrenPersonServiceImpl extends ServiceImpl selectChildListByMother(ChildrenPerson person) { + if (person==null) { + throw new SystemException("输入参数为空"); + } + /* + * （1）先根据本表母亲信息查询列表1 + * （2）TODO 根据女性居民表匹配出的motherId查询列表2（预留） + * （3）TODO 取并集返回（预留） + */ + //（1）先根据本表母亲信息查询列表1 + EntityWrapper wrapper = new EntityWrapper<>(); + if(person.getBasePapersType()!=null){ + wrapper.eq("BASE_PAPERS_TYPE", person.getBasePapersType()); + } + if(!StringUtils.isEmpty(person.getBasePapersNumber())){ + wrapper.eq("BASE_PAPERS_NUMBER", person.getBasePapersNumber()); + } + return baseMapper.selectList(wrapper); + } + // ==================华丽的分割线（以下是私有方法）======================== - // 如果，根据传入的【证件类型、证件号】【姓名、联系方式】组合可以找到对应记录，则更新ChildrenPerson对象的motherId - private String selectMotherId(WomanPerson w){ + /* + * 如果，根据传入的【证件类型、证件号】【姓名、联系方式】组合可以找到对应记录，则更新ChildrenPerson对象的motherId + * 用于：儿童建档、叶酸发放 + */ + public String selectMotherId(WomanPerson w){ if(w==null){ return null; } @@ -146,4 +173,11 @@ public class ChildrenPersonServiceImpl extends ServiceImpl pageOfAllChildren(Page page, ChildrenPerson obj) { + List records = childPersonMapper.pageOfAllChildren(page, obj); + page.setRecords(records); + return page; + } + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFolicAcidService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFolicAcidService.java new file mode 100644 index 0000000..699c147 --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFolicAcidService.java @@ -0,0 +1,65 @@ +package com.lyms.hospital.service.woman; + +import com.baomidou.mybatisplus.plugins.Page; +import com.lyms.hospital.entity.woman.WomanFolicAcid; +import com.lyms.web.service.BaseService; +import java.io.Serializable; +import java.util.List; + +/** + *

    + * 叶酸发放-服务类 + * + * []逻辑删除-叶酸发放 + * []保存-叶酸发放 + * 修改-叶酸发放 + * []查询-某人历史发放记录 + * 查询-某医院叶酸发放管理列表 + *

    + * + * @author xujiahong + * @since 2017-04-17 + */ +public interface WomanFolicAcidService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:保存-叶酸发放 + *
  • @param obj + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月17日 + *
  • 修改人： + *
  • 修改时间： + */ + public String create(WomanFolicAcid obj); + + /** + *
  • @Description:查询-某人历史发放记录 + *
  • @param query + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月17日 + *
  • 修改人： + *
  • 修改时间： + */ + public List listOfHistoroy(WomanFolicAcid query); + + /** + *
  • @Description:查询-某医院叶酸发放管理列表 + *
  • @param page + *
  • @param query + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月17日 + *
  • 修改人： + *
  • 修改时间： + */ + public Page pageOfFolicAcid(Page page,WomanFolicAcid query); +} diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFolicAcidServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFolicAcidServiceImpl.java new file mode 100644 index 0000000..fec8560 --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFolicAcidServiceImpl.java @@ -0,0 +1,92 @@ +package com.lyms.hospital.service.woman.impl; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.exception.SystemException; +import com.lyms.hospital.dao.woman.WomanFolicAcidMapper; +import com.lyms.hospital.entity.woman.WomanFolicAcid; +import com.lyms.hospital.entity.woman.WomanPerson; +import com.lyms.hospital.enums.IfdelEnum; +import com.lyms.hospital.service.children.ChildrenPersonService; +import com.lyms.hospital.service.woman.WomanFolicAcidService; +import com.lyms.util.StrUtils; + +/** + *

    + * 服务实现类 + *

    + * + * @author xujiahong + * @since 2017-04-17 + */ +@Service +public class WomanFolicAcidServiceImpl extends ServiceImpl implements WomanFolicAcidService { + + @Autowired + private ChildrenPersonService childrenPersonService; + @Autowired + private WomanFolicAcidMapper mapper; + + public Integer deleteLogicById(Serializable id){ + WomanFolicAcid entity = selectById(id); + entity.setIfDel(IfdelEnum.YES.getStatus()); + return baseMapper.updateById(entity); + } + + @Override + public String create(WomanFolicAcid obj) { + if (obj == null || obj.getOrgId()==null) { + throw new SystemException("发放单位不能为空"); + } + // 如果，根据传入的【证件类型、证件号】【姓名、联系方式】组合可以找到对应记录，则更新WomanFolicAcid 对象的womanPersonId + WomanPerson woman = new WomanPerson();//母亲基本信息（女性居民表） + woman.setBasePapersType(obj.getWomanPapersType()); + woman.setBasePapersNumber(obj.getWomanPapersNum()); + woman.setBaseWomanName(obj.getWomanName()); + woman.setContactWomanWay(obj.getWomanContactWay()); + obj.setWomanPersonId(childrenPersonService.selectMotherId(woman)); + //初始化 + String id = StrUtils.uuid(); + obj.setId(id); + obj.setIfDel(IfdelEnum.NO.getStatus()); + obj.setCreateTime(new Date()); + if(obj.getReceiveTime()==null){//领取日期 + obj.setReceiveTime(new Date()); + } + if (insert(obj)) { + return id; + } + return null; + } + + @Override + public List listOfHistoroy(WomanFolicAcid query) { + if(query==null){ + throw new SystemException("查询参数为空"); + } + EntityWrapper wrapper = new EntityWrapper<>(); + if(query.getWomanPersonId()!=null){ + wrapper.eq("WOMAN_PERSON_ID", query.getWomanPersonId()); + } + if(query.getWomanPapersType()!=null && query.getWomanPapersNum()!=null){ + wrapper.eq("WOMAN_PAPERS_TYPE", query.getWomanPapersType()); + wrapper.eq("WOMAN_PAPERS_NUM", query.getWomanPapersNum()); + } + return selectList(wrapper); + } + + @Override + public Page pageOfFolicAcid(Page page, WomanFolicAcid query) { + List records = mapper.pageOfFolicAcid(page, query); + page.setRecords(records); + return page; + } +} diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/changehospital/HighriskChangeHospitalController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/changehospital/HighriskChangeHospitalController.java index 9ba8aa1..bb0a2a9 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/changehospital/HighriskChangeHospitalController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/changehospital/HighriskChangeHospitalController.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalWomanVo; import com.lyms.hospital.service.changehospital.HighriskChangeHospitalService; import com.lyms.hospital.util.AggridUtils; import com.lyms.hospital.util.RequestUtil; @@ -32,9 +32,9 @@ public class HighriskChangeHospitalController extends BaseController { // Page page = service.pageOfOut("1",new // Page(1,20)); - HighriskChangeHospitalVo vo = new HighriskChangeHospitalVo(); + HighriskChangeHospitalWomanVo vo = new HighriskChangeHospitalWomanVo(); vo.setOutOrgid("2"); - Page page = service.pageOfOutVo(vo, new Page(1, 3)); + Page page = service.pageOfOutWoman(vo, new Page(1, 3)); return AggridUtils.toAggrid(page); } diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanFolicAcidController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanFolicAcidController.java new file mode 100644 index 0000000..359ef89 --- /dev/null +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanFolicAcidController.java @@ -0,0 +1,19 @@ +package com.lyms.hospital.controller.woman; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import com.lyms.web.controller.BaseController; + +/** + *

    + * 前端控制器 + *

    + * + * @author xujiahong + * @since 2017-04-17 + */ +@Controller +@RequestMapping("/womanFolicAcid") +public class WomanFolicAcidController extends BaseController { + +} diff --git a/parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java b/parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java index 08038b5..7a4a368 100644 --- a/parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java +++ b/parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java @@ -38,8 +38,8 @@ public class HighriskChangeHospitalTest extends BaseServiceTest { @Test public void list(){ - Page page = service.pageOfIn("1", new Page(2,3)); - outJson(page); +// Page page = service.pageOfIn("1", new Page(2,3)); +// outJson(page); /* cs033012-Thu Mar 30 15:11:38 CST 2017 cs033017-Thu Mar 30 15:11:38 CST 2017 diff --git a/parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java b/parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java index a2d15f5..633e6e4 100644 --- a/parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java +++ b/parent/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java @@ -48,12 +48,12 @@ public class MysqlGenerator { // strategy.setInclude(new String[] { // "SYS_USERS","SYS_USER_ROLE_MAPS","SYS_ROLES" }); // 需要生成的表 - strategy.setInclude(new String[] { "CHILDREN_EXAM"}); // 需要生成的表 + strategy.setInclude(new String[] { "WOMAN_FOLIC_ACID"}); // 需要生成的表 pc.setParent("com.lyms.hospital"); // pc.setParent("com.lyms.base.common"); // 加在controller后面 - pc.setFunctionName("children"); // com.lyms.hospital.web.controller.sys + pc.setFunctionName("woman"); // com.lyms.hospital.web.controller.sys // pc.setModuleName("sys"); //com.lyms.hospital.sys.controller // 加在controller前面 -- 1.8.3.1