diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java new file mode 100644 index 0000000..98beb40 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java @@ -0,0 +1,42 @@ +package com.lyms.platform.common.enums; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by Administrator on 2016/3/29 0029. + */ +public enum ServiceTypeEnums { + + + OPEN(0,"开通"),SUSPEND(1,"暂停"),UNSUBSCRIBE(2,"退订"),NO_OPEN(3,"未开通"),STOP(4,"终止"); + + private ServiceTypeEnums(int id, String title){ + this.title=title; + this.id =id; + } + private String title; + private int id; + + public int getId() { + return id; + } + + public String getTitle() { + return title; + } + + public static List> getServiceTypeList() + { + List> list = new ArrayList<>(); + for(ServiceTypeEnums s : ServiceTypeEnums.values()) { + Map map = new HashMap<>(); + map.put("id", s.getId()+""); + map.put("title", s.getTitle()); + list.add(map); + } + return list; + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java index 1088f67..f3e5a14 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java @@ -25,5 +25,8 @@ public class SystemConfig { //居住类型 public static final String LIVE_TYPE_ID = "57624c330cf23d4631523ea0"; + //文化程度 + public static final String LEVEL_TYPE_ID = "8046934b-ebe8-4037-98b6-a9ec47996700"; + } 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 87426f7..7f87b67 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 @@ -102,6 +102,12 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private int yn = -1; + //母亲证件号 + private String mcertNo; + + //就诊卡号 + private String vcCardNo; + public int getYn() { return yn; } @@ -189,6 +195,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=isNull){ condition=condition.and("communityId", null, MongoOper.IS); } + + if(null!=mcertNo){ + condition=condition.and("mcertNo", null, MongoOper.IS); + } + + if(null!=vcCardNo){ + condition=condition.and("vcCardNo", null, MongoOper.IS); + } + if (null != keyword) { if (null != keyword) { MongoCondition con1 = MongoCondition.newInstance("mphone", "^"+keyword, MongoOper.LIKE); @@ -227,4 +242,20 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } return condition.toMongoQuery(); } + + public String getMcertNo() { + return mcertNo; + } + + public void setMcertNo(String mcertNo) { + this.mcertNo = mcertNo; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vcCardNo) { + this.vcCardNo = vcCardNo; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index fd03107..c6979e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -9,17 +9,20 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade; import com.lyms.platform.operate.web.facade.BookbuildingFacade; import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; +import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.pojo.BabyModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; /* @@ -73,11 +76,36 @@ public class BabyBookbuildingController extends BaseController{ * @param id * @return */ - @RequestMapping(value = "/queryBabyBuildById/{id}", method = RequestMethod.DELETE) + @RequestMapping(value = "/queryBabyBuildById/{id}", method = RequestMethod.GET) @ResponseBody public BaseObjectResponse queryBabyBuildById(@PathVariable("id")String id){ return babyBookbuildingFacade.queryBabyBuildById(id); } + /** + * 查询儿童建档就诊卡号，母亲身份证 + * @param idCard + * @param vcCardNo + * @return + */ + @RequestMapping(value = "/queryBabyBuild", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse queryBabyBuild(@RequestParam("idCard")String idCard,@RequestParam("vcCardNo")String vcCardNo){ + BookbuildingQueryRequest param = new BookbuildingQueryRequest(); + param.setIdCard(idCard); + param.setVcCardNo(vcCardNo); + return babyBookbuildingFacade.queryBabyBuild(param); + } + + + /** + * 查询儿童建档页面基础数据 + * @return + */ + @RequestMapping(value = "/getBabyBuildBaseConfig", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse getBabyBuildBaseConfig(){ + return babyBookbuildingFacade.getBabyBuildBaseConfig(); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 81fc04e..7225f80 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -4,11 +4,14 @@ import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; @@ -41,7 +44,11 @@ public class BabyBookbuildingFacade { private BabyBookbuildingService babyBookbuildingService; @Autowired + private BasicConfigFacade basicConfigFacade; + + @Autowired private BasicConfigService basicConfigService; + private BaseObjectResponse babyBuildBaseConfig; /** * 修改儿童建档 @@ -111,6 +118,13 @@ public class BabyBookbuildingFacade { bm.setAreaId(b.getHomeAreaId()); bm.setStreetId(b.getHomeStreetId()); + bm.setFetusCount(b.getFetusCount()); + bm.setDueCount(b.getDueCount()); + bm.setBabyHead(b.getBabyHead()); + bm.setBabyHeight(b.getBabyHeight()); + bm.setBabyWeight(b.getBabyWeight()); + bm.setHospitalId(b.getHospitalId()); + bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); bm.setDueType(b.getDueType()); bm.setIsMalformation(b.getIsMalformation()); @@ -120,6 +134,7 @@ public class BabyBookbuildingFacade { bm.setServiceType(b.getServiceType()); bm.setVcCardNo(b.getVcCardNo()); bm.setHospitalId(b.getHospitalId()); + bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar())); return bm; } @@ -131,20 +146,143 @@ public class BabyBookbuildingFacade { babyBookbuildingService.deleteBabyById(id); } + /** + * 儿童建档查询详情，根据ID、 + * @param id + * @return + */ public BaseObjectResponse queryBabyBuildById(String id) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setId(id); babyQuery.setYn(YnEnums.YES.getId()); BabyBuildResult result = new BabyBuildResult(); - babyBookbuildingService.queryBabyBuildById(babyQuery); -// -// BaseObjectResponse objectResponse = new BaseObjectResponse(); -// objectResponse.setData(result); -// objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); -// objectResponse.setErrormsg("成功"); -// return objectResponse; - - return null; + List models = babyBookbuildingService.queryBabyBuildById(babyQuery); + if (models != null && models.size() > 0) + { + BabyModel model = models.get(0); + result = getBabyBuildResult(model); + + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(result); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + /** + * 构建返回数据 + * @param model + * @return + */ + private BabyBuildResult getBabyBuildResult(BabyModel model) + { + BabyBuildResult result = new BabyBuildResult(); + result.setId(model.getId()); + //母亲信息 + result.setMommyName(model.getMname()); + result.setMommyCertificateTypeId(model.getMcertTypeId()); + result.setMommyCertificateNum(model.getMcertNo()); + result.setMommyBirthday(DateUtil.getyyyy_MM_dd(model.getMbirth())); + result.setMommyLevelId(model.getmLevelId()); + result.setMommyProfessionTypeId(model.getMproTypeId()); + result.setMommyPhone(model.getMphone()); + + //父亲信息 + result.setFatherName(model.getFname()); + result.setFatherPhone(model.getFphone()); + result.setFatherBirthday(DateUtil.getyyyy_MM_dd(model.getFbirth())); + result.setFatherLevelId(model.getfLevelId()); + result.setFatherProfessionTypeId(model.getFproTypeId()); + + //儿童信息 + result.setBabyName(model.getName()); + result.setGender(model.getSex()); + result.setBabyCardNo(model.getCardNo()); + result.setBabyBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); + result.setHomeAddress(model.getAddress()); + result.setHomeProvinceId(model.getProvinceId()); + result.setHomeCityId(model.getCityId()); + result.setHomeAreaId(model.getAreaId()); + result.setHomeStreetId(model.getStreetId()); + + //出生信息 + result.setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); + result.setDueType(model.getDueType()); + result.setFetusCount(model.getFetusCount()); + result.setDueCount(model.getDueCount()); + result.setBabyHeight(model.getBabyHeight()); + result.setBabyWeight(model.getBabyWeight()); + result.setBabyHead(model.getBabyHead()); + result.setDeliverOrg(model.getOrg()); + result.setIsMalformation(model.getIsMalformation()); + result.setApgar(JsonUtil.str2Obj(model.getApgarScore(), Map.class)); + + result.setBuildDoctor(model.getBuildDoctor()); + result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDate())); + result.setServiceType(model.getServiceType()); + result.setVcCardNo(model.getVcCardNo()); + result.setHospitalId(model.getHospitalId()); + return result; + } + + + /** + * 根据母亲身份证或者就诊卡号 + * @param param + * @return + */ + public BaseObjectResponse queryBabyBuild(BookbuildingQueryRequest param) { + + BabyBuildResult result = new BabyBuildResult(); + if (!StringUtils.isEmpty(param.getVcCardNo()) || !StringUtils.isEmpty(param.getIdCard())) + { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setMcertNo(param.getIdCard()); + babyQuery.setVcCardNo(param.getVcCardNo()); + babyQuery.setYn(YnEnums.YES.getId()); + + List models = babyBookbuildingService.queryBabyBuildById(babyQuery); + if (models != null && models.size() > 0) + { + BabyModel model = models.get(0); + result = getBabyBuildResult(model); + } + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(result); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + + } + + /** + * 查询儿童建档页面基础数据 + * @return + */ + public BaseObjectResponse getBabyBuildBaseConfig() { + Map map = new HashMap(); + + //证件类型 + List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); + map.put("certeType",pcerteTypeResult); + + //文化程度 + List levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID); + map.put("levelType",levelType); + + // 职业类别 + List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); + map.put("professionType",professionTypeResults); + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(map); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + + return objectResponse; } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 08373cd..3453e34 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -140,4 +140,35 @@ public class BasicConfigFacade { } return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); } + + + /** + * 查询基础数据通过parentId + * @param parentId + * @return + */ + public List getBaseicConfigByParentId(String parentId) + { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setNeed("1"); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(parentId); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + List provincesResults = new ArrayList<>(); + if (datas != null) + { + for(BasicConfig data : datas) + { + BasicConfigResult br = new BasicConfigResult(); + br.setId(data.getId()); + br.setCode(data.getCode()); + br.setEnable(data.getEnable()); + br.setName(data.getName()); + br.setParentId(data.getParentId()); + provincesResults.add(br); + } + + } + return provincesResults; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 7548357..63e588d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.utils.StringUtils; @@ -37,8 +38,7 @@ public class BookbuildingFacade { private YunBookbuildingService yunBookbuildingService; @Autowired - private BasicConfigService basicConfigService; - + private BasicConfigFacade basicConfigFacade; /** * 添加孕妇建档 @@ -112,29 +112,33 @@ public class BookbuildingFacade { Map mapProvince = new HashMap<>(); //证件类型 - List pcerteTypeResult = getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); + List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); mapProvince.put("certeType",pcerteTypeResult); //国籍 - List countiryResults = getBaseicConfigByParentId(SystemConfig.COUNTRY_TYPE_ID); + List countiryResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.COUNTRY_TYPE_ID); mapProvince.put("country",countiryResults); // 民族 - List nationResults = getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID); + List nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID); mapProvince.put("nation",nationResults); // 职业类别 - List professionTypeResults = getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); + List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); mapProvince.put("professionType",professionTypeResults); // 户籍类别 - List censusType = getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID); + List censusType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID); mapProvince.put("censusType",censusType); // 户籍类别 - List liveType = getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID); + List liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID); mapProvince.put("liveType",liveType); + //服务类型 + List servictType = ServiceTypeEnums.getServiceTypeList(); + mapProvince.put("servictType",servictType); + list.add(mapProvince); @@ -149,35 +153,7 @@ public class BookbuildingFacade { return listResponse; } - /** - * 查询基础数据通过parentId - * @param parentId - * @return - */ - private List getBaseicConfigByParentId(String parentId) - { - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); - basicConfigQuery.setNeed("1"); - basicConfigQuery.setYn(YnEnums.YES.getId()); - basicConfigQuery.setParentId(parentId); - List datas = basicConfigService.queryBasicConfig(basicConfigQuery); - List provincesResults = new ArrayList<>(); - if (datas != null) - { - for(BasicConfig data : datas) - { - BasicConfigResult br = new BasicConfigResult(); - br.setId(data.getId()); - br.setCode(data.getCode()); - br.setEnable(data.getEnable()); - br.setName(data.getName()); - br.setParentId(data.getParentId()); - provincesResults.add(br); - } - } - return provincesResults; - } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 5aa8701..fe4ee16 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -2,6 +2,8 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; +import java.util.Map; + /** * Created by lqy on 2016/6/15. */ @@ -88,6 +90,9 @@ public class BabyBookbuildingAddRequest { //助产机构 private String deliverOrg; + //apgar评分 + private Map apgar; + //是否畸形 0非畸形 1畸形 private Integer isMalformation; @@ -389,4 +394,12 @@ public class BabyBookbuildingAddRequest { public void setVcCardNo(String vcCardNo) { this.vcCardNo = vcCardNo; } + + public Map getApgar() { + return apgar; + } + + public void setApgar(Map apgar) { + this.apgar = apgar; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index aac44ea..e5102d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.result; +import java.util.Map; + /** * Created by lqy on 2016/6/17. */ @@ -88,6 +90,9 @@ public class BabyBuildResult { //是否畸形 0非畸形 1畸形 private Integer isMalformation; + //apgar评分 + private Map apgar; + //建档医生 private String buildDoctor; //建档日期 @@ -386,4 +391,12 @@ public class BabyBuildResult { public void setVcCardNo(String vcCardNo) { this.vcCardNo = vcCardNo; } + + public Map getApgar() { + return apgar; + } + + public void setApgar(Map apgar) { + this.apgar = apgar; + } }