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 1512f30..2cc0d19 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 @@ -22,14 +22,6 @@ public class BabyModel extends BaseModel { //来源id private String source; - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - // 编号 private String sNumber; @@ -45,31 +37,23 @@ public class BabyModel extends BaseModel { * 社区id */ private String communityId; - - /** * 生日 */ private Date birth; - private String address; - private String provinceId; private String cityId; private String areaId; private String streetId; // 父亲信息 private String fname; - private String fjob; - private String fphone; - private Date fbirth; //职业类别 private String fproTypeId; - //证件号 private String fcertNo; //证件类型ID @@ -80,30 +64,22 @@ public class BabyModel extends BaseModel { // 母亲信息 private String mname; - private String mjob; - private String mphone; - private Date mbirth; - //职业类别 private String mproTypeId; - //证件号 private String mcertNo; //证件类型ID private String mcertTypeId; - //文化程度ID private String mLevelId; // 助产结构名称 private String org; private String week; - private String cardNo; - private String hospitalId; //建档类型 1、儿童直接建档 2 产妇分娩建档 3 为转诊自动建档 private Integer buildType; @@ -111,7 +87,6 @@ public class BabyModel extends BaseModel { * 性别 */ private Integer sex; - /** * 访视状态 */ @@ -120,9 +95,7 @@ public class BabyModel extends BaseModel { * 小孩名称 */ private String name; - private Integer yn; - //预产期 private Date dueDate; //分娩方式 @@ -235,6 +208,14 @@ public class BabyModel extends BaseModel { //病历号(住院号) private String blNo; + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + public String getBlNo() { return blNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index d6a1f1e..6d6afe7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -65,12 +65,6 @@ public class EarController extends BaseController { @ResponseBody @TokenRequired public BaseResponse checkBabyFollowUp(String babyId) { - // //开发--跳过验证 - // if(StringUtils.isNotEmpty(babyId)){ - // //根据条件查询基础配置信息表 - // InitFollowUp aa = new InitFollowUp(); - // return aa.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); - // } if (StringUtils.isEmpty(babyId)) {//传入儿童档案id return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); @@ -135,6 +129,34 @@ public class EarController extends BaseController { initScreen.setDeafEnumsResult(EnumUtil.toJson(DeafEnums.class)); return initScreen.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); } + + /** + * 检测儿童是否能够随访 + * + * @param babyId 儿童档案id + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/checkBabySrccen") + @ResponseBody + @TokenRequired + public BaseResponse checkBabySrccen(String babyId) { + + if (StringUtils.isEmpty(babyId)) {//传入儿童档案id + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); + } + //查询儿童听力基础信息 + //根据babyId查询是否存 + BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery(); + earQuery.setBabyPatientId(babyId); + List babyPatientExtendEars = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery); + //是否听力建档 + if(CollectionUtils.isEmpty(babyPatientExtendEars)){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("当前儿童还未听力建档，不能进行听筛"); + } + + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + /** * 进入新增随访记录页面前，验证及初始化数据 * 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 2b7de08..1f3d816 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 @@ -27,6 +27,7 @@ import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PersonModelQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -473,8 +474,6 @@ public class BabyEarFacade { babyEarBaseView.setmHighRiskFactorList(list); } - babyEarResult.setBase(babyEarBaseView); - //查詢母親的信息 BabyPatientExtendEarMotherQuery babyPatientExtendEarMotherQuery = new BabyPatientExtendEarMotherQuery(); babyPatientExtendEarMotherQuery.setBabyPatientId(babyId); @@ -504,11 +503,12 @@ public class BabyEarFacade { BabyEarBirthView babyEarBirthView = convertToBabyEarBirthView(babyPatientExtendEarBirths.get(0)); babyEarResult.setBabyBirth(babyEarBirthView); } - objectResponse.setData(babyEarResult); - objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); - } else { - objectResponse.setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("没有对应的儿童"); } + babyEarResult.setBase(babyEarBaseView); + objectResponse.setData(babyEarResult); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + }else { + objectResponse.setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("没有对应的儿童"); } return objectResponse; } @@ -1015,10 +1015,17 @@ public class BabyEarFacade { if (babyEarBase.getNation() != null) { babyEarBaseView.setNation(mongoUtil.findName(babyEarBase.getNation())); } + String docotorId = babyEarBase.getCreateUserId(); - Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); - if (users != null) { - babyEarBaseView.setCreateUser(users.getName() == null ? "-" : users.getName()); + if (NumberUtils.isNumber(docotorId)) { + Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId)); + if (users != null) { + babyEarBaseView.setCreateUser(users.getName() == null ? "-" : users.getName()); + }else{ + babyEarBaseView.setCreateUser(docotorId); + } + } else { + babyEarBaseView.setCreateUser(docotorId); } babyEarBaseView.setBirth(babyEarBase.getBirth()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java index 1d2a88a..63a972b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java @@ -149,8 +149,12 @@ public class BabyEarBase implements IBasicRequestConvert { setMcertNo(babyModel.getMcertNo()); setMcertTypeId(babyModel.getMcertTypeId()); setmLevelId(babyModel.getmLevelId()); - setmAge(DateUtil.getAge(babyModel.getMbirth(),babyModel.getBuildDate())+""); - setfAge(DateUtil.getAge(babyModel.getFbirth(),babyModel.getBuildDate())+""); + if(babyModel.getMbirth()!=null){ + setmAge(DateUtil.getAge(babyModel.getMbirth(),babyModel.getBuildDate())+""); + } + if(babyModel.getFbirth()!=null){ + setfAge(DateUtil.getAge(babyModel.getFbirth(),babyModel.getBuildDate())+""); + } setCreateTime(DateUtil.getyyyy_MM_dd(babyModel.getBuildDate())); setPostCode(""); setSex(babyModel.getSex());