diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 8ef5afd..c60a129 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -21,6 +21,8 @@ public class BabyModel extends BaseModel { private static final long serialVersionUID = 1L; private String id; + // 编号 + private String sNumber; /** * 母亲的id @@ -28,11 +30,177 @@ public class BabyModel extends BaseModel { @Field("parentid") private String parentId; + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public Date getFbirth() { + return fbirth; + } + + public void setFbirth(Date fbirth) { + this.fbirth = fbirth; + } + + public Date getMbirth() { + return mbirth; + } + + public void setMbirth(Date mbirth) { + this.mbirth = mbirth; + } + + public String getFjob() { + return fjob; + } + + public void setFjob(String fjob) { + this.fjob = fjob; + } + + 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 getMjob() { + return mjob; + } + + public void setMjob(String mjob) { + this.mjob = mjob; + } + + 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 String getOrg() { + return org; + } + + public void setOrg(String org) { + this.org = org; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public int getWeek() { + return week; + } + + public void setWeek(int week) { + this.week = week; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + /** * 生日 */ private Date birth; + private String address; + + private String provinceId; + private String cityId; + private String areaId; + // 父亲信息 + private String fname; + + private String fjob; + + private String fphone; + + private Date fbirth; + + // 母亲信息 + private String mname; + + private String mjob; + + private String mphone; + + private Date mbirth; + // 助产结构名称 + private String org; + private int week; + + private String cardNo; + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getsNumber() { + return sNumber; + } + + public void setsNumber(String sNumber) { + this.sNumber = sNumber; + } + /** * 性别 */ @@ -47,7 +215,7 @@ public class BabyModel extends BaseModel { */ private String name; - private int yn; + private Integer yn; public int getYn() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java index 391873e..b7ed09d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java @@ -30,15 +30,23 @@ public class BabyVisitModel extends BaseModel { private static final long serialVersionUID = 1L; /** - * 母亲的id + * 新生儿的id */ @Field("parentid") private String parentId; + public String getSickenInfo() { + return sickenInfo; + } + + public void setSickenInfo(String sickenInfo) { + this.sickenInfo = sickenInfo; + } + @Id private String id; - // 名称 + /* // 名称 private String name; // 编号 @@ -69,12 +77,13 @@ public class BabyVisitModel extends BaseModel { private Date mbirth; private int week; + // 助产结构名称 + private String org;*/ // 母亲患病情况 private String sickenInfo; - // 助产结构名称 - private String org; + // 出生情况 private String birthSituation; @@ -196,125 +205,7 @@ public class BabyVisitModel extends BaseModel { // 随访医生签名 private String doctorSign; - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - public String getsNumber() { - return sNumber; - } - - public void setsNumber(String sNumber) { - this.sNumber = sNumber; - } - - public int getSex() { - return sex; - } - - public void setSex(int sex) { - this.sex = sex; - } - - public Date getBirth() { - return birth; - } - - public void setBirth(Date birth) { - this.birth = birth; - } - - public String getFname() { - return fname; - } - - public void setFname(String fname) { - this.fname = fname; - } - - public String getFjob() { - return fjob; - } - - public void setFjob(String fjob) { - this.fjob = fjob; - } - - public String getFphone() { - return fphone; - } - - public void setFphone(String fphone) { - this.fphone = fphone; - } - - public Date getFbirth() { - return fbirth; - } - - public void setFbirth(Date fbirth) { - this.fbirth = fbirth; - } - - public String getMname() { - return mname; - } - - public void setMname(String mname) { - this.mname = mname; - } - - public String getMjob() { - return mjob; - } - - public void setMjob(String mjob) { - this.mjob = mjob; - } - - 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 int getWeek() { - return week; - } - - public void setWeek(int week) { - this.week = week; - } - - public String getSickenInfo() { - return sickenInfo; - } - - public void setSickenInfo(String sickenInfo) { - this.sickenInfo = sickenInfo; - } - - public String getOrg() { - return org; - } - - public void setOrg(String org) { - this.org = org; - } public String getBirthSituation() { return birthSituation; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index f60ef18..e0b5bb8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -25,6 +25,25 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { */ private String keyword; + private String mphone; + private String mname; + + 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; + } + /** * 母亲的id */ @@ -138,7 +157,12 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != parentId) { condition = condition.and("parentid", parentId, MongoOper.IS); } - + if(null!=mphone){ + condition = condition.and("mphone", mphone, MongoOper.IS); + } + if(null!=mname){ + condition = condition.and("mname", mname, MongoOper.IS); + } Criteria c = null; if (null != birthStart) { c = Criteria.where("birth").gte(birthStart); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java index bf3d78f..969f7d8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RestController.java @@ -1,14 +1,12 @@ package com.lyms.platform.operate.web.controller; -import java.util.List; - -import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.core.resolve.MessageResolver; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ExceptionUtils; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.http.HttpStatus; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.validation.BindException; @@ -18,53 +16,65 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; +import java.util.List; + public class RestController { - private static final int ARG_ERROR = 4039; - - @Autowired - private MessageResolver messageResolver; - - @ExceptionHandler(MethodArgumentNotValidException.class) - @ResponseStatus(HttpStatus.OK) - @ResponseBody - public BaseResponse validationError(MethodArgumentNotValidException e) { - return createValidationResponse(e.getBindingResult()); - } + private static final int ARG_ERROR = 4039; + + @Autowired + private MessageResolver messageResolver; + + @ExceptionHandler(MethodArgumentNotValidException.class) + @ResponseStatus(HttpStatus.OK) + @ResponseBody + public BaseResponse validationError(MethodArgumentNotValidException e) { + return createValidationResponse(e.getBindingResult()); + } - @ExceptionHandler(HttpMessageNotReadableException.class) - @ResponseBody - @ResponseStatus(HttpStatus.BAD_REQUEST) - public BaseResponse handException(HttpMessageNotReadableException e){ - ExceptionUtils.catchException(e,e.getMessage()); - BaseResponse error = new BaseResponse(); - error.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); - error.setErrormsg("参数错误"); - return error; - } + @ExceptionHandler(HttpMessageNotReadableException.class) + @ResponseBody + @ResponseStatus(HttpStatus.BAD_REQUEST) + public BaseResponse handException(HttpMessageNotReadableException e) { + ExceptionUtils.catchException(e, e.getMessage()); + BaseResponse error = new BaseResponse(); + error.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); + error.setErrormsg("参数错误"); + return error; + } + @ExceptionHandler(org.springframework.dao.DataAccessResourceFailureException.class) + @ResponseBody + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public BaseResponse handException(DataAccessResourceFailureException e) { + ExceptionUtils.catchException(e, e.getMessage()); + BaseResponse error = new BaseResponse(); + error.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + error.setErrormsg("错误"); + return error; + } - @ExceptionHandler(BindException.class) - @ResponseStatus(HttpStatus.OK) - @ResponseBody - public BaseResponse validationError(BindException e) { - return createValidationResponse(e.getBindingResult()); - } + @ExceptionHandler(BindException.class) + @ResponseStatus(HttpStatus.OK) + @ResponseBody + public BaseResponse validationError(BindException e) { + return createValidationResponse(e.getBindingResult()); + } - private BaseResponse createValidationResponse(BindingResult bindingResult) { - BaseResponse error = new BaseResponse(); - List fieldErrors = bindingResult - .getFieldErrors(); + private BaseResponse createValidationResponse(BindingResult bindingResult) { + BaseResponse error = new BaseResponse(); + List fieldErrors = bindingResult + .getFieldErrors(); - if (CollectionUtils.isNotEmpty(fieldErrors)) { - org.springframework.validation.FieldError fieldError = fieldErrors - .get(0); + if (CollectionUtils.isNotEmpty(fieldErrors)) { + org.springframework.validation.FieldError fieldError = fieldErrors + .get(0); - error.setErrorcode(ARG_ERROR ); - error.setErrormsg(messageResolver.getErrorMessage(fieldError + error.setErrorcode(ARG_ERROR); + error.setErrormsg(messageResolver.getErrorMessage(fieldError .getDefaultMessage())); - } - return error; - } + } + return error; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java index 1c6283e..8d06c29 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java @@ -48,7 +48,7 @@ public class BabyManagerFacade { */ public BaseListResponse findBabyList(BabyManagerQueryRequest babyManagerRequest) { - PatientsQuery patientsQuery = new PatientsQuery(); + /*PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setType(2); patientsQuery.setYn(YnEnums.YES.getId()); Date date = DateUtil.parseYMD(babyManagerRequest.getdEnd()); @@ -75,60 +75,38 @@ public class BabyManagerFacade { for(Patients patients:patientsList){ data.add(buildResult(patients)); } + }*/ + Date date = DateUtil.parseYMD(babyManagerRequest.getdEnd()); + if (null != date) { + long d = date.getTime() + 86398000; + date = new Date(d); } -/* BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setBirthEnd(babyManagerRequest.getdEnd()); - babyQuery.setBirthStart(babyManagerRequest.getdStart()); + babyQuery.setBirthEnd(date); + babyQuery.setBirthStart(DateUtil.parseYMD(babyManagerRequest.getdStart())); babyQuery.setVisitstatus(babyManagerRequest.getVisitstatus()); + babyQuery.setMphone(babyManagerRequest.getPhone()); babyQuery.setPage(babyManagerRequest.getPage()); + babyQuery.setMname(babyManagerRequest.getName()); babyQuery.setLimit(babyManagerRequest.getLimit()); babyQuery.setYn(YnEnums.YES.getId()); + + List data = new ArrayList(); // 根据关键字先查询产妇信息 - if (StringUtils.isNotEmpty(babyManagerRequest.getKeyword())) { - *//* PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); - puerperaQuery.setKeyword(babyManagerRequest.getKeyword());*//* - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setKeyword(babyManagerRequest.getKeyword()); - patientsQuery.setType(2); - patientsQuery.setYn(YnEnums.YES.getId()); - // 符合关键字的产妇列表 -// List puerList = puerperaService.queryPuerpera(puerperaQuery); - List puerList = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(puerList)) { - *//* for (PuerperaModel model : puerList) { - babyQuery.setParentId(model.getId()); - List babies = babyService.queryBabyWithQuery(babyQuery); - if (CollectionUtils.isNotEmpty(babies)) { - for (BabyModel baby : babies) { - data.add(buildResult(baby, model)); - } - } - }*//* - - for(Patients model : puerList) { - babyQuery.setParentId(model.getId()); - List babies = babyService.queryBabyWithQuery(babyQuery); - if (CollectionUtils.isNotEmpty(babies)) { - for (BabyModel baby : babies) { - data.add(buildResult(baby, model)); - } - } - } - } - } else { + + + babyQuery.setNeed("y"); List babies = babyService.queryBabyWithQuery(babyQuery); if (CollectionUtils.isNotEmpty(babies)) { for (BabyModel baby : babies) { - data.add(buildResult(baby,*//* puerperaService.findOnePuerperaById(baby.getParentId())*//*patientsService.findOnePatientById(baby.getParentId()))); + data.add(buildResult(baby,"")); } } - }*/ - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data).setPageInfo(patientsQuery.getPageInfo()); + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data).setPageInfo(babyQuery.getPageInfo()); } /** @@ -139,10 +117,10 @@ public class BabyManagerFacade { * @return 返回结果 */ public BaseResponse deleteOneBabyById(String id) { - Patients obj = new Patients(); + BabyModel obj = new BabyModel(); obj.setYn(YnEnums.NO.getId()); obj.setId(id); - patientsService.updatePatient(obj); + babyService.updateOneBaby(obj,id); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -191,7 +169,7 @@ public class BabyManagerFacade { babyResult.setCommunity(StringUtils.isEmpty(puerModel.getCommunityId()) ? "" : puerModel.getCommunityId()); return babyResult; } - public BabyResult buildResult(Patients patients){ + public BabyResult buildResult(BabyModel patients,String communityId){ BabyResult babyResult = new BabyResult(); /* String addr = ""; if (StringUtils.isNotEmpty(patients.getAddress())) { @@ -204,32 +182,30 @@ public class BabyManagerFacade { }*/ babyResult.setAddress(patients.getAddress()); - babyResult.setCommunityId(StringUtils.isEmpty(patients.getCommunityId()) ? "" : patients.getCommunityId()); + babyResult.setCommunityId(StringUtils.isEmpty(communityId) ? "" : communityId); String comm="未分配"; - if(StringUtils.isNotEmpty(patients.getCommunityId())){ + /* if(StringUtils.isNotEmpty(patients.getCommunityId())){ CommunityConfig communityConfig = communityConfigService.getCommunityById(patients.getCommunityId()); if(null!=communityConfig){ comm= communityConfig.getName(); } - } + }*/ String gender= "未知"; - if(null!=patients.getGender()){ - if("1".equals(patients.getGender()+"")){ + if("1".equals(patients.getSex()+"")){ gender="男"; }else { gender="女"; - } } - babyResult.setName(patients.getUsername()); + babyResult.setName(patients.getName()); babyResult.setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); babyResult.setSex(gender); babyResult.setCommunity(comm); babyResult.setMotherName("母亲名字"); - babyResult.setMotherPhone(patients.getPhone()); + babyResult.setMotherPhone(patients.getMphone()); babyResult.setId(patients.getId()); String tips= visitFacade.getFindTips(patients.getId()); babyResult.setVisit(tips); - babyResult.setVisitStatus(patients.getIsVisit()); + babyResult.setVisitStatus(patients.getVisitstatus()); return babyResult; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index a661a68..9ef17d3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -13,6 +13,7 @@ import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit; import com.lyms.platform.permission.model.Regions; import com.lyms.platform.permission.service.RegionsService; import com.lyms.platform.pojo.*; +import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.VisitQuery; import org.apache.commons.collections.CollectionUtils; @@ -109,6 +110,15 @@ public class VisitFacade { return address; } + private Address fullAddress(BabyModel puerperaModel) { + Address address = new Address(); + address.setArea(getName(puerperaModel.getAreaId())); + address.setCity(getName(puerperaModel.getCityId())); + address.setProvince(getName(puerperaModel.getProvinceId())); + address.setAddress(puerperaModel.getAddress()); + return address; + } + private AddressInner getName(String id) { AddressInner addressInner= new AddressInner(); addressInner.setId(id); @@ -203,15 +213,30 @@ public class VisitFacade { } public BaseResponse addOrUpdateBabyAndVisit(BabyVisitAddRequest babyVisitAddRequest) { + + String babyId= babyVisitAddRequest.getParentId(); // 访视记录id为空表示新增 + BabyVisitModel babyVisitModel = babyVisitAddRequest.convertToDataModel(); + //表示需要新增小孩的数据 + if(StringUtils.isBlank(babyId)){ + babyId = babyService.addOneBaby(babyVisitAddRequest.getBabyModel()).getId(); + }else{ + //修改小孩基本信息 + babyService.updateOneBaby(babyVisitAddRequest.getBabyModel(),babyId); + } + babyVisitModel.setParentId(babyId); + //表示新增访视记录 if (StringUtils.isBlank(babyVisitAddRequest.getId())) { - BabyVisitModel babyVisitModel = babyVisitAddRequest.convertToDataModel(); babyVisitModel.setId(null); babyVisitService.addOneBabyVisit(babyVisitModel); } else { babyVisitService.updateOneBabyVisit(babyVisitAddRequest.convertToDataModel(), babyVisitAddRequest.getId()); } - patientsService.updatePatient(babyVisitAddRequest.getPatients()); + //添加成功后修改新生儿的访视状态 + BabyModel babyModel =new BabyModel(); + babyModel.setId(babyId); + babyModel.setVisitstatus(1); + babyService.updateOneBaby(babyModel,babyId); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -232,14 +257,39 @@ public class VisitFacade { */ public BaseObjectResponse findBabyVisitByMotherCardNo(String cardNo) { // 根据身份证号获取到产妇信息 - Patients puerperaModel = findOnePuerperaByCardNo(cardNo,2); + /* BabyModel puerperaModel = findOnePuerperaByCardNo(cardNo,2); if (null == puerperaModel) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在"); } - return findBabyVisit(puerperaModel); + return findBabyVisit(puerperaModel);*/ + BabyModel babyModel = findOneBabyByMphone(cardNo); + if (null == babyModel) { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在"); + } + return findBabyVisit(babyModel); } - private BaseObjectResponse findBabyVisit(Patients puerperaModel) { + /** + * + * 根据母亲手机号查询新生儿 + * + * @param mPhone 母亲的手机号 + * + * @return 新生儿 + */ + public BabyModel findOneBabyByMphone(String mPhone){ + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setYn(1); + babyModelQuery.setMphone(mPhone); + List babyList = babyService.queryBabyWithQuery(babyModelQuery); + if(CollectionUtils.isEmpty(babyList)){ + return null; + } + return babyList.get(0); + } + + + private BaseObjectResponse findBabyVisit(BabyModel babyModel) { /* BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setParentId(puerperaModel.getId()); babyQuery.setYn(YnEnums.YES.getId()); @@ -247,7 +297,7 @@ public class VisitFacade { BabyVisitResult babyVisitResult = new BabyVisitResult(); List data = new ArrayList(); // 根据产妇id查询该产妇下的小孩访视 - List babyVisits = babyVisitService.findAllVisitByParentId(puerperaModel.getId()); + List babyVisits = babyVisitService.findAllVisitByParentId(babyModel.getId()); // 数据转换 @@ -259,7 +309,7 @@ public class VisitFacade { // TODO 需要转换成具体的result对象 // 设置产妇的信息 - babyVisitResult.convertToResult1(puerperaModel, fullAddress(puerperaModel)); + babyVisitResult.convertToResult1(babyModel, fullAddress(babyModel)); babyVisitResult.setData(data); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(babyVisitResult); } @@ -275,7 +325,6 @@ public class VisitFacade { if (null == babyModel) { return new BaseObjectResponse().setErrormsg("找不到相关的新生儿数据"); } - Patients model = patientsService.findOnePatientById(babyModel.getParentId()); - return findBabyVisit(model); + return findBabyVisit(babyModel); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java index 780e74e..7206113 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java @@ -4,10 +4,10 @@ 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.common.utils.JsonUtil; +import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BabyVisitModel; import com.lyms.platform.pojo.Patients; -import java.util.List; import java.util.Map; @Form @@ -20,7 +20,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert private String address; - private String provinceId; + private String provinceId; private String cityId; private String areaId; @@ -686,7 +686,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert public BabyVisitModel convertToDataModel() { BabyVisitModel babyVisitModel = new BabyVisitModel(); - babyVisitModel.setName(name); + /*babyVisitModel.setName(name); babyVisitModel.setSex(sex); babyVisitModel.setBirth(DateUtil.parseYMD(birth)); babyVisitModel.setMbirth(DateUtil.parseYMD(mbirth)); @@ -696,18 +696,20 @@ public class BabyVisitAddRequest implements IBasicRequestConvert babyVisitModel.setFbirth(DateUtil.parseYMD(fbirth)); babyVisitModel.setFjob(fjob); babyVisitModel.setFname(fname); - babyVisitModel.setFphone(fphone); + babyVisitModel.setBirth(DateUtil.parseYMD(birth)); + babyVisitModel.setWeek(week); + babyVisitModel.setSickenInfo(JsonUtil.obj2JsonString(sickenInfo)); + babyVisitModel.setOrg(org); + babyVisitModel.setFphone(fphone);*/ babyVisitModel.setAbdominalPalpation(JsonUtil.obj2JsonString(abdominalPalpation)); babyVisitModel.setAnus(JsonUtil.obj2JsonString(anus)); babyVisitModel.setAuscultation(JsonUtil.obj2JsonString(auscultation)); babyVisitModel.setBackbone(JsonUtil.obj2JsonString(backbone)); - babyVisitModel.setBirth(DateUtil.parseYMD(birth)); + babyVisitModel.setBirthSituation(JsonUtil.obj2JsonString(birthSituation)); babyVisitModel.setBirthWeight(birthWeight); babyVisitModel.setNextVisitAddr(nextVisitAddr); - babyVisitModel.setWeek(week); - babyVisitModel.setSickenInfo(JsonUtil.obj2JsonString(sickenInfo)); - babyVisitModel.setOrg(org); + babyVisitModel.setBirthSituation(JsonUtil.obj2JsonString(birthSituation)); babyVisitModel.setNeonatalAsphyxia(JsonUtil.obj2JsonString(neonatalAsphyxia)); babyVisitModel.setDeformity(JsonUtil.obj2JsonString(deformity)); @@ -749,17 +751,40 @@ public class BabyVisitAddRequest implements IBasicRequestConvert babyVisitModel.setNextVisitAddr(nextVisitAddr); babyVisitModel.setNextVisitDate(DateUtil.parseYMD(nextVisitDate)); babyVisitModel.setDoctorSign(doctorSign); - babyVisitModel.setParentId(parentId); babyVisitModel.setId(id); return babyVisitModel; } - public Patients getPatients(){ + + + public BabyModel getBabyModel() { + BabyModel babyModel = new BabyModel(); + babyModel.setSex(sex); + babyModel.setYn(1); + babyModel.setAddress(address); + babyModel.setName(name); + babyModel.setAreaId(areaId); + babyModel.setProvinceId(provinceId); + babyModel.setCityId(cityId); + babyModel.setBirth(DateUtil.parseYMD(birth)); + babyModel.setFbirth(DateUtil.parseYMD(fbirth)); + babyModel.setMbirth(DateUtil.parseYMD(mbirth)); + babyModel.setFname(fname); + babyModel.setFjob(fjob); + babyModel.setFphone(fphone); + babyModel.setMname(mname); + babyModel.setMphone(mphone); + babyModel.setMjob(mjob); + babyModel.setWeek(week); + return babyModel; + } + + public Patients getPatients() { Patients patients = new Patients(); patients.setId(parentId); patients.setAddress(address); patients.setAreaId(areaId); patients.setCityId(cityId); patients.setProvinceId(provinceId); - return patients; + return patients; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java index 704c8e5..371da27 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java @@ -1,7 +1,10 @@ package com.lyms.platform.operate.web.result; import java.util.List; +import java.util.Map; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.Patients; import org.springframework.data.annotation.Id; @@ -9,6 +12,7 @@ import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.BabyVisitModel; import com.lyms.platform.pojo.PuerperaModel; +import sun.misc.resources.Messages_pt_BR; /** * 小孩访视记录的返回对象 @@ -31,6 +35,41 @@ public class BabyVisitResult implements IBasicResultConvert data; @@ -81,69 +120,142 @@ public class BabyVisitResult implements IBasicResultConvert { + public String getsNumber() { + return sNumber; + } - @Id - private String id; + public void setsNumber(String sNumber) { + this.sNumber = sNumber; + } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public String getBirth() { + return birth; + } + + public void setBirth(String birth) { + this.birth = birth; + } - // 名称 - private String name; + public String getFname() { + return fname; + } - // 编号 - private String sNumber; + public void setFname(String fname) { + this.fname = fname; + } - // 性别 - private int sex; + public String getFjob() { + return fjob; + } - // 生日 - private String birth; + public void setFjob(String fjob) { + this.fjob = fjob; + } - // 父亲信息 - private String fname; + public String getFphone() { + return fphone; + } - private String fjob; + public void setFphone(String fphone) { + this.fphone = fphone; + } - private String fphone; + public String getFbirth() { + return fbirth; + } - private String fbirth; + public void setFbirth(String fbirth) { + this.fbirth = fbirth; + } - // 母亲信息 - private String mname; + public String getMname() { + return mname; + } - private String mjob; + public void setMname(String mname) { + this.mname = mname; + } + + public String getMjob() { + return mjob; + } + + public void setMjob(String mjob) { + this.mjob = mjob; + } - private String mphone; + public String getMphone() { + return mphone; + } + + public void setMphone(String mphone) { + this.mphone = mphone; + } + + public String getMbirth() { + return mbirth; + } + + public void setMbirth(String mbirth) { + this.mbirth = mbirth; + } + + public int getWeek() { + return week; + } + + public void setWeek(int week) { + this.week = week; + } + public String getOrg() { + return org; + } + + public void setOrg(String org) { + this.org = org; + } + /** + * 小孩的访视记录 + * + * @author Administrator + */ + public class BabyVisit implements IBasicResultConvert { + + @Id + private String id; - private String mbirth; - private int week; // 母亲患病情况 - private String sickenInfo; - // 助产结构名称 - private String org; + // 出生情况 - private String birthSituation; + private Map birthSituation; // 新生儿窒息 private String neonatalAsphyxia; // 是否畸形 - private String deformity; + private Map deformity; // 听力情况 private int hearing; // 疾病筛查 - private String disease; + private Map disease; // 出生体重 private double birthWeight; @@ -182,61 +294,61 @@ public class BabyVisitResult implements IBasicResultConvert