From 6b7b74096fa1729359cbb3fc35fe6df44b407d64 Mon Sep 17 00:00:00 2001 From: xujiahong Date: Mon, 10 Apr 2017 16:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E5=89=8D=E6=A3=80=E6=9F=A5=E7=9B=B8?= =?UTF-8?q?=E5=85=B3Service=EF=BC=8C=E6=A8=A1=E5=9D=97=E5=8C=85=E6=8B=AC?= =?UTF-8?q?=E4=BD=86=E4=B8=8D=E9=99=90=E4=BA=8E=EF=BC=9A=E5=A9=9A=E6=A3=80?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=A1=A8=E3=80=81=E7=94=B7=E6=80=A7=E5=A9=9A?= =?UTF-8?q?=E6=A3=80=E8=A1=A8=E3=80=81=E5=A5=B3=E6=80=A7=E5=A9=9A=E6=A3=80?= =?UTF-8?q?=E8=A1=A8=E3=80=81=E9=85=8D=E5=81=B6=E4=BF=A1=E6=81=AF=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E8=BE=85=E5=8A=A9=E6=A3=80=E6=9F=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HighriskChangeHospitalMapper.java | 15 +- .../HighriskChangeHospitalMapper.xml | 24 +++ .../hospital/dao/inspect/MarrybeInspectMapper.java | 25 +++ .../hospital/dao/inspect/MarrybeInspectMapper.xml | 58 ++++++ .../changehospital/HighriskChangeHospital.java | 10 +- .../changehospital/HighriskChangeHospitalVo.java | 50 ++++++ .../hospital/entity/inspect/InspectListVo.java | 108 ++++++++++++ .../lyms/hospital/entity/inspect/InspectManVo.java | 6 + .../lyms/hospital/entity/inspect/InspectVo.java | 10 ++ .../hospital/entity/inspect/InspectWomanVo.java | 6 + .../lyms/hospital/entity/woman/WomanHusband.java | 5 + .../assist/impl/DiagnoseAssitServiceImpl.java | 6 +- .../HighriskChangeHospitalService.java | 3 + .../impl/HighriskChangeHospitalServiceImpl.java | 17 ++ .../service/inspect/MarrybeInspectManService.java | 16 +- .../service/inspect/MarrybeInspectService.java | 75 ++++++-- .../inspect/MarrybeInspectWomanService.java | 12 ++ .../inspect/impl/MarrybeInspectManServiceImpl.java | 29 ++- .../inspect/impl/MarrybeInspectServiceImpl.java | 196 +++++++++++++++------ .../impl/MarrybeInspectWomanServiceImpl.java | 29 ++- .../service/woman/WomanHusbandService.java | 8 + .../woman/impl/WomanHusbandServiceImpl.java | 14 ++ .../HighriskChangeHospitalController.java | 22 ++- .../test/hospital/service/InsepectServiceTest.java | 40 +++++ 24 files changed, 683 insertions(+), 101 deletions(-) create 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/inspect/InspectListVo.java create mode 100644 parent/hospital.web/src/test/java/test/hospital/service/InsepectServiceTest.java 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 d571249..118afcd 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 @@ -1,9 +1,14 @@ package com.lyms.hospital.dao.changehospital; -import com.lyms.hospital.entity.changehospital.HighriskChangeHospital; -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.changehospital.HighriskChangeHospital; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo; /** *

* Mapper接口 @@ -16,5 +21,9 @@ import java.io.Serializable; public interface HighriskChangeHospitalMapper extends BaseMapper { public Integer deleteLogicById(Serializable id); + + //查询转出孕妇列表（条件筛选、分页、多表关联） + public List listOfOutWomanVo(Pagination page,HighriskChangeHospitalVo 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 fc548b2..d4c5aaa 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 @@ -18,9 +18,33 @@ + + + + + + + + + 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 + + + + + diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.java index 4fd99e1..75c675d 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/inspect/MarrybeInspectMapper.java @@ -1,9 +1,12 @@ package com.lyms.hospital.dao.inspect; +import com.lyms.hospital.entity.inspect.InspectListVo; import com.lyms.hospital.entity.inspect.MarrybeInspect; 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 +19,27 @@ import java.io.Serializable; public interface MarrybeInspectMapper extends BaseMapper { public Integer deleteLogicById(Serializable id); + + /** + *

  • @Description:查询某人历史婚检记录列表（ID，档案ID，婚检日期，建档医院） + *
  • @param archiveId 档案ID + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public List> getPersonalInspectHistoryList(String archiveId); + + /** + *
  • @Description:查询某医院婚检列表（多表关联条件查询） + *
  • @param vo + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public List listOfMarryBeforeInspect(InspectListVo vo); } \ No newline at end of file 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 4236cc3..0f9aba9 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 @@ -66,9 +66,67 @@ + + + + + + + + + + + + + ID AS id, ARCHIVE_ID AS archiveId, INSPECT_DATE AS inspectDate, ORG_ID AS orgId, SPIRIT AS spirit, SPIRIT_TEXT AS spiritText, LANGUAGE AS language, LANGUAGE_TEXT AS languageText, FACE AS face, FACE_TEXT AS faceText, BODY AS body, BODY_TEXT AS bodyText, HEIGHT AS height, WEIGHT AS weight, BLOOD_SHRINK AS bloodShrink, BLOOD_DIASTOLE AS bloodDiastole, SKIN AS skin, SKIN_PZ AS skinPz, SKIN_BH AS skinBh, SKIN_GJYC AS skinGjyc, HAIR AS hair, HAIR_FB AS hairFb, HAIR_COLOR AS hairColor, HAIR_TLBW AS hairTlbw, LIMB AS limb, LIMB_JWS AS limbJws, LIMB_MB AS limbMb, LIMB_JL AS limbJl, LIMB_ZC AS limbZc, LIMB_OTHER AS limbOther, LIMB_OTHER_TEXT AS limbOtherText, SPINE AS spine, SPINE_TEXT AS spineText, LYMPH AS lymph, EYE_LEFT AS eyeLeft, EYE_RIGHT AS eyeRight, EAR_LEFT AS earLeft, EAR_RIGHT AS earRight, DISTINGUISH_COLOR AS distinguishColor, DISTINGUISH_COLOR_TEXT AS distinguishColorText, THYROID AS thyroid, THYROID_TEXT AS thyroidText, CHEST AS chest, CHEST_TEXT AS chestText, LUNG AS lung, LUNG_TEXT AS lungText, HEART_RATE AS heartRate, HEART_RHYTHM AS heartRhythm, NOISE AS noise, NOISE_TEXT AS noiseText, BELLY_LIVER AS bellyLiver, BELLY_SPLEEN AS bellySpleen, BELLY_OTHER AS bellyOther, INSPECT_RESULT AS inspectResult, EXCEPTION_TEXT AS exceptionText, DISEASE_TEXT AS diseaseText, MEDICAL_SUGGESTION AS medicalSuggestion, DOCTOR_SUGGESTION AS doctorSuggestion, DOCTOR_ID AS doctorId, CREATE_TIME AS createTime, IF_DEL AS ifDel + + + + + + + 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 486ceee..a01866b 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 @@ -1,11 +1,12 @@ package com.lyms.hospital.entity.changehospital; -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; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; + /** *

    * 高危转诊 @@ -84,6 +85,7 @@ public class HighriskChangeHospital implements Serializable { */ @TableField(value="RECEIVE_TIME") private Date receiveTime; + public String getId() { return id; @@ -188,7 +190,5 @@ public class HighriskChangeHospital implements Serializable { public void setReceiveTime(Date receiveTime) { this.receiveTime = receiveTime; } - - } 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 new file mode 100644 index 0000000..eb1a7b3 --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/changehospital/HighriskChangeHospitalVo.java @@ -0,0 +1,50 @@ +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/inspect/InspectListVo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectListVo.java new file mode 100644 index 0000000..9ae91eb --- /dev/null +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectListVo.java @@ -0,0 +1,108 @@ +package com.lyms.hospital.entity.inspect; + +import java.util.Date; + +/** + * 婚前检查-婚检管理列表的页面显示对象 + * + * @author xujiahong + * + */ +public class InspectListVo { + + private String id;// 婚检记录ID + private Date inspectDate;// 婚检日期 + private String name;// 姓名 + private String papersNumber;// 证件号 BASE_PAPERS_NUMBER + private String contactWay;// 联系方式 CONTACT_WOMAN_WAY + private String showResult;// 结果 + private String medicalSuggestion;// 医学意见 MEDICAL_SUGGESTION + private String address;// 居住地址 + private String doctorName;// 婚检医生 + + private Integer gender;//性别-预留（需要时和建档对接） + private Integer orgId;//医院ID + private String queryDateBegin;//查询-婚检日期范围开始 + private String queryDateEnd;//查询-婚检日期范围结束 + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public Date getInspectDate() { + return inspectDate; + } + public void setInspectDate(Date inspectDate) { + this.inspectDate = inspectDate; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getPapersNumber() { + return papersNumber; + } + public void setPapersNumber(String papersNumber) { + this.papersNumber = papersNumber; + } + public String getContactWay() { + return contactWay; + } + public void setContactWay(String contactWay) { + this.contactWay = contactWay; + } + public String getShowResult() { + return showResult; + } + public void setShowResult(String showResult) { + this.showResult = showResult; + } + public String getMedicalSuggestion() { + return medicalSuggestion; + } + public void setMedicalSuggestion(String medicalSuggestion) { + this.medicalSuggestion = medicalSuggestion; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public String getDoctorName() { + return doctorName; + } + public void setDoctorName(String doctorName) { + this.doctorName = doctorName; + } + public Integer getGender() { + return gender; + } + public void setGender(Integer gender) { + this.gender = gender; + } + public Integer getOrgId() { + return orgId; + } + public void setOrgId(Integer orgId) { + this.orgId = orgId; + } + 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/entity/inspect/InspectManVo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectManVo.java index 7ac1ca7..4404989 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectManVo.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectManVo.java @@ -4,6 +4,12 @@ public class InspectManVo extends InspectVo { private MarrybeInspectMan inspectMan;//男性婚检信息 + public InspectManVo(){} + + public InspectManVo(InspectVo vo){ + super(vo); + } + public MarrybeInspectMan getInspectMan() { return inspectMan; } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectVo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectVo.java index eeb1812..48622be 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectVo.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectVo.java @@ -9,6 +9,16 @@ public class InspectVo { private WomanHusband wh;//配偶信息 private DiagnoseAssit assist;//辅助检查 + public InspectVo(){} + + public InspectVo(InspectVo vo){ + if(vo!=null){ + this.inspect = vo.getInspect(); + this.wh = vo.getWh(); + this.assist = vo.getAssist(); + } + } + public MarrybeInspect getInspect() { return inspect; } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectWomanVo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectWomanVo.java index 979948a..9113e41 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectWomanVo.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/inspect/InspectWomanVo.java @@ -4,6 +4,12 @@ public class InspectWomanVo extends InspectVo { private MarrybeInspectWoman inspectWoman;//女性婚检信息 + public InspectWomanVo(){} + + public InspectWomanVo(InspectVo vo){ + super(vo); + } + public MarrybeInspectWoman getInspectWoman() { return inspectWoman; } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanHusband.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanHusband.java index d5bffe8..f9062ce 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanHusband.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanHusband.java @@ -18,6 +18,11 @@ import java.util.Date; public class WomanHusband implements Serializable { private static final long serialVersionUID = 1L; + /* + * 记录来源：1孕妇建档，2婚前检查 + */ + public static int TARGET_TYPE_ARCHIVE = 1; + public static int TARGET_TYPE_INSPECT = 2; /** * 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 ea84cd1..46aac84 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 @@ -64,9 +64,9 @@ public class DiagnoseAssitServiceImpl extends ServiceImpl list = baseMapper.selectList(new EntityWrapper().eq("DIAGNOSE_ID", diagnoseId)); - if(CollectionUtils.isEmpty(list)){ - return null; + if(list.size()>1){ + throw new SystemException("发现多条匹配记录"); } - return list.get(0); + return CollectionUtils.isEmpty(list)?null:list.get(0); } } 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 60b32f7..b123fef 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,6 +4,7 @@ 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.web.service.BaseService; /** @@ -71,5 +72,7 @@ public interface HighriskChangeHospitalService extends BaseService pageOfOut(String orgId,Page page); + public Page pageOfOutVo(HighriskChangeHospitalVo 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 b3934be..179abfd 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 @@ -4,6 +4,7 @@ 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; @@ -12,6 +13,7 @@ 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.enums.HighRiskChangeHospitalStatusEnum; import com.lyms.hospital.service.changehospital.HighriskChangeHospitalService; import com.lyms.util.StrUtils; @@ -27,6 +29,9 @@ import com.lyms.util.StrUtils; @Service public class HighriskChangeHospitalServiceImpl extends ServiceImpl implements HighriskChangeHospitalService { + + @Autowired + private HighriskChangeHospitalMapper mapper; public Integer deleteLogicById(Serializable id) { return baseMapper.deleteLogicById(id); @@ -73,5 +78,17 @@ public class HighriskChangeHospitalServiceImpl extends ServiceImpl pageOfOutVo(HighriskChangeHospitalVo vo, + Page page) { + if(vo==null||vo.getOutOrgid()==null){ + throw new SystemException("查询条件【机构ID】不能为空"); + } + + List list = mapper.listOfOutWomanVo(page,vo); + page.setRecords(list); + return page; + } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectManService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectManService.java index 37dce69..8865f47 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectManService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectManService.java @@ -1,8 +1,9 @@ package com.lyms.hospital.service.inspect; +import java.io.Serializable; + import com.lyms.hospital.entity.inspect.MarrybeInspectMan; import com.lyms.web.service.BaseService; -import java.io.Serializable; /** *

    @@ -12,6 +13,8 @@ import java.io.Serializable; * 修改-男性婚检信息 * 查询详情-男性婚检信息 * + * 根据婚检ID查询-男性婚检信息 + * *

    * * @author xujiahong @@ -58,5 +61,16 @@ public interface MarrybeInspectManService extends BaseService *
  • 修改时间： */ public MarrybeInspectMan selectById(String id); + + /** + *
  • @Description:根据婚检ID查询-男性婚检信息 + *
  • @param id + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public MarrybeInspectMan selectByInspectId(String id); } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectService.java index fa56227..6e6d438 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectService.java @@ -1,7 +1,10 @@ package com.lyms.hospital.service.inspect; import java.io.Serializable; +import java.util.List; +import java.util.Map; +import com.lyms.hospital.entity.inspect.InspectListVo; import com.lyms.hospital.entity.inspect.InspectManVo; import com.lyms.hospital.entity.inspect.InspectWomanVo; import com.lyms.hospital.entity.inspect.MarrybeInspect; @@ -18,12 +21,12 @@ import com.lyms.web.service.BaseService; * []新增男性婚检vo（事务：基本婚检信息、配偶信息、男性婚育史/生殖信息、新增辅助信息） * []修改女性婚检vo * []修改男性婚检vo - * 查询女性婚检详情（事务：基本婚检信息、配偶信息、女性婚育史/生殖信息、新增辅助信息） - * 查询男性婚检详情（事务：基本婚检信息、配偶信息、男性婚育史/生殖信息、新增辅助信息） + * []查询女性婚检详情vo + * []查询男性婚检详情vo + * []逻辑删除婚检vo * - * 查询某人历史婚检记录列表 - * 查询某医院女性婚检列表（多表关联条件查询） - * 查询某医院男性婚检列表（多表关联条件查询） + * []查询某人历史婚检记录列表（ID，时间，建档医院） + * []查询某医院婚检列表（多表关联条件查询） *

    * * @author xujiahong @@ -31,12 +34,16 @@ import com.lyms.web.service.BaseService; */ public interface MarrybeInspectService extends BaseService { - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); + /** + *
  • @Description:逻辑删除婚检vo + *
  • @param id + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean deleteLogicById(Serializable id); /* * 单表新增、修改操作 @@ -84,5 +91,49 @@ public interface MarrybeInspectService extends BaseService { *
  • 修改时间： */ public boolean updateInspectManVo(InspectManVo vo); - + + /** + *
  • @Description:查询女性婚检详情vo + *
  • @param id + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public InspectWomanVo selectInspectWomanVoById(String id); + + /** + *
  • @Description:查询男性婚检详情vo + *
  • @param id + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public InspectManVo selectInspectManVoById(String id); + + /** + *
  • @Description:查询某人历史婚检记录列表（ID，时间，建档医院） + *
  • @param archiveId 档案ID + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public List> getPersonalInspectHistoryList(String archiveId); + + /** + *
  • @Description:查询某医院婚检列表（多表关联条件查询） + *
  • @param vo + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public List listOfMarryBeforeInspect(InspectListVo vo); + } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectWomanService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectWomanService.java index 61566da..fa226aa 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectWomanService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/MarrybeInspectWomanService.java @@ -12,6 +12,8 @@ import com.lyms.web.service.BaseService; * 新增-女性婚检信息 * 修改-女性婚检信息 * 查询详情-女性婚检信息 + * + * 根据婚检ID查询-女性婚检信息 *

    * * @author xujiahong @@ -29,5 +31,15 @@ public interface MarrybeInspectWomanService extends BaseService@Description:根据婚检ID查询-女性婚检信息 + *
  • @param id + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public MarrybeInspectWoman selectByInspectId(String id); } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectManServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectManServiceImpl.java index 48a82fb..6b92ce7 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectManServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectManServiceImpl.java @@ -1,16 +1,20 @@ package com.lyms.hospital.service.inspect.impl; -import com.lyms.hospital.entity.inspect.MarrybeInspectMan; -import com.lyms.hospital.enums.IfdelEnum; +import java.io.Serializable; +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.exception.SystemException; import com.lyms.hospital.dao.inspect.MarrybeInspectManMapper; +import com.lyms.hospital.entity.inspect.MarrybeInspectMan; +import com.lyms.hospital.enums.IfdelEnum; import com.lyms.hospital.service.inspect.MarrybeInspectManService; import com.lyms.util.StrUtils; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.io.Serializable; /** *

    @@ -54,4 +58,15 @@ public class MarrybeInspectManServiceImpl extends ServiceImpl wrapper = new EntityWrapper<>(); + wrapper.eq("MID", id); + List list = baseMapper.selectList(wrapper); + if(list.size()>1){ + throw new SystemException("发现多条匹配记录"); + } + return CollectionUtils.isEmpty(list)?null:list.get(0); + } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectServiceImpl.java index d0424d0..68a971f 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectServiceImpl.java @@ -1,6 +1,9 @@ package com.lyms.hospital.service.inspect.impl; import java.io.Serializable; +import java.util.List; +import java.util.Map; +import java.util.Date; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,6 +14,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.exception.SystemException; import com.lyms.hospital.dao.inspect.MarrybeInspectMapper; import com.lyms.hospital.entity.assist.DiagnoseAssit; +import com.lyms.hospital.entity.inspect.InspectListVo; import com.lyms.hospital.entity.inspect.InspectManVo; import com.lyms.hospital.entity.inspect.InspectVo; import com.lyms.hospital.entity.inspect.InspectWomanVo; @@ -28,15 +32,16 @@ import com.lyms.util.StrUtils; /** *

    - * 服务实现类 + * 服务实现类 *

    * * @author xujiahong * @since 2017-04-06 */ @Service -public class MarrybeInspectServiceImpl extends ServiceImpl implements MarrybeInspectService { - +public class MarrybeInspectServiceImpl extends ServiceImpl + implements MarrybeInspectService { + @Autowired private MarrybeInspectManService inspectManService; @Autowired @@ -45,9 +50,18 @@ public class MarrybeInspectServiceImpl extends ServiceImpl> getPersonalInspectHistoryList(String archiveId) { + return mapper.getPersonalInspectHistoryList(archiveId); } @Override - @Transactional - public boolean updateInspectManVo(InspectManVo vo) { - return updateInspectVo(vo); + public List listOfMarryBeforeInspect(InspectListVo vo) { + if(vo==null){ + return null; + } + if(StringUtils.isEmpty(vo.getOrgId())){ + throw new SystemException("缺失参数:医院ID"); + } + return mapper.listOfMarryBeforeInspect(vo); } - @Override - @Transactional - public boolean updateInspectWomanVo(InspectWomanVo vo) { - return updateInspectVo(vo); - } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectWomanServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectWomanServiceImpl.java index 8207d80..74019a8 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectWomanServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/inspect/impl/MarrybeInspectWomanServiceImpl.java @@ -1,16 +1,20 @@ package com.lyms.hospital.service.inspect.impl; -import com.lyms.hospital.entity.inspect.MarrybeInspectWoman; -import com.lyms.hospital.enums.IfdelEnum; +import java.io.Serializable; +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.exception.SystemException; import com.lyms.hospital.dao.inspect.MarrybeInspectWomanMapper; +import com.lyms.hospital.entity.inspect.MarrybeInspectWoman; +import com.lyms.hospital.enums.IfdelEnum; import com.lyms.hospital.service.inspect.MarrybeInspectWomanService; import com.lyms.util.StrUtils; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.io.Serializable; /** *

    @@ -49,4 +53,15 @@ public class MarrybeInspectWomanServiceImpl extends ServiceImpl wrapper = new EntityWrapper<>(); + wrapper.eq("MID", id); + List list = baseMapper.selectList(wrapper); + if(list.size()>1){ + throw new SystemException("发现多条匹配记录"); + } + return CollectionUtils.isEmpty(list)?null:list.get(0); + } } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanHusbandService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanHusbandService.java index c40f336..c4a9675 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanHusbandService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanHusbandService.java @@ -10,6 +10,8 @@ import java.io.Serializable; * * 新增-配偶信息 * 修改-配偶信息 + * + * []根据目标ID（婚检ID或孕妇建档ID）查询一条配偶信息记录 *

    * * @author fangcheng @@ -32,5 +34,11 @@ public interface WomanHusbandService extends BaseService { */ public String create(WomanHusband womanHusband); public boolean update(WomanHusband womanHusband); + + + /** + * 根据目标ID（婚检ID或孕妇建档ID）查询一条配偶信息记录 + */ + public WomanHusband selectByTarget(int targetType,String targetId); } diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanHusbandServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanHusbandServiceImpl.java index f43cf35..16837ec 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanHusbandServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanHusbandServiceImpl.java @@ -2,7 +2,9 @@ package com.lyms.hospital.service.woman.impl; import java.io.Serializable; import java.util.Date; +import java.util.List; +import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; @@ -61,4 +63,16 @@ public class WomanHusbandServiceImpl extends ServiceImpl wrapper = new EntityWrapper<>(); + wrapper.eq("TARGET_TYPE", targetType); + wrapper.eq("TARGET_ID", targetId); + List list = baseMapper.selectList(wrapper); + if(list.size()>1){ + throw new SystemException("发现多条匹配记录"); + } + return CollectionUtils.isEmpty(list)?null:list.get(0); + } } 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 419c960..9ba8aa1 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.HighriskChangeHospital; +import com.lyms.hospital.entity.changehospital.HighriskChangeHospitalVo; import com.lyms.hospital.service.changehospital.HighriskChangeHospitalService; import com.lyms.hospital.util.AggridUtils; import com.lyms.hospital.util.RequestUtil; @@ -14,7 +14,7 @@ import com.lyms.web.controller.BaseController; /** *

    - * 高危转诊 前端控制器 + * 高危转诊 前端控制器 *

    * * @author xujiahong @@ -23,14 +23,20 @@ import com.lyms.web.controller.BaseController; @RestController @RequestMapping("/highriskChangeHospital") public class HighriskChangeHospitalController extends BaseController { - + @Autowired private HighriskChangeHospitalService service; - - @RequestMapping(value="/list/out", produces={RequestUtil.JSON_ENCODING}, method = RequestMethod.GET) - public String listOfOutWoman(){ - Page page = service.pageOfOut("1",new Page(1,20)); + + @RequestMapping(value = "/list/out", produces = { RequestUtil.JSON_ENCODING }, method = RequestMethod.GET) + public String listOfOutWoman() { + // Page page = service.pageOfOut("1",new + // Page(1,20)); + + HighriskChangeHospitalVo vo = new HighriskChangeHospitalVo(); + vo.setOutOrgid("2"); + Page page = service.pageOfOutVo(vo, new Page(1, 3)); return AggridUtils.toAggrid(page); + } - + } diff --git a/parent/hospital.web/src/test/java/test/hospital/service/InsepectServiceTest.java b/parent/hospital.web/src/test/java/test/hospital/service/InsepectServiceTest.java new file mode 100644 index 0000000..d371eab --- /dev/null +++ b/parent/hospital.web/src/test/java/test/hospital/service/InsepectServiceTest.java @@ -0,0 +1,40 @@ +package test.hospital.service; + +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import com.lyms.hospital.entity.assist.DiagnoseAssit; +import com.lyms.hospital.entity.inspect.InspectWomanVo; +import com.lyms.hospital.entity.inspect.MarrybeInspect; +import com.lyms.hospital.entity.inspect.MarrybeInspectWoman; +import com.lyms.hospital.entity.woman.WomanHusband; +import com.lyms.hospital.service.inspect.MarrybeInspectService; + +import test.hospital.BaseServiceTest; + +public class InsepectServiceTest extends BaseServiceTest { + + @Autowired + private MarrybeInspectService service; + +// @Test +// public void createInspectVo(){ +// //初始化 +// MarrybeInspect inspect = new MarrybeInspect();// 基础婚检信息 +// inspect.setArchiveId("test20170410"); +// inspect.setOrgId("1"); +// WomanHusband wh = new WomanHusband();// 配偶信息 +// DiagnoseAssit assist = new DiagnoseAssit();// 辅助检查 +// MarrybeInspectWoman inspectWoman = new MarrybeInspectWoman(); +// +// //新增 +// InspectWomanVo womanVo = new InspectWomanVo(); +// womanVo.setAssist(assist); +// womanVo.setInspect(inspect); +// womanVo.setInspectWoman(inspectWoman); +// womanVo.setWh(wh); +// service.createInspectWomanVo(womanVo); +// +// } + +} -- 1.8.3.1