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 b31546b..317c291 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 @@ -59,6 +59,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String phoneOrcardNo; + + //助产机构 + private String deliverOrg; + //畸形key private String deformityKey; //居住类别 @@ -206,6 +210,20 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private Integer endCase; + private String areaId; + + private String provinceId; + + private String cityId; + private String streetId; + + private String source; + + /** + * 是否分配社区 + */ + private Boolean isNull; + public Integer getEndCase() { return endCase; } @@ -416,8 +434,13 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.enableListNot = enableListNot; } - private String source; + public String getDeliverOrg() { + return deliverOrg; + } + public void setDeliverOrg(String deliverOrg) { + this.deliverOrg = deliverOrg; + } public String getSource() { return source; @@ -499,10 +522,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.dataStatus = dataStatus; } - /** - * 是否分配社区 - */ - private Boolean isNull; + public Integer[] getOrServiceStatus() { @@ -545,12 +565,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.mphone = mphone; } - private String areaId; - - private String provinceId; - - private String cityId; - private String streetId; public String getStreetId() { return streetId; @@ -836,6 +850,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("liveType", liveType, MongoOper.IS); } + if (null != deliverOrg) { + condition = condition.and("deliverOrg", deliverOrg, MongoOper.IS); + } + if (null != buildType) { condition = condition.and("buildType", buildType, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 04b8623..bbb41a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -227,6 +227,7 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "vcCardNo", required = false) String vcCardNo, @RequestParam(value = "liveType", required = false) String liveType, @RequestParam(value = "isArea", required = false) String isArea, + @RequestParam(value = "hospitalId", required = false) String fmHospitalId, @RequestParam(value = "endCase", required = false) Integer endCase ) { @@ -239,6 +240,7 @@ public class BabyBuildController extends BaseController { } LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); BabyManageRequest request = new BabyManageRequest(); + request.setFmHospitalId(fmHospitalId); request.setVcCardNo(vcCardNo); request.setWeakSonInfos(weakSonInfos); request.setHighRiskInfos(highRiskInfos); @@ -316,9 +318,11 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "hospitalCityId", required = false) String hospitalCityId, @RequestParam(value = "hospitalAreaId", required = false) String hospitalAreaId, @RequestParam(value = "hospitalId", required = false) String hospitalId, + @RequestParam(value = "hospitalId", required = false) String fmHospitalId, @RequestParam(value = "isArea", required = false) String isArea) { LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); BabyManageRequest request = new BabyManageRequest(); + request.setFmHospitalId(fmHospitalId); request.setQueryNo(queryNo); request.setBcardNo(bcardNo); request.setMcardNo(mcardNo); 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 13e3ef3..3f5d140 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 @@ -2116,6 +2116,8 @@ public class BabyBookbuildingFacade { babyQuery.setLiveType(request.getLiveType()); + babyQuery.setDeliverOrg(request.getFmHospitalId()); + if (String.valueOf("true").equals(request.getIsArea())) { List list = new ArrayList(); list.add("1");//转诊，建档已接受 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 59d9977..355610a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -663,8 +663,8 @@ public class MatDeliverFacade { babyModel.setDueDate(patients.getDueDate()); babyModel.setDueType(patients.getDueType()); babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29"); - babyModel.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); - babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); +// babyModel.setServiceStatus(ServiceStatusEnums.NO_OPEN.getId()); +// babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); babyModel.setCreated(new Date()); babyModel.setModified(new Date()); if (null != deliverAddRequest.getDueDate()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 563708b..4ade298 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -89,6 +89,17 @@ public class BabyManageRequest extends BaseQuery { //结案 private Integer endCase; + //分娩医院 + private String fmHospitalId; + + public String getFmHospitalId() { + return fmHospitalId; + } + + public void setFmHospitalId(String fmHospitalId) { + this.fmHospitalId = fmHospitalId; + } + public Integer getEndCase() { return endCase; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index dd8539b..5279877 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -512,6 +512,80 @@ public class AntexChuResult { private String pregnancyExcpetion; + // 乙肝表面抗原 + private String ygbmkyValue; + //乙肝表面抗体 + private String ygbmktValue; + //乙肝e抗原 + private String ygekyValue; + // 乙肝e抗体 + private String ygektValue; + // 乙肝核心抗体 + private String yghxktValue; + + + //hit抗体检测 + private String hivktValue; + + //实验结果 + private String syjgValue; + + public String getYgbmkyValue() { + return ygbmkyValue; + } + + public void setYgbmkyValue(String ygbmkyValue) { + this.ygbmkyValue = ygbmkyValue; + } + + public String getYgbmktValue() { + return ygbmktValue; + } + + public void setYgbmktValue(String ygbmktValue) { + this.ygbmktValue = ygbmktValue; + } + + public String getYgekyValue() { + return ygekyValue; + } + + public void setYgekyValue(String ygekyValue) { + this.ygekyValue = ygekyValue; + } + + public String getYgektValue() { + return ygektValue; + } + + public void setYgektValue(String ygektValue) { + this.ygektValue = ygektValue; + } + + public String getYghxktValue() { + return yghxktValue; + } + + public void setYghxktValue(String yghxktValue) { + this.yghxktValue = yghxktValue; + } + + public String getHivktValue() { + return hivktValue; + } + + public void setHivktValue(String hivktValue) { + this.hivktValue = hivktValue; + } + + public String getSyjgValue() { + return syjgValue; + } + + public void setSyjgValue(String syjgValue) { + this.syjgValue = syjgValue; + } + public String getfTthree() { return fTthree; } @@ -1814,7 +1888,7 @@ public class AntexChuResult { setCervical(antExChuModel.getCervical()); setUterus(antExChuModel.getUterus()); setFujian(antExChuModel.getFujian()); - setYghxkt(antExChuModel.getYghxkt()); + setPregnancyTimes(antExChuModel.getPregnancyTimes()); setProdTime(antExChuModel.getProdTime()); setDelivery(antExChuModel.getDelivery()); @@ -1898,9 +1972,21 @@ public class AntexChuResult { setYgbmkt(antExChuModel.getYgbmkt()); setYgeky(antExChuModel.getYgeky()); setYgekt(antExChuModel.getYgekt()); + setYghxkt(antExChuModel.getYghxkt()); + setXqjq(antExChuModel.getXqjq()); setXnsd(antExChuModel.getXnsd()); setHivkt(antExChuModel.getHivkt()); + + setYgbmkyValue(antExChuModel.getYgbmkyValue()); + setYgbmktValue(antExChuModel.getYgbmktValue()); + setYgekyValue(antExChuModel.getYgekyValue()); + setYgektValue(antExChuModel.getYgektValue()); + setYghxktValue(antExChuModel.getYghxktValue()); + + setHivktValue(antExChuModel.getHivktValue()); + setSyjgValue(antExChuModel.getSyjgValue()); + setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class)); setYdqjd(antExChuModel.getYdqjd()); if (null != antExChuModel.getDueDate()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index caff232..551a39b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -71,6 +71,17 @@ public class BabyManageListResult { private String endCaseTime; + //分娩机构 + private String fmHospitalName; + + public String getFmHospitalName() { + return fmHospitalName; + } + + public void setFmHospitalName(String fmHospitalName) { + this.fmHospitalName = fmHospitalName; + } + public String getEndCase() { return endCase; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index 05dc2bc..a1e3f52 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -156,6 +156,19 @@ public class BabyListTask implements Callable { } } result.setDiagnose(StringUtils.emptyDeal(diagnose)); + + + String fmHospitalName = ""; + if (StringUtils.isNum(model.getDeliverOrg())) + { + fmHospitalName = organizationService.getOrganization(Integer.valueOf(model.getDeliverOrg())).getName(); + } + else + { + fmHospitalName = model.getDeliverOrg() == null ? "" : model.getDeliverOrg(); + } + result.setFmHospitalName(fmHospitalName); + list.add(result); } }