diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java index f6582db..80c1dbc 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java @@ -1,5 +1,7 @@ package com.lyms.platform.permission.model; +import org.apache.commons.lang.StringUtils; + import java.util.UUID; /** @@ -8,10 +10,19 @@ import java.util.UUID; * @Date: 2017/5/12 0012 10:56 * @Version: V1.0 */ -public class AbstracUuidEntity extends AbstractEntity { +public abstract class AbstracUuidEntity extends AbstractEntity { @Override protected void initId() { - setId(UUID.randomUUID().toString().replace("-", "")); + if(StringUtils.isEmpty(getId())){ + setId(UUID.randomUUID().toString().replace("-", "")); + } + } + public String getId() { + return super.getId(); + } + + public void setId(String id) { + super.setId(id); } } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java index a2cbfa8..b3aa7e9 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java @@ -1,5 +1,7 @@ package com.lyms.platform.permission.model; +import org.codehaus.jackson.annotate.JsonIgnore; + import java.math.BigDecimal; /** @@ -196,6 +198,7 @@ public class BabyPatientExtendEarBirth extends AbstracUuidEntity { /** * 所属建档的id */ + @JsonIgnore private String babyPatientId; public Integer getFetuNumber() { diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java index 8756a3a..88f48e5 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java @@ -18,12 +18,20 @@ public class BabyPatientExtendEarQuery extends BaseQuery private String lastUpdateHospitalId; private String highRiskCause; private Integer status; + private String babyPatientId; public String getId() { return id; } + public String getBabyPatientId() { + return babyPatientId; + } + + public void setBabyPatientId(String babyPatientId) { + this.babyPatientId = babyPatientId; + } public void setId(String id) { diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml index ef0eaff..22b8818 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml @@ -63,7 +63,7 @@ delete from baby_patient_extend_ear where id = #{id,jdbcType=VARCHAR} @@ -118,7 +118,7 @@ select id,person_id,create_date,create_user_id,create_hospital_id,last_update_da parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarQuery"> select id,person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status - from baby_patient_extend_ear + baby_patient_id from baby_patient_extend_ear diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java index 79feb6a..fb5ab0a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ApplyOrderStatusEnums.java @@ -6,7 +6,7 @@ package com.lyms.platform.common.enums; public enum ApplyOrderStatusEnums { CREATED("待接收","1"), O("已接收","2"), - O1("建议转诊","3"); + O1("建议转诊","3"), ; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BabyEarResultEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BabyEarResultEnums.java new file mode 100644 index 0000000..6fd2b1f --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BabyEarResultEnums.java @@ -0,0 +1,39 @@ +package com.lyms.platform.common.enums; + +/** + * 儿童听筛检查结果 + * + * 通过/不通过 + * + * Created by jiangjiazhi on 2017/5/25. + */ +public enum BabyEarResultEnums { + + PASS(1,"通過"),UNPASS(2,"不通過");; + private BabyEarResultEnums(Integer id,String title){ + this.id + =id; + this.title=title; + } + public static String getTitle(int id){ + if (id==0){ + return ""; + } + for (BabyEarResultEnums cfEnums:BabyEarResultEnums.values()){ + if (id == cfEnums.getId()){ + return cfEnums.getTitle(); + } + } + return ""; + } + private Integer id; + private String title; + + public Integer getId() { + return id; + } + + public String getTitle() { + return title; + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java index 681a9aa..c184f7c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java @@ -7,11 +7,30 @@ package com.lyms.platform.common.enums; */ public enum DeafEnums { YSX(1,"野生型"),CHTB(2,"纯合突变"),FHZHTB(3,"复合杂合突变"),DZHTB(4,"单杂合突变"); - + public static String getTitle(int id){ + if (id==0){ + return ""; + } + for (DeafEnums cfEnums:DeafEnums.values()){ + if (id == cfEnums.getId()){ + return cfEnums.getName(); + } + } + return ""; + } private DeafEnums(Integer id,String name){ - this.id=id - ;this.name=name; + this.id=id; + this.name=name; + } + + public Integer getId() { + return id; } + + public String getName() { + return name; + } + private Integer id; private String name; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java index de8a80c..62440b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java @@ -1,7 +1,22 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.ContextHolder; +import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.BabyEarFacade; +import com.lyms.platform.operate.web.request.BabyEarAddRequest; +import com.lyms.platform.operate.web.request.BabyScreenAddRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; /** @@ -17,10 +32,94 @@ import org.slf4j.LoggerFactory; * @version BME V100R001 2017-05-17 15:49 * @since BME V100R001C40B104 */ -public class BabyEarController +@Controller +public class BabyEarController extends BaseController { //日志调测器 private static final Logger logger = LoggerFactory.getLogger(BabyEarController.class); -} + @Autowired + private BabyEarFacade babyEarFacade; + + /** + * 增加儿童听力筛查 + * + * @param babyEarAddRequest 儿童听筛请求对象 + * + * @return 操作是否成功 + */ + @TokenRequired + @ResponseBody + @RequestMapping(method = RequestMethod.POST,value = "/babyear") + public BaseResponse addBabyEar(@Valid BabyEarAddRequest babyEarAddRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return babyEarFacade.addOrUpdateBabyEar(babyEarAddRequest,loginState.getId()); + } + + + /** + * 删除儿童听力筛查 + */ + @RequestMapping(value = "/babyear",method = RequestMethod.DELETE) + @ResponseBody + @TokenRequired + public BaseResponse delOneBabyEar(@RequestParam("id")String id){ + return babyEarFacade.deleteBabyEar(id); + } + + /** + * 查看儿童听筛详情 + * + * @return + */ + @TokenRequired + @ResponseBody + @RequestMapping(value = "/babyear",method = RequestMethod.GET) + public BaseResponse findOneBabyEar(String babyId){ + return null; + } + + /** + * 增加或者修改产晒接口 + * + * @param babyScreenAddRequest + * @param httpServletRequest + * @return + */ + @RequestMapping(value = "/babyearsrc",method = RequestMethod.POST) + @ResponseBody + @TokenRequired +// @Link DeafEnums 耳聾基因結果 + public BaseResponse addOrUpdateBabySrc(@Valid BabyScreenAddRequest babyScreenAddRequest,HttpServletRequest httpServletRequest){ + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + return babyEarFacade.addOneBabyEarSrc(babyScreenAddRequest,loginState.getId()); + } + + /** + * 删除产晒记录 + * + * @param id + * @return + */ + @RequestMapping(value = "/babyearsrc",method = RequestMethod.DELETE) + @ResponseBody + @TokenRequired + public BaseResponse delOneBabySrc(@RequestParam("id")String id,HttpServletRequest httpServletRequest){ + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + return babyEarFacade.delOneBabyEarSrc(id, loginState.getId()); + } + + /** + * 获取产晒记录 + * + * @param id + * @return + */ + @RequestMapping(value = "/babyearsrc",method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse getOneBabySrc(@RequestParam("id")String id){ + return babyEarFacade.findOneBabyEarSrc(id); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 228d8d1..9d816bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1,11 +1,38 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.BabyService; +import com.lyms.platform.biz.service.PersonService; +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.BabyEarResultEnums; +import com.lyms.platform.common.enums.DeafEnums; +import com.lyms.platform.common.enums.HighRiskEnum; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.result.RespBuilder; +import com.lyms.platform.common.result.ResponseCode; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.operate.web.request.BabyEarAddRequest; +import com.lyms.platform.operate.web.request.BabyScreenAddRequest; +import com.lyms.platform.operate.web.utils.ResponseUtil; +import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.PersonModel; +import com.lyms.platform.query.PersonModelQuery; +import com.sun.xml.internal.rngom.parse.host.Base; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 儿童听筛门面 @@ -36,14 +63,256 @@ public class BabyEarFacade //家族史 private BabyPatientExtendEarFamilyService babyPatientExtendEarFamilyService; @Autowired - //儿童建档的母亲壬辰详情 - private BabyPatientExtendEarMotherService babyPatientExtendEarMotherService; + private UsersService usersService; @Autowired + private OrganizationService organizationService; //听力筛查 + @Autowired private BabyPatientExtendEarScreenService babyPatientExtendEarScreenService; + @Autowired + //儿童建档的母亲壬辰详情 + private BabyPatientExtendEarMotherService babyPatientExtendEarMotherService; + @Autowired + private BabyService babyService; + @Autowired + private AutoMatchFacade autoMatchFacade; + @Autowired + private ChildrenFatherService childrenFatherService; + @Autowired + private ChildrenRecordService childrenRecordService; + @Autowired + private ChildrenPersonService childrenPersonService; + @Autowired + private PersonService personService; + //处理儿童person信息 + private PersonModel handBabyPerson(BabyModel baby){ + //跟距母親的證件號查詢兒童person信息 + PersonModelQuery personModelQuery = new PersonModelQuery(); + personModelQuery.setYn(YnEnums.YES.getId()); + personModelQuery.setCardNo(baby.getMcertNo()); + personModelQuery.setType(2); + List babyP= personService.queryPersons(personModelQuery); + if(CollectionUtils.isNotEmpty(babyP)){ + return babyP.get(0); + } + PersonModel babyPerson = new PersonModel(); + babyPerson.setName(baby.getName()); + babyPerson.setBirth(baby.getBirth()); + babyPerson.setPhone(baby.getName()); + babyPerson.setCardNo(baby.getMcertNo()); + babyPerson.setType(2); + babyPerson.setYn(YnEnums.YES.getId()); + babyPerson.setModified(new Date()); + return personService.addPerson(babyPerson); + } + /** + * 增加听力筛查建档 + * + * @param babyEarAddRequest 增加听筛请求 + * + * @return 操作是否成功 + */ + public BaseResponse addOrUpdateBabyEar(BabyEarAddRequest babyEarAddRequest,Integer userId){ + //获取儿童信息 + IBasicRequestConvert convert= babyEarAddRequest.getBase(); + //儿童基本信息 + BabyModel baby = convert.convertToDataModel(); + //儿童出生信息 + BabyPatientExtendEarBirth babyPatientExtendEarBirth = babyEarAddRequest.getBabyBirth(); + //儿童家庭信息 + BabyPatientExtendEarFamily babyPatientExtendEarFamily = babyEarAddRequest.getPatientExtendEarFamily(); + //母亲信息 + BabyPatientExtendEarMother babyPatientExtendEarMother= babyEarAddRequest.getPatientExtendEarMother(); + String hId= autoMatchFacade.getHospitalId(userId); + + if(null!=baby){ + //处理儿童person信息 + String pid = handBabyPerson(baby).getId(); + String babyPatientId = baby.getId(); + if(StringUtils.isEmpty(baby.getId())){ + baby.setPid(pid); + babyPatientId=babyService.addOneBaby(baby).getId(); + } + + BabyPatientExtendEar babyPatientExtendEar =new BabyPatientExtendEar(); + babyPatientExtendEar.setCreateDate(new Date()); + babyPatientExtendEar.setCreateHospitalId(hId); + babyPatientExtendEar.setCreateUserId(userId + ""); + babyPatientExtendEar.setPersonId(pid); + babyPatientExtendEar.setLastUpdateDate(new Date()); + babyPatientExtendEar.setLastUpdateHospitalId(hId); + babyPatientExtendEar.setStatus(1); + + babyPatientExtendEarService.addBabyPatientExtendEar(babyPatientExtendEar); + + if(StringUtils.isEmpty(babyPatientExtendEarBirth.getBabyPatientId())){ + babyPatientExtendEarBirth.setBabyPatientId(babyPatientId); + } + if(null!=babyPatientExtendEarBirth) + babyPatientExtendEarBirth.setBabyPatientId(babyPatientId); + if(null!=babyPatientExtendEarFamily){ + babyPatientExtendEarFamily.setBabyPatientId(babyPatientId); + } + if(null!=babyPatientExtendEarMother) { + babyPatientExtendEarMother.setBabyPatientId(babyPatientId); + } + //判断是否是新增 + if(StringUtils.isEmpty(((AbstracUuidEntity)babyPatientExtendEarBirth).getId())){ + babyPatientExtendEarBirthService.addBabyPatientExtendEarBirth(babyPatientExtendEarBirth); + }else{ + babyPatientExtendEarBirthService.updateBabyPatientExtendEarBirth(babyPatientExtendEarBirth); + } + //判断是否是新增 + if(StringUtils.isEmpty(((AbstracUuidEntity)babyPatientExtendEarFamily).getId())){ + babyPatientExtendEarFamilyService.addBabyPatientExtendEarFamily(babyPatientExtendEarFamily); + }else{ + babyPatientExtendEarFamilyService.updateBabyPatientExtendEarFamily(babyPatientExtendEarFamily); + } + //判断是否是新增 + if(StringUtils.isEmpty(((AbstracUuidEntity)babyPatientExtendEarMother).getId())){ + babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(babyPatientExtendEarMother); + }else{ + babyPatientExtendEarMotherService.updateBabyPatientExtendEarMother(babyPatientExtendEarMother); + } + } + return RespBuilder.buildSuccess(); + } + + /** + * 查看儿童听筛建档 + * @param babyId + */ + public void findBabyEarById(String babyId){ + BabyModel babyModel = babyService.getOneBabyById(babyId); + if(null!=babyModel){ + + } + } + + + + + /** + * 删除儿童听筛记录 + * + * @param babyEarId 儿童听筛id + * @return + */ + public BaseResponse deleteBabyEar(String babyEarId){ + BabyPatientExtendEarQuery babyPatientExtendEarQuery=new BabyPatientExtendEarQuery(); + babyPatientExtendEarQuery.setId(babyEarId); + babyPatientExtendEarQuery.setStatus(YnEnums.YES.getId()); + List allPatientEar= babyPatientExtendEarService.queryBabyPatientExtendEar(babyPatientExtendEarQuery); + if(CollectionUtils.isNotEmpty(allPatientEar)){ + BabyPatientExtendEar babyPatientExtendEar = new BabyPatientExtendEar(); + babyPatientExtendEar.setStatus(YnEnums.NO.getId()); + babyPatientExtendEar.setId(babyEarId); + babyPatientExtendEarService.updateBabyPatientExtendEar(babyPatientExtendEar); + return RespBuilder.buildSuccess(); + } + return new BaseResponse().setErrormsg("未找到记录").setErrorcode(ErrorCodeConstants.SUCCESS); + } + + /** + * 查看一条听力筛查 + * @param babyEarSrcId 听力筛查id + * + * @return + */ + public BaseObjectResponse findOneBabyEarSrc(String babyEarSrcId){ + BabyPatientExtendEarScreen babyPatientExtendEarScreen= babyPatientExtendEarScreenService.getBabyPatientExtendEarScreen(babyEarSrcId); + BaseObjectResponse baseObjectResponse=new BaseObjectResponse(); + if(null!=babyPatientExtendEarScreen){ + baseObjectResponse.setData(buildBabyEarResult(babyPatientExtendEarScreen)); + baseObjectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseObjectResponse.setErrormsg("成功"); + }else { + baseObjectResponse.setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); + baseObjectResponse.setErrormsg("无效记录"); + } + return baseObjectResponse; + } + + public Map buildBabyEarResult(BabyPatientExtendEarScreen babyPatientExtendEarScreen){ + Map data=new HashMap<>(); + data.put("id", babyPatientExtendEarScreen.getId()); + data.put("babyId", babyPatientExtendEarScreen.getBabyId()); + data.put("screenType", babyPatientExtendEarScreen.getScreenType()==1?"初筛":"复筛");//1= 2= + data.put("checkHospitalId",babyPatientExtendEarScreen.getCheckHospitalId()); + data.put("checkHospital",organizationService.getOrganization(Integer.valueOf(babyPatientExtendEarScreen.getCheckHospitalId())).getName()); + data.put("screenDate",DateUtil.getYmd(babyPatientExtendEarScreen.getScreenDate())); + data.put("highRiskCause", HighRiskEnum.getTitle(babyPatientExtendEarScreen.getHighRiskCause())); + data.put("oaeLeft", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeLeft())); + data.put("oaeRight", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeRight())); + data.put("aabrLeft", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrLeft())); + data.put("aabrRight", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrRight())); + data.put("gjb2Del35", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del35())); + data.put("gjb2Del176", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del176())); + data.put("gjb2Del235", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del235())); + + data.put("gjb2Del299", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del299())); + data.put("gjb3Slc26a4538", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4538())); + data.put("gjb3Slc26a42168", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a42168())); + + data.put("gjb3Slc26a4Ivs7", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7())); + data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType()==1?"复筛":"诊断");//1=复筛 2=诊断 + data.put("processOptionDesc", babyPatientExtendEarScreen.getProcessOptionDesc()); + data.put("guidOpinion",babyPatientExtendEarScreen.getGuidOpinion()); + data.put("checkDoctorId",babyPatientExtendEarScreen.getCheckDoctorId()); + data.put("checkDoctor",usersService.getUsers(Integer.valueOf(babyPatientExtendEarScreen.getCheckDoctorId())).getName()); + data.put("referralDate",DateUtil.getYmd(babyPatientExtendEarScreen.getReferralDate())); + return data; + } + + + + + + + /** + * 刪除一個產曬 + * @return + */ + public BaseResponse delOneBabyEarSrc(String id,Integer userId){ + if(StringUtils.isEmpty(id)){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("id不能为空"); + } + BabyPatientExtendEarScreen babyPatientExtendEarScreen =new BabyPatientExtendEarScreen(); + babyPatientExtendEarScreen.setId(id); + babyPatientExtendEarScreen.setStatus(1); + babyPatientExtendEarScreen.setLastUpdateHospitalId(autoMatchFacade.getHospitalId(userId)); + babyPatientExtendEarScreen.setLastUpdateUserId(userId + ""); + babyPatientExtendEarScreen.setLastUpdateDate(new Date()); + babyPatientExtendEarScreenService.updateBabyPatientExtendEarScreen(babyPatientExtendEarScreen); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + - public BaseResponse addOneBabyEar(){ - return null; + /** + * 增加产晒 + * + * @return + */ + public BaseResponse addOneBabyEarSrc(BabyScreenAddRequest babyScreenAddRequest,Integer userId){ + BabyPatientExtendEarScreen babyPatientExtendEarScreen =babyScreenAddRequest.convertToDataModel(); + if(null!=babyPatientExtendEarScreen){ + String hId= autoMatchFacade.getHospitalId(userId); + if(StringUtils.isEmpty(babyPatientExtendEarScreen.getId())){ + babyPatientExtendEarScreen.setCreateDate(new Date()); + babyPatientExtendEarScreen.setCreateUserId(userId + ""); + babyPatientExtendEarScreen.setCreateHospitalId(hId); + babyPatientExtendEarScreen.setLastUpdateDate(new Date()); + babyPatientExtendEarScreen.setLastUpdateUserId(userId+""); + babyPatientExtendEarScreen.setLastUpdateHospitalId(hId); + babyPatientExtendEarScreenService.addBabyPatientExtendEarScreen(babyPatientExtendEarScreen); + }else{ + babyPatientExtendEarScreen.setLastUpdateDate(new Date()); + babyPatientExtendEarScreen.setLastUpdateUserId(userId+""); + babyPatientExtendEarScreen.setLastUpdateHospitalId(hId); + babyPatientExtendEarScreenService.updateBabyPatientExtendEarScreen(babyPatientExtendEarScreen); + } + } + return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarAddRequest.java index 0b3a17e..8722c24 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarAddRequest.java @@ -1,9 +1,21 @@ package com.lyms.platform.operate.web.request; +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.common.result.BaseModel; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; +import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; +import com.lyms.platform.permission.model.BabyPatientExtendEarMother; +import com.lyms.platform.pojo.AntExChuModel; +import com.lyms.platform.pojo.BabyModel; import org.apache.commons.lang.builder.ToStringBuilder; +import org.codehaus.jackson.annotate.JsonIgnore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Date; + /** * 增加儿童听力筛查请求 @@ -19,23 +31,356 @@ import org.slf4j.LoggerFactory; * @version BME V100R001 2017-05-17 16:02 * @since BME V100R001C40B104 */ -public class BabyEarAddRequest +public class BabyEarAddRequest extends BaseModel { + //儿童档案信息 + private BabyEarBase base; + //儿童出生信息 + private BabyPatientExtendEarBirth babyBirth; + private BabyPatientExtendEarMother patientExtendEarMother; + private BabyPatientExtendEarFamily patientExtendEarFamily; + /** + * 邮政编码和高危因素没有存储在mongodb + * + * 儿童基本信息请求对象 + */ + private static class BabyEarBase implements IBasicRequestConvert { + private String id; + //儿童建档记录id + private String babyId; + private String pid; + //儿童名字 + private String name; + //儿童身份证号 + private String cardNo; + //儿童生日 + private String birth; + //儿童家庭地址 + private String provinceId; + private String cityId; + private String areaId; + private String streetId; + private String address; - @Override - public String toString() - { - return ToStringBuilder.reflectionToString(this); - } + // 母亲信息 + private String mname; + private String mphone; + + private Date mbirth; + + //职业类别 + private String mproTypeId; + + //证件号 + private String mcertNo; + //证件类型ID + private String mcertTypeId; + + //文化程度ID + private String mLevelId; + + @Override + public BabyModel convertToDataModel() { + BabyModel babyModel= new BabyModel(); + babyModel.setMname(mname); + babyModel.setMphone(mphone); + babyModel.setMbirth(mbirth); + babyModel.setMproTypeId(mproTypeId); + babyModel.setMcertNo(mcertNo); + babyModel.setMcertTypeId(mcertTypeId); + babyModel.setmLevelId(mLevelId); + babyModel.setId(babyId); + babyModel.setBirth(DateUtil.parseYMD(birth)); + babyModel.setCardNo(cardNo); + babyModel.setName(name); + babyModel.setAddress(address); + babyModel.setAreaId(areaId); + babyModel.setProvinceId(provinceId); + babyModel.setCityId(cityId); + babyModel.setStreetId(streetId); + babyModel.setSex(sex); + babyModel.setfLevelId(fLevelId); + babyModel.setFname(fname); + babyModel.setFphone(fphone); + babyModel.setFbirth(DateUtil.parseYMD(fbirth)); + babyModel.setFproTypeId(fproTypeId); + return babyModel; + } + //邮编号码 + private String postCode; + //性别 + private Integer sex; + + // 父亲信息 + private String fname; + + private String fphone; + + private String fbirth; + + //文化程度ID + private String fLevelId; + + //职业类别 + private String fproTypeId; - class BabyEarBase{ - private String id; - private String pid; //高危因素 private String highRiskCause; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getBirth() { + return birth; + } + + public void setBirth(String birth) { + this.birth = birth; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getMname() { + return mname; + } + + public void setMname(String mname) { + this.mname = mname; + } + + public String getMphone() { + return mphone; + } + + public void setMphone(String mphone) { + this.mphone = mphone; + } + + public Date getMbirth() { + return mbirth; + } + + public void setMbirth(Date mbirth) { + this.mbirth = mbirth; + } + + public String getMproTypeId() { + return mproTypeId; + } + + public void setMproTypeId(String mproTypeId) { + this.mproTypeId = mproTypeId; + } + + public String getMcertNo() { + return mcertNo; + } + + public void setMcertNo(String mcertNo) { + this.mcertNo = mcertNo; + } + + public String getMcertTypeId() { + return mcertTypeId; + } + + public void setMcertTypeId(String mcertTypeId) { + this.mcertTypeId = mcertTypeId; + } + + public String getmLevelId() { + return mLevelId; + } + + public void setmLevelId(String mLevelId) { + this.mLevelId = mLevelId; + } + + public String getPostCode() { + return postCode; + } + + public void setPostCode(String postCode) { + this.postCode = postCode; + } + + public Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public String getFname() { + return fname; + } + + public void setFname(String fname) { + this.fname = fname; + } + + public String getFphone() { + return fphone; + } + + public void setFphone(String fphone) { + this.fphone = fphone; + } + + public String getFbirth() { + return fbirth; + } + + public void setFbirth(String fbirth) { + this.fbirth = fbirth; + } + + public String getfLevelId() { + return fLevelId; + } + + public void setfLevelId(String fLevelId) { + this.fLevelId = fLevelId; + } + + public String getFproTypeId() { + return fproTypeId; + } + + public void setFproTypeId(String fproTypeId) { + this.fproTypeId = fproTypeId; + } + + public String getHighRiskCause() { + return highRiskCause; + } + + public void setHighRiskCause(String highRiskCause) { + this.highRiskCause = highRiskCause; + } +//status 状态默认为 +// private String status; + } + + public BabyEarBase getBase() { + return base; + } + + public void setBase(BabyEarBase base) { + this.base = base; + } + + public BabyPatientExtendEarBirth getBabyBirth() { + return babyBirth; + } + + public void setBabyBirth(BabyPatientExtendEarBirth babyBirth) { + this.babyBirth = babyBirth; + } + + public BabyPatientExtendEarMother getPatientExtendEarMother() { + return patientExtendEarMother; + } + + public void setPatientExtendEarMother(BabyPatientExtendEarMother patientExtendEarMother) { + this.patientExtendEarMother = patientExtendEarMother; + } + + public BabyPatientExtendEarFamily getPatientExtendEarFamily() { + return patientExtendEarFamily; + } + + public void setPatientExtendEarFamily(BabyPatientExtendEarFamily patientExtendEarFamily) { + this.patientExtendEarFamily = patientExtendEarFamily; + } + public static void main(String[] args){ + BabyEarAddRequest request= new BabyEarAddRequest(); + request.setBase(new BabyEarBase()); + request.setBabyBirth(new BabyPatientExtendEarBirth()); + request.setPatientExtendEarFamily(new BabyPatientExtendEarFamily()); + request.setPatientExtendEarMother(new BabyPatientExtendEarMother()); + System.out.println(JsonUtil.obj2Str(new BabyEarBase())); + System.out.println(JsonUtil.obj2Str(request)); + System.out.println(JsonUtil.obj2Str(new BabyPatientExtendEarBirth())); } -} +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java new file mode 100644 index 0000000..35c5b17 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java @@ -0,0 +1,313 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.permission.model.BabyPatientExtendEarScreen; +import org.hibernate.validator.constraints.NotEmpty; + +import javax.validation.constraints.Pattern; + +/** + * + * 增加产晒 + * + * Created by jiangjiazhi on 2017/5/23. + */ +@Form +public class BabyScreenAddRequest implements IBasicRequestConvert { + + private String id; + @NotEmpty(message = "儿童id不能为空") + private String babyId; + + /** + * 筛查类型 1=初筛 2=复筛 + */ + @Pattern(regexp = "^[2|1]$",message = "screenType 非法") + private Integer screenType; + + /** + * 检查医院的id + */ + @NotEmpty(message = "检查医院id不能为空") + private String checkHospitalId; + + /** + * 筛查时间 + */ + @NotEmpty(message = "筛查时间不能为空") + private String screenDate; + + /** + * 高危因素 1=早产 2=晚产 + */ + private Integer highRiskCause; + + + /** + * 左耳检查结果 1=通过 -1=未通过 + */ + private Integer oaeLeft; + /** + * 右耳检查结果 1=通过 -1=未通过 + */ + private Integer oaeRight; + /** + * 左耳检查结果 1=通过 -1=未通过 + */ + private Integer aabrLeft; + /** + * 右耳检查结果 1=通过 -1=未通过 + */ + private Integer aabrRight; + + + /** + * 听力基因GJB2-35 del G 的值 1=野生型 + */ + private Integer gjb2Del35; + + private Integer gjb2Del176; + + private Integer gjb2Del235; + + private Integer gjb2Del299; + + private Integer gjb3Slc26a4538; + + private Integer gjb3Slc26a42168; + + private Integer gjb3Slc26a4Ivs7; + + /** + * 处理意见 1=复筛 2=诊断 + */ + private Integer processOptionType; + + /** + * 处理意见 描述信息 + */ + private String processOptionDesc; + @Override + public BabyPatientExtendEarScreen convertToDataModel() { + BabyPatientExtendEarScreen babyPatientExtendEarScreen = new BabyPatientExtendEarScreen(); + babyPatientExtendEarScreen.setGjb3Slc26a4Ivs7(gjb3Slc26a4Ivs7); + babyPatientExtendEarScreen.setProcessOptionType(processOptionType); + babyPatientExtendEarScreen.setProcessOptionDesc(processOptionDesc); + babyPatientExtendEarScreen.setId(id); + babyPatientExtendEarScreen.setBabyId(babyId); + babyPatientExtendEarScreen.setScreenType(screenType); + babyPatientExtendEarScreen.setCreateHospitalId(checkHospitalId); + if(null!=screenDate) { + babyPatientExtendEarScreen.setScreenDate(DateUtil.parseYMD(screenDate)); + } + babyPatientExtendEarScreen.setHighRiskCause(highRiskCause); + babyPatientExtendEarScreen.setOaeLeft(oaeLeft); + babyPatientExtendEarScreen.setOaeRight(oaeRight); + babyPatientExtendEarScreen.setAabrLeft(aabrLeft); + babyPatientExtendEarScreen.setAabrRight(aabrRight); + babyPatientExtendEarScreen.setGjb2Del176(gjb2Del176); + babyPatientExtendEarScreen.setGjb2Del35(gjb2Del35); + babyPatientExtendEarScreen.setGjb2Del235(gjb2Del235); + babyPatientExtendEarScreen.setGjb2Del299(gjb2Del299); + babyPatientExtendEarScreen.setGjb3Slc26a4538(gjb3Slc26a4538); + babyPatientExtendEarScreen.setGjb3Slc26a42168(gjb3Slc26a42168); + babyPatientExtendEarScreen.setGuidOpinion(guidOpinion); + babyPatientExtendEarScreen.setCheckDoctorId(checkDoctorId); + if(null!=referralDate){ + babyPatientExtendEarScreen.setReferralDate(DateUtil.parseYMD(referralDate)); + } + return babyPatientExtendEarScreen; + } + /** + * 指导意见 + */ + private String guidOpinion; + + /** + * 检查医生 + */ + private String checkDoctorId; + + /** + * 诊断时间 + */ + private String referralDate; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBabyId() { + return babyId; + } + + public void setBabyId(String babyId) { + this.babyId = babyId; + } + + public Integer getScreenType() { + return screenType; + } + + public void setScreenType(Integer screenType) { + this.screenType = screenType; + } + + public String getCheckHospitalId() { + return checkHospitalId; + } + + public void setCheckHospitalId(String checkHospitalId) { + this.checkHospitalId = checkHospitalId; + } + + public String getScreenDate() { + return screenDate; + } + + public void setScreenDate(String screenDate) { + this.screenDate = screenDate; + } + + public Integer getHighRiskCause() { + return highRiskCause; + } + + public void setHighRiskCause(Integer highRiskCause) { + this.highRiskCause = highRiskCause; + } + + public Integer getOaeLeft() { + return oaeLeft; + } + + public void setOaeLeft(Integer oaeLeft) { + this.oaeLeft = oaeLeft; + } + + public Integer getOaeRight() { + return oaeRight; + } + + public void setOaeRight(Integer oaeRight) { + this.oaeRight = oaeRight; + } + + public Integer getAabrLeft() { + return aabrLeft; + } + + public void setAabrLeft(Integer aabrLeft) { + this.aabrLeft = aabrLeft; + } + + public Integer getAabrRight() { + return aabrRight; + } + + public void setAabrRight(Integer aabrRight) { + this.aabrRight = aabrRight; + } + + public Integer getGjb2Del35() { + return gjb2Del35; + } + + public void setGjb2Del35(Integer gjb2Del35) { + this.gjb2Del35 = gjb2Del35; + } + + public Integer getGjb2Del176() { + return gjb2Del176; + } + + public void setGjb2Del176(Integer gjb2Del176) { + this.gjb2Del176 = gjb2Del176; + } + + public Integer getGjb2Del235() { + return gjb2Del235; + } + + public void setGjb2Del235(Integer gjb2Del235) { + this.gjb2Del235 = gjb2Del235; + } + + public Integer getGjb2Del299() { + return gjb2Del299; + } + + public void setGjb2Del299(Integer gjb2Del299) { + this.gjb2Del299 = gjb2Del299; + } + + public Integer getGjb3Slc26a4538() { + return gjb3Slc26a4538; + } + + public void setGjb3Slc26a4538(Integer gjb3Slc26a4538) { + this.gjb3Slc26a4538 = gjb3Slc26a4538; + } + + public Integer getGjb3Slc26a42168() { + return gjb3Slc26a42168; + } + + public void setGjb3Slc26a42168(Integer gjb3Slc26a42168) { + this.gjb3Slc26a42168 = gjb3Slc26a42168; + } + + public Integer getGjb3Slc26a4Ivs7() { + return gjb3Slc26a4Ivs7; + } + + public void setGjb3Slc26a4Ivs7(Integer gjb3Slc26a4Ivs7) { + this.gjb3Slc26a4Ivs7 = gjb3Slc26a4Ivs7; + } + + public Integer getProcessOptionType() { + return processOptionType; + } + + public void setProcessOptionType(Integer processOptionType) { + this.processOptionType = processOptionType; + } + + public String getProcessOptionDesc() { + return processOptionDesc; + } + + public void setProcessOptionDesc(String processOptionDesc) { + this.processOptionDesc = processOptionDesc; + } + + public String getGuidOpinion() { + return guidOpinion; + } + + public void setGuidOpinion(String guidOpinion) { + this.guidOpinion = guidOpinion; + } + + public String getCheckDoctorId() { + return checkDoctorId; + } + + public void setCheckDoctorId(String checkDoctorId) { + this.checkDoctorId = checkDoctorId; + } + + public String getReferralDate() { + return referralDate; + } + + public void setReferralDate(String referralDate) { + this.referralDate = referralDate; + } +}