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 4ce55de..745056e 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 @@ -388,6 +388,17 @@ public class BabyModel extends BaseModel { private String cjfy;//刺激反应 private String zl;//张力 + //居住类别 + private String liveType; + + public String getLiveType() { + return liveType; + } + + public void setLiveType(String liveType) { + this.liveType = liveType; + } + public String getHx() { return hx; } 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 0c49f2c..83275ea 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 @@ -61,7 +61,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //畸形key private String deformityKey; - + //居住类别 + private String liveType; /** * 母亲的id @@ -772,7 +773,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } - + if (null != liveType) { + condition = condition.and("liveType", liveType, MongoOper.IS); + } if (null != buildType) { condition = condition.and("buildType", buildType, MongoOper.IS); @@ -1075,6 +1078,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { return condition.toMongoQuery(); } + public String getLiveType() { + return liveType; + } + + public void setLiveType(String liveType) { + this.liveType = liveType; + } + public String getMcertNo() { return mcertNo; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 35b3b0c..60a7793 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -29,6 +29,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String husbandPhone; + //居住类别 + private String liveType; /** * 关键字 */ @@ -363,6 +365,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("provinceRegisterId", noProvinceRegisterId, MongoOper.NE); } + if (null != liveType) { + condition = condition.and("pliveTypeId", liveType, MongoOper.NE); + } + if (null != sendCareMan) { condition = condition.and("sendCareMan", sendCareMan, MongoOper.IS); } @@ -986,6 +992,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } + public String getLiveType() { + return liveType; + } + + public void setLiveType(String liveType) { + this.liveType = liveType; + } + public String getPcensusTypeId() { return pcensusTypeId; } 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 f67b452..43a4672 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 @@ -217,6 +217,7 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId, @RequestParam(value = "hospitalId",required = false) String hospitalId, @RequestParam(value = "vcCardNo",required = false) String vcCardNo, + @RequestParam(value = "liveType",required = false) String liveType, @RequestParam(value = "isArea",required = false) String isArea) { if (CollectionUtils.isNotEmpty(highRiskInfos)){ 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 31aff07..d3dfe76 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 @@ -1053,6 +1053,7 @@ public class BabyBookbuildingFacade { bm.setDataStatus(0); } + bm.setLiveType(b.getLiveType()); bm.setFileCode(b.getFileCode()); bm.setBabyHighRiskReason(b.getBabyHighRiskReason()); bm.setmHighRiskReason(b.getmHighRiskReason()); @@ -2128,6 +2129,8 @@ public class BabyBookbuildingFacade { //多项体弱儿因素查询 babyQuery.setHighRiskInfos(request.getHighRiskInfos()); + babyQuery.setLiveType(request.getLiveType()); + 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/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index cc1f1e2..cd8df00 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -243,6 +243,8 @@ public class PatientFacade { patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); patientsQuery.setNotEnable(riskPatientsQueryRequest.getNotEnable()); + patientsQuery.setLiveType(riskPatientsQueryRequest.getLiveType()); + //设置为孕妇 patientsQuery.setType(type); @@ -1118,6 +1120,8 @@ public class PatientFacade { PatientManagerResult patientManagerResult = new PatientManagerResult(); PatientsQuery patientsQuery = new PatientsQuery(); + + patientsQuery.setLiveType(patientManagerRequest.getLiveType()); patientsQuery.setAssistUserId(patientManagerRequest.getAssistUserId()); patientsQuery.setSendCareMan(patientManagerRequest.getSendCareMan()); if (patientManagerRequest.getBuildWeekStart() != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index cf4444e..ff4f732 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4018,6 +4018,9 @@ public class ViewFacade { result.setMommyProfessionType(getBasicConfig(model.getMproTypeId())); + + result.setLiveType(getBasicConfig(model.getLiveType())); + result.setFatherLevel(getBasicConfig(model.getfLevelId())); result.setFatherProfessionType(getBasicConfig(model.getFproTypeId())); if (StringUtils.isNotEmpty(model.getDeliverOrg())) { 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 18a1c51..260e6a2 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 @@ -88,6 +88,9 @@ public class BabyBookbuildingAddRequest { //母亲备注 private String mremark; + //居住类别 + private String liveType; + /***********父亲基本信息***********/ @@ -317,6 +320,14 @@ public class BabyBookbuildingAddRequest { //档案编号 滦平需求 private String fileCode; + public String getLiveType() { + return liveType; + } + + public void setLiveType(String liveType) { + this.liveType = liveType; + } + public Integer getDueDay() { return dueDay; } 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 ad8217a..10bbcec 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 @@ -83,6 +83,17 @@ public class BabyManageRequest extends BaseQuery { private String vcCardNo; + //居住类别 + private String liveType; + + public String getLiveType() { + return liveType; + } + + public void setLiveType(String liveType) { + this.liveType = liveType; + } + public String getVcCardNo() { return vcCardNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index 2077006..f0a05ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -87,6 +87,17 @@ public class PatientManagerRequest extends BasePageQueryRequest { //辅助建档医生id private String assistUserId; + //居住类别 + private String liveType; + + public String getLiveType() { + return liveType; + } + + public void setLiveType(String liveType) { + this.liveType = liveType; + } + public String getAssistUserId() { return assistUserId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index c2be7ee..d5b5b7c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -156,6 +156,9 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //1-需要隐藏姓名、电话、地址 private int showDetail; + //居住类别 + private String liveType; + /** * 排序策略枚举 */ @@ -287,6 +290,14 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { } + public String getLiveType() { + return liveType; + } + + public void setLiveType(String liveType) { + this.liveType = liveType; + } + //分娩年龄 private Integer fmStartAge; private Integer fmEndAge; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 59e87f5..65e5050 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -256,6 +256,17 @@ public class BabyPageResult implements IBasicResultConvert