From c0231a7d64ca4a3fbfc2177064d24eb7560fffce Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 21 Jun 2016 15:26:36 +0800 Subject: [PATCH] add code --- .../biz/service/BabyBookbuildingService.java | 2 +- .../lyms/platform/common/utils/SystemConfig.java | 3 + .../java/com/lyms/platform/pojo/BabyModel.java | 55 ++++++---- .../main/java/com/lyms/platform/pojo/Patients.java | 21 ++++ .../com/lyms/platform/query/BabyModelQuery.java | 4 +- .../web/controller/BabyBookbuildingController.java | 16 ++- .../operate/web/facade/BabyBookbuildingFacade.java | 113 +++++++++++++++++++-- .../operate/web/facade/BasicConfigFacade.java | 6 +- .../operate/web/facade/BookbuildingFacade.java | 4 + .../web/request/BabyBookbuildingAddRequest.java | 55 ++++++---- .../web/request/YunBookbuildingAddRequest.java | 12 +++ .../operate/web/result/BabyBuildResult.java | 92 +++++++++++++++-- .../operate/web/result/BabyInfoResult.java | 17 +++- .../operate/web/result/PregnantInfoResult.java | 12 +++ 14 files changed, 343 insertions(+), 69 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java index d1126f9..9a6f431 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java @@ -38,6 +38,6 @@ public class BabyBookbuildingService { public List queryBabyBuildById(BabyModelQuery babyQuery) { MongoQuery query = babyQuery.convertToQuery(); - return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "id")); + return babyBookBuildingDao.queryBabyWithQuery(query.addOrder(Sort.Direction.DESC, "buildDate")); } } 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 f3e5a14..a4e338d 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 @@ -28,5 +28,8 @@ public class SystemConfig { //文化程度 public static final String LEVEL_TYPE_ID = "8046934b-ebe8-4037-98b6-a9ec47996700"; + //诊断 + public static final String DIAGNOSE_TYPE_ID = "5768e5cf0cf2eaac7ba44a18"; + } 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 8f48ce2..fe69d99 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 @@ -130,15 +130,18 @@ public class BabyModel extends BaseModel { //助产机构 private String deliverOrg; - //是否畸形 0非畸形 1畸形 - private Integer isMalformation; + //是否畸形 false非畸形 true畸形 + private boolean malformation; //建档医生 private String buildDoctor; //建档日期 private Date buildDate; - //服务状态 + //服务类型 private String serviceType; + + //服务状态 + private String serviceStatus; //就诊卡号 private String vcCardNo; //apgar评分 @@ -156,8 +159,8 @@ public class BabyModel extends BaseModel { //早吮吸 private String earlySuck; - //体验会员 0非体验会员 1体验会员 - private Integer isExpVip; + //体验会员 false非体验会员 true体验会员 + private boolean expVip; //会员截止时间 private Date vipEndTime; @@ -168,11 +171,27 @@ public class BabyModel extends BaseModel { //诊断 private String diagnose; - //是否高危 0 非高危 1高危 - private String isHighRisk; + //是否高危 false 非高危 true高危 + private boolean highRisk; //母亲备注 private String mremark; + public boolean isMalformation() { + return malformation; + } + + public void setMalformation(boolean malformation) { + this.malformation = malformation; + } + + public String getServiceStatus() { + return serviceStatus; + } + + public void setServiceStatus(String serviceStatus) { + this.serviceStatus = serviceStatus; + } + public String getDiagnose() { return diagnose; } @@ -436,13 +455,7 @@ public class BabyModel extends BaseModel { this.deliverOrg = deliverOrg; } - public Integer getIsMalformation() { - return isMalformation; - } - public void setIsMalformation(Integer isMalformation) { - this.isMalformation = isMalformation; - } public String getBuildDoctor() { return buildDoctor; @@ -641,20 +654,20 @@ public class BabyModel extends BaseModel { this.highRiskReason = highRiskReason; } - public String getIsHighRisk() { - return isHighRisk; + public boolean isExpVip() { + return expVip; } - public void setIsHighRisk(String isHighRisk) { - this.isHighRisk = isHighRisk; + public void setExpVip(boolean expVip) { + this.expVip = expVip; } - public Integer getIsExpVip() { - return isExpVip; + public boolean isHighRisk() { + return highRisk; } - public void setIsExpVip(Integer isExpVip) { - this.isExpVip = isExpVip; + public void setHighRisk(boolean highRisk) { + this.highRisk = highRisk; } public Date getVipEndTime() { diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index eb5e3c4..bc17efb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -107,6 +107,27 @@ public class Patients extends BaseModel { //会员截止时间 private Date vipEndTime; + //备注 + private String mremark; + + //分娩状态 0未分娩 1分娩 2终止妊娠 + private Integer dueStatus; + + public Integer getDueStatus() { + return dueStatus; + } + + public void setDueStatus(Integer dueStatus) { + this.dueStatus = dueStatus; + } + + public String getMremark() { + return mremark; + } + + public void setMremark(String mremark) { + this.mremark = mremark; + } public Integer getServiceStatus() { return serviceStatus; 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 7f87b67..c566d45 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 @@ -197,11 +197,11 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } if(null!=mcertNo){ - condition=condition.and("mcertNo", null, MongoOper.IS); + condition=condition.and("mcertNo", mcertNo, MongoOper.IS); } if(null!=vcCardNo){ - condition=condition.and("vcCardNo", null, MongoOper.IS); + condition=condition.and("vcCardNo", mcertNo, MongoOper.IS); } if (null != keyword) { 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 f5883fb..cb56027 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 @@ -90,7 +90,7 @@ public class BabyBookbuildingController extends BaseController{ */ @RequestMapping(value = "/queryBabyBuild", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse queryBabyBuild(@RequestParam("idCard")String idCard,@RequestParam("vcCardNo")String vcCardNo){ + public BaseObjectResponse queryBabyBuild(@RequestParam(required = false)String idCard,@RequestParam(required = false)String vcCardNo){ BookbuildingQueryRequest param = new BookbuildingQueryRequest(); param.setIdCard(idCard); param.setVcCardNo(vcCardNo); @@ -98,6 +98,7 @@ public class BabyBookbuildingController extends BaseController{ } + /** * 查询儿童建档记录就诊卡号，母亲身份证 * @param idCard @@ -106,7 +107,7 @@ public class BabyBookbuildingController extends BaseController{ */ @RequestMapping(value = "/queryBabyBuildRecord", method = RequestMethod.GET) @ResponseBody - public BaseObjectResponse queryBabyBuildRecord(@RequestParam("idCard")String idCard,@RequestParam("vcCardNo")String vcCardNo){ + public BaseObjectResponse queryBabyBuildRecord(@RequestParam(required = false)String idCard,@RequestParam(required = false)String vcCardNo){ BookbuildingQueryRequest param = new BookbuildingQueryRequest(); param.setIdCard(idCard); param.setVcCardNo(vcCardNo); @@ -125,4 +126,15 @@ public class BabyBookbuildingController extends BaseController{ return babyBookbuildingFacade.getBabyBuildBaseConfig(); } + + /** + * 查询诊断 根据关键字 + * @return + */ + @RequestMapping(value = "/queryDiagnose", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse queryDiagnose(@RequestParam(required = true)String keyword){ + return babyBookbuildingFacade.queryDiagnose(keyword); + } + } \ 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 ba6eb07..f9bc8df 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,6 +4,7 @@ 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.ServiceStatusEnums; import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; @@ -17,6 +18,8 @@ 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.*; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; @@ -43,6 +46,9 @@ public class BabyBookbuildingFacade { @Autowired private BasicConfigService basicConfigService; + @Autowired + private OrganizationService organizationService; + /** * 修改儿童建档 * @param request @@ -118,16 +124,17 @@ public class BabyBookbuildingFacade { bm.setBabyWeight(b.getBabyWeight()); bm.setHospitalId(b.getHospitalId()); - bm.setIsHighRisk(b.getIsHighRisk()); + bm.setHighRisk(b.isHighRisk()); bm.setHighRiskReason(b.getHighRiskReason()); - bm.setIsExpVip(b.getIsExpVip()); + bm.setExpVip(b.isExpVip()); bm.setMremark(b.getMremark()); bm.setDiagnose(b.getDiagnose()); bm.setVipEndTime(DateUtil.parseYMD(b.getVipEndTime())); + bm.setServiceStatus(b.getServiceStatus()); bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); bm.setDueType(b.getDueType()); - bm.setIsMalformation(b.getIsMalformation()); + bm.setMalformation(b.isMalformation()); bm.setOrg(b.getDeliverOrg()); bm.setBuildDoctor(b.getBuildDoctor()); bm.setBuildDate(DateUtil.parseYMD(b.getBuildDate())); @@ -216,10 +223,18 @@ public class BabyBookbuildingFacade { result.setBabyWeight(model.getBabyWeight()); result.setBabyHead(model.getBabyHead()); result.setDeliverOrg(model.getOrg()); - result.setIsMalformation(model.getIsMalformation()); + result.setMalformation(model.isMalformation()); result.setApgar(JsonUtil.str2Obj(model.getApgarScore(), Map.class)); + result.setHighRisk(model.isHighRisk()); + result.setHighRiskReason(model.getHighRiskReason()); + result.setExpVip(model.isExpVip()); + result.setMremark(model.getMremark() == null ? "" : model.getMremark()); + result.setDiagnose(model.getDiagnose()); + result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime())); + result.setServiceStatus(model.getServiceStatus()); + result.setBuildDoctor(model.getBuildDoctor()); result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDate())); @@ -282,7 +297,11 @@ public class BabyBookbuildingFacade { //服务类型 List serviceType = ServiceTypeEnums.getServiceTypeList(); - map.put("serviceType",serviceType); + map.put("serviceType", serviceType); + + //服务状态 + List serviceStatus = ServiceStatusEnums.getServiceStatusList(); + map.put("serviceStatus",serviceStatus); BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(map); @@ -292,6 +311,11 @@ public class BabyBookbuildingFacade { return objectResponse; } + /** + * 查询母亲下面有几个儿童 每个儿童下面有几次建档记录 + * @param param + * @return + */ public BaseObjectResponse queryBabyBuildRecord(BookbuildingQueryRequest param) { List results = new ArrayList<>(); @@ -305,20 +329,91 @@ public class BabyBookbuildingFacade { List models = babyBookbuildingService.queryBabyBuildById(babyQuery); if (models != null && models.size() > 0) { + Set cardNos = new HashSet<>(); for(BabyModel model : models) { + if (model != null && !StringUtils.isEmpty(model.getCardNo())) + { + cardNos.add(model.getCardNo()); + } - BabyInfoResult result = new BabyInfoResult(); - result.setId(model.getId()); - result.setName(model.getName()); - result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); } + for(String cno : cardNos) + { + BabyInfoResult result = new BabyInfoResult(); + + List> list = new ArrayList<>(); + for(BabyModel model : models) + { + + if (cno.equals(model.getCardNo())) + { + Map buildRecords = new HashMap<>(); + buildRecords.put("id",model.getId()); + buildRecords.put("buildDate",DateUtil.getyyyy_MM_dd(model.getBuildDate())); + + //查询建档医院 + Organization org = organizationService.getOrganization(model.getHospitalId()); + if (org != null) + { + buildRecords.put("buildHospital", org.getName()); + } + else + { + buildRecords.put("buildHospital", ""); + } + + result.setId(model.getId()); + result.setCardNo(model.getCardNo()); + result.setName(model.getName()); + result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); + list.add(buildRecords); + + } + result.setBuildRecords(list); + } + results.add(result); + } } } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setData(results); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + /** + * 根据关键字查询 + * @param keyword + * @return + */ + public BaseObjectResponse queryDiagnose(String keyword) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery.setKeyword(keyword); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + List configResults = 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()); + configResults.add(br); + } + + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setData(configResults); objectResponse.setErrormsg("成功"); return objectResponse; } 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 fd736a6..d1a33ca 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 @@ -158,7 +158,7 @@ public class BasicConfigFacade { basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setParentId(parentId); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); - List provincesResults = new ArrayList<>(); + List configResults = new ArrayList<>(); if (datas != null) { for(BasicConfig data : datas) @@ -169,11 +169,11 @@ public class BasicConfigFacade { br.setEnable(data.getEnable()); br.setName(data.getName()); br.setParentId(data.getParentId()); - provincesResults.add(br); + configResults.add(br); } } - return provincesResults; + return configResults; } /** 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 a164f77..5850ba4 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 @@ -237,6 +237,7 @@ public class BookbuildingFacade { patient.setServiceStatus(yunRequest.getServiceStatus()); patient.setVipEndTime(DateUtil.parseYMD(yunRequest.getVipEndTime())); patient.setExpVip(yunRequest.isExpVip()); + patient.setMremark(yunRequest.getMremark()); patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); patient.setDueDate(DateUtil.parseYMD(yunRequest.getDueDate())); @@ -247,6 +248,8 @@ public class BookbuildingFacade { patient.setVcCardNo(yunRequest.getVcCardNo()); patient.setHospitalId(yunRequest.getHospitalId()); patient.setYn(YnEnums.YES.getId()); + + patient.setDueStatus(0); return patient; } @@ -320,6 +323,7 @@ public class BookbuildingFacade { result.setServiceStatus(p.getServiceStatus()); result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime())); result.setExpVip(p.isExpVip()); + result.setMremark(p.getMremark()); //院内信息 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 f008756..1086db4 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 @@ -96,8 +96,8 @@ public class BabyBookbuildingAddRequest { //apgar评分 private Map apgar; - //是否畸形 0非畸形 1畸形 - private Integer isMalformation; + //是否畸形 false非畸形 true畸形 + private boolean malformation; @@ -110,6 +110,8 @@ public class BabyBookbuildingAddRequest { //服务类型 private String serviceType; + //服务类型 + private String serviceStatus; //就诊卡号 private String vcCardNo; @@ -117,7 +119,7 @@ public class BabyBookbuildingAddRequest { private Integer hospitalId; //体验会员 0非体验会员 1体验会员 - private Integer isExpVip; + private boolean expVip; //会员截止时间 private String vipEndTime; @@ -129,7 +131,27 @@ public class BabyBookbuildingAddRequest { private String diagnose; //是否高危 0 非高危 1高危 - private String isHighRisk; + private boolean highRisk; + + public void setDeliverOrg(String deliverOrg) { + this.deliverOrg = deliverOrg; + } + + public boolean isMalformation() { + return malformation; + } + + public void setMalformation(boolean malformation) { + this.malformation = malformation; + } + + public String getServiceStatus() { + return serviceStatus; + } + + public void setServiceStatus(String serviceStatus) { + this.serviceStatus = serviceStatus; + } public String getDiagnose() { return diagnose; @@ -383,17 +405,8 @@ public class BabyBookbuildingAddRequest { return deliverOrg; } - public void setDeliverOrg(String deliverOrg) { - this.deliverOrg = deliverOrg; - } - public Integer getIsMalformation() { - return isMalformation; - } - public void setIsMalformation(Integer isMalformation) { - this.isMalformation = isMalformation; - } public String getBuildDoctor() { return buildDoctor; @@ -451,20 +464,20 @@ public class BabyBookbuildingAddRequest { this.highRiskReason = highRiskReason; } - public String getIsHighRisk() { - return isHighRisk; + public boolean isExpVip() { + return expVip; } - public void setIsHighRisk(String isHighRisk) { - this.isHighRisk = isHighRisk; + public void setExpVip(boolean expVip) { + this.expVip = expVip; } - public Integer getIsExpVip() { - return isExpVip; + public boolean isHighRisk() { + return highRisk; } - public void setIsExpVip(Integer isExpVip) { - this.isExpVip = isExpVip; + public void setHighRisk(boolean highRisk) { + this.highRisk = highRisk; } public String getVipEndTime() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 53e7eff..c0b7a24 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -105,6 +105,9 @@ public class YunBookbuildingAddRequest { //服务类型 private Integer serviceType; + //备注 + private String mremark; + //就诊卡号 @@ -122,6 +125,15 @@ public class YunBookbuildingAddRequest { //会员截止时间 private String vipEndTime; + + public String getMremark() { + return mremark; + } + + public void setMremark(String mremark) { + this.mremark = mremark; + } + public Integer getServiceStatus() { return serviceStatus; } 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 bd095e6..40ef5a5 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 @@ -87,8 +87,8 @@ public class BabyBuildResult { //助产机构 private String deliverOrg; - //是否畸形 0非畸形 1畸形 - private Integer isMalformation; + //是否畸形 false非畸形 true畸形 + private boolean malformation; //apgar评分 private Map apgar; @@ -97,13 +97,91 @@ public class BabyBuildResult { private String buildDoctor; //建档日期 private String buildDate; - //服务状态 + //服务类型 private String serviceType; + + //服务状态 + private String serviceStatus; //就诊卡号 private String vcCardNo; private Integer hospitalId; + //备注 + private String mremark; + + + //体验会员 0非体验会员 1体验会员 + private boolean expVip; + + //会员截止时间 + private String vipEndTime; + + //高危因素 + private String highRiskReason; + + //诊断 + private String diagnose; + + //是否高危 0 非高危 1高危 + private boolean highRisk; + + public String getMremark() { + return mremark; + } + + public void setMremark(String mremark) { + this.mremark = mremark; + } + + public String getServiceStatus() { + return serviceStatus; + } + + public void setServiceStatus(String serviceStatus) { + this.serviceStatus = serviceStatus; + } + + public boolean isExpVip() { + return expVip; + } + + public void setExpVip(boolean expVip) { + this.expVip = expVip; + } + + public String getVipEndTime() { + return vipEndTime; + } + + public void setVipEndTime(String vipEndTime) { + this.vipEndTime = vipEndTime; + } + + public String getHighRiskReason() { + return highRiskReason; + } + + public void setHighRiskReason(String highRiskReason) { + this.highRiskReason = highRiskReason; + } + + public String getDiagnose() { + return diagnose; + } + + public void setDiagnose(String diagnose) { + this.diagnose = diagnose; + } + + public boolean isHighRisk() { + return highRisk; + } + + public void setHighRisk(boolean highRisk) { + this.highRisk = highRisk; + } + public Integer getHospitalId() { return hospitalId; } @@ -352,12 +430,12 @@ public class BabyBuildResult { this.deliverOrg = deliverOrg; } - public Integer getIsMalformation() { - return isMalformation; + public boolean isMalformation() { + return malformation; } - public void setIsMalformation(Integer isMalformation) { - this.isMalformation = isMalformation; + public void setMalformation(boolean malformation) { + this.malformation = malformation; } public String getBuildDoctor() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java index 2277b44..152ba88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.result; +import java.util.List; import java.util.Map; /** @@ -10,14 +11,16 @@ public class BabyInfoResult { private String id; private String name; private String monthAge; + private String cardNo; - private Map buildRecords; - public Map getBuildRecords() { + private List> buildRecords; + + public List> getBuildRecords() { return buildRecords; } - public void setBuildRecords(Map buildRecords) { + public void setBuildRecords(List> buildRecords) { this.buildRecords = buildRecords; } @@ -44,4 +47,12 @@ public class BabyInfoResult { public void setMonthAge(String monthAge) { this.monthAge = monthAge; } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 5dd1fc7..3a3422c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -118,6 +118,18 @@ public class PregnantInfoResult { //会员截止时间 private String vipEndTime; + //备注 + private String mremark; + + + public String getMremark() { + return mremark; + } + + public void setMremark(String mremark) { + this.mremark = mremark; + } + public Integer getServiceStatus() { return serviceStatus; } -- 1.8.3.1