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 3a44ded..bb6c199 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 @@ -101,7 +101,15 @@ public class BabyModel extends BaseModel { * 小孩名称 */ private String name; + /** + * 1, "有效",0, "无效" + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效 + */ private Integer yn; + /** + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0 + */ + private Integer dataStatus; //预产期 private Date dueDate; //分娩方式 @@ -307,6 +315,14 @@ public class BabyModel extends BaseModel { //其他(写明病名并详细描述) private Map jxOther; + public Integer getDataStatus() { + return dataStatus; + } + + public void setDataStatus(Integer dataStatus) { + this.dataStatus = dataStatus; + } + public List getBabyHighRiskReason() { return babyHighRiskReason; } 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 a6c017f..edd1916 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 @@ -89,6 +89,11 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private int yn = -1; + /** + * 数据状态 true:排除孕妇分娩自动建档 + */ + private boolean dataStatus = false; + //母亲证件号 private String mcertNo; @@ -286,6 +291,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.buildType = buildType; } + public boolean isDataStatus() { + return dataStatus; + } + + public void setDataStatus(boolean dataStatus) { + this.dataStatus = dataStatus; + } + /** * 是否分配社区 */ @@ -605,6 +618,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); } + + if (dataStatus) {//分娩自动建档 + condition = condition.and("dataStatus", 1, MongoOper.NE); + } 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 fcd54e7..b50e71c 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 @@ -214,7 +214,6 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "hospitalId",required = false) String hospitalId, @RequestParam(value = "isArea",required = false) String isArea){ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - BabyManageRequest request = new BabyManageRequest(); request.setShowDetail(showDetail); request.setBuildDoctor(buildDoctor); 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 0d74f83..9d7fe30 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 @@ -1028,6 +1028,7 @@ public class BabyBookbuildingFacade { private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) { // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段 BabyModel bm = new BabyModel(); + bm.setDataStatus(0); bm.setFileCode(b.getFileCode()); bm.setBabyHighRiskReason(b.getBabyHighRiskReason()); bm.setmHighRiskReason(b.getmHighRiskReason()); @@ -1269,6 +1270,8 @@ public class BabyBookbuildingFacade { */ private BabyBuildResult getBabyBuildResult(BabyModel model) { BabyBuildResult result = new BabyBuildResult(); + result.setYn(model.getYn()); + result.setDataStatus(model.getDataStatus()); result.setFileCode(model.getFileCode()); result.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason())); result.setBabyHighRiskReason(mongoUtil.findColor(model.getBabyHighRiskReason())); @@ -1926,8 +1929,7 @@ public class BabyBookbuildingFacade { public HighScoreResult queryRisk(List id, boolean n) { HighScoreResult highScoreResult = new HighScoreResult(); - BasicConfigQuery - basicConfigQuery = new BasicConfigQuery(); + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); List data = new ArrayList(); List dat1a = new ArrayList(); Integer score = null; @@ -2031,6 +2033,7 @@ public class BabyBookbuildingFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setQueryNo(request.getQueryNo()); + babyQuery.setDataStatus(true);//排除自动建档数据 //体弱儿详情 babyQuery.setWeakSonInfo(request.getWeakSonInfo()); //高危儿详情 @@ -2272,7 +2275,7 @@ public class BabyBookbuildingFacade { babyQuery.setLimit(request.getLimit()); //0 非高危 1 高危 2 全部 3、体弱儿 - if (request.getHighRiskType() != null && request.getHighRiskType() ==1) { + if (request.getHighRiskType() != null) { if (request.getHighRiskType() ==1) { babyQuery.setLastHighRisk(1); }else if (request.getHighRiskType() ==3) { @@ -2453,6 +2456,8 @@ public class BabyBookbuildingFacade { BabyModel babyModel = models.get(0); result = new BabyBuildResult(); + result.setYn(babyModel.getYn()); + result.setDataStatus(babyModel.getDataStatus()); result.setMommyName(babyModel.getMname()); result.setMommyCertificateTypeId(babyModel.getMcertTypeId()); result.setMommyCertificateNum(babyModel.getMcertNo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index fca0c59..8416fab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -767,6 +767,8 @@ public class BabyCheckFacade { List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if (models != null && models.size() > 0) { model = models.get(0); + base.setYn(model.getYn()); + base.setDataStatus(model.getDataStatus()); base.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason())); base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid())); base.setId(id); 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 16d72b8..332cd56 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 @@ -130,8 +130,15 @@ public class BabyBookbuildingAddRequest { private String homeCityId; private String homeAreaId; private String homeStreetId; - - + /** + * 1, "有效",0, "无效" + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效 + */ + private Integer yn; + /** + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0 + */ + private Integer dataStatus; /***********儿童出生信息***********/ //分娩日期 @@ -307,6 +314,21 @@ public class BabyBookbuildingAddRequest { //档案编号 滦平需求 private String fileCode; + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Integer getDataStatus() { + return dataStatus; + } + + public void setDataStatus(Integer dataStatus) { + this.dataStatus = dataStatus; + } public boolean isJxWn() { return jxWn; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index b830734..f8bed73 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -53,6 +53,31 @@ public class BabyBasicResult { private Integer dueWeek; //预产期 private String dueDate; + /** + * 1, "有效",0, "无效" + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效 + */ + private Integer yn; + /** + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0 + */ + private Integer dataStatus; + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Integer getDataStatus() { + return dataStatus; + } + + public void setDataStatus(Integer dataStatus) { + this.dataStatus = dataStatus; + } public String getDueDate() { return dueDate; 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 9f24542..5a49103 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 @@ -85,6 +85,15 @@ public class BabyBuildResult { private String homeCityId; private String homeAreaId; private String homeStreetId; + /** + * 1, "有效",0, "无效" + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效 + */ + private Integer yn; + /** + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0 + */ + private Integer dataStatus; /***********儿童出生信息***********/ @@ -255,6 +264,22 @@ public class BabyBuildResult { //显示服务信息 private List patientSerResults; + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Integer getDataStatus() { + return dataStatus; + } + + public void setDataStatus(Integer dataStatus) { + this.dataStatus = dataStatus; + } + public List getHighRiskInfo() { return highRiskInfo; }