From e0f9318cc5415e567d62a2265239faefb04a1d34 Mon Sep 17 00:00:00 2001 From: shiyang Date: Thu, 24 Mar 2022 17:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E5=84=BF=E4=BF=9D-=E5=84=BF?= =?UTF-8?q?=E7=AB=A5=E7=AE=A1=E7=90=86=E7=89=99=E9=BD=BF2=E9=A1=B9?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=94=B9=E7=94=A8=E6=96=B0=E5=8F=A3=E8=85=94?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyModel.java | 156 ++++++++++++++++++++- .../java/com/lyms/platform/pojo/BabyOralCheck.java | 32 ++--- .../com/lyms/platform/query/BabyModelQuery.java | 19 ++- .../lyms/platform/query/BabyOralCheckQuery.java | 10 +- .../operate/web/facade/BabyBookbuildingFacade.java | 53 +++---- .../operate/web/facade/BabyOralCheckFacade.java | 2 + 6 files changed, 222 insertions(+), 50 deletions(-) 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 700b240..c0411ae 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 @@ -746,7 +746,7 @@ public class BabyModel extends BaseModel { //隆化-口腔检查同步数据 /** - * 检查记录状态（同步字段，最后一次检查的id） + * 检查记录状态（同步字段） * 这里查询关于口腔的数据必须要这个字段 */ private Integer oralCheckYn; @@ -778,26 +778,170 @@ public class BabyModel extends BaseModel { */ private List oralHighRisk; /** - * 龋齿 + * 出牙数状态状态(同步字段 1正常2异常) + */ + private String ycsz; + /** + * 出牙数(同步字段 ) + */ + private String ycszCount; + /** + * 龋齿(同步字段) */ private String qc; /** - * 护齿 + * 护齿(同步字段) */ private String hc; /** - * 窝沟封闭 + * 窝沟封闭(同步字段) */ private String wgfb; /** - * 检查月龄套餐 + * 检查月龄套餐(同步字段) */ private String oralCheckMonthId; /** - * 检查月龄 + * 检查月龄(同步字段) */ private String oralCheckMonthAge; + /*************************************************************************************/ + //隆化-眼保健检查同步字段 + + /** + * _id（同步字段，最后一次检查的id lhEyeCheckId） + */ + private String lhEyeCheckId; + + /** + * 记录删除状态0：删除 1：正常（同步字段 lheyeCheckYn） + */ + private Integer lheyeCheckYn; + + /** + * 检查月龄 （同步字段 lhEyeCheckMonthAge） + */ + private String lhEyeCheckMonthAge; + + /** + * 检查月龄套餐（同步字段 lhEyeCheckMonthId） + */ + private String lhEyeCheckMonthId; + + /** + * 检查时间（同步字段 lhEyeCheckTime） + */ + private Date lhEyeCheckTime; + + /** + * 预约下次检查时间(同步字段 lhNextEyeCheckTime) + */ + private Date lhNextEyeCheckTime; + + /** + * 检查医生（同步字段 lhEyeCheckDoctor） + */ + private String lhEyeCheckDoctor; + + /** + * 阳性状态1:正常 2:阳性（同步字段 lhEyePositiveType） + */ + private String lhEyePositiveType; + + /** + * 高危(同步字段 lhEyeHighRisk) + */ + private List lhEyeHighRisk; + + public String getLhEyeCheckId() { + return lhEyeCheckId; + } + + public void setLhEyeCheckId(String lhEyeCheckId) { + this.lhEyeCheckId = lhEyeCheckId; + } + + public Integer getLheyeCheckYn() { + return lheyeCheckYn; + } + + public void setLheyeCheckYn(Integer lheyeCheckYn) { + this.lheyeCheckYn = lheyeCheckYn; + } + + public String getLhEyeCheckMonthAge() { + return lhEyeCheckMonthAge; + } + + public void setLhEyeCheckMonthAge(String lhEyeCheckMonthAge) { + this.lhEyeCheckMonthAge = lhEyeCheckMonthAge; + } + + public String getLhEyeCheckMonthId() { + return lhEyeCheckMonthId; + } + + public void setLhEyeCheckMonthId(String lhEyeCheckMonthId) { + this.lhEyeCheckMonthId = lhEyeCheckMonthId; + } + + public Date getLhEyeCheckTime() { + return lhEyeCheckTime; + } + + public void setLhEyeCheckTime(Date lhEyeCheckTime) { + this.lhEyeCheckTime = lhEyeCheckTime; + } + + public Date getLhNextEyeCheckTime() { + return lhNextEyeCheckTime; + } + + public void setLhNextEyeCheckTime(Date lhNextEyeCheckTime) { + this.lhNextEyeCheckTime = lhNextEyeCheckTime; + } + + public String getLhEyeCheckDoctor() { + return lhEyeCheckDoctor; + } + + public void setLhEyeCheckDoctor(String lhEyeCheckDoctor) { + this.lhEyeCheckDoctor = lhEyeCheckDoctor; + } + + public String getLhEyePositiveType() { + return lhEyePositiveType; + } + + public void setLhEyePositiveType(String lhEyePositiveType) { + this.lhEyePositiveType = lhEyePositiveType; + } + + public List getLhEyeHighRisk() { + return lhEyeHighRisk; + } + + public void setLhEyeHighRisk(List lhEyeHighRisk) { + this.lhEyeHighRisk = lhEyeHighRisk; + } + + public String getYcsz() { + return ycsz; + } + + public void setYcsz(String ycsz) { + this.ycsz = ycsz; + } + + public String getYcszCount() { + return ycszCount; + } + + public void setYcszCount(String ycszCount) { + this.ycszCount = ycszCount; + } + public String getOralCheckMonthAge() { return oralCheckMonthAge; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java index 126bd93..8d29cb1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java @@ -19,9 +19,8 @@ import java.util.Map; */ @Document(collection = "lyms_baby_oral_check") public class BabyOralCheck extends BaseModel { - private static final long serialVersionUID = SerialIdEnum.BabyEyeCheck.getCid(); /** - * _id + * _id （同步字段，最后一次检查的id oralCheckId） */ private String id; @@ -95,11 +94,11 @@ public class BabyOralCheck extends BaseModel { */ private String pid; /** - * 检查月龄 + * 检查月龄（同步字段 oralCheckMonthAge） */ private String checkMonthAge; /** - * 检查月龄套餐 + * 检查月龄套餐（同步字段 oralCheckMonthId） */ private String checkMonthId; /** @@ -116,12 +115,12 @@ public class BabyOralCheck extends BaseModel { private String schoolId; /** - * 检查时间（同步字段） + * 检查时间（同步字段oralCheckTime） */ private Date oralCheckTime; /** - * 预约下次检查时间(同步字段) + * 预约下次检查时间(同步字段 nextOralCheckTime) */ private Date nextOralCheckTime; /** @@ -130,16 +129,16 @@ public class BabyOralCheck extends BaseModel { private String nextCheckMonthId; /** - * 检查医生（同步字段） + * 检查医生（同步字段 oralCheckDoctor） */ private String oralCheckDoctor; /** - * 阳性状态1:正常 2:阳性（同步字段） + * 阳性状态1:正常 2:阳性（同步字段positiveType） */ private String positiveType; /** - * 口腔高危(同步字段) + * 口腔高危(同步字段oralHighRisk) */ private List oralHighRisk; /** @@ -152,20 +151,23 @@ public class BabyOralCheck extends BaseModel { private String oralIllness; /** - * 牙齿生长数量 + * 牙齿生长数量 1正常2异常(同步字段 ycsz) */ private String ycsz; + /** + * 出牙数(同步字段 ycszCount) + */ private String ycszCount; /** - * 护齿 + * 护齿(同步字段 hc) */ private String hc; /** - * 窝沟封闭 + * 窝沟封闭(同步字段 wgfb) */ private String wgfb; /** - * 龋齿 + * 龋齿(同步字段 qc) */ private String qc; private String qcText; @@ -309,10 +311,6 @@ public class BabyOralCheck extends BaseModel { this.birth = birth; } - public static long getSerialVersionUID() { - return serialVersionUID; - } - public String getId() { return id; } 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 fd5c429..2b84b07 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 @@ -1365,7 +1365,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { */ private List oralHighRisk; /** - * 龋齿从几开始(个数) + * 龋齿从几开始(个数),儿童管理模块龋齿异常筛选:传1表示大于等于1的都算异常龋齿（大于0的都是异常） */ private String qcStart; /** @@ -1393,6 +1393,20 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { */ private Integer queryMonthAgeEnd; + /** + * 牙齿生长数量 1正常2异常 + */ + private String ycsz; + + + public String getYcsz() { + return ycsz; + } + + public void setYcsz(String ycsz) { + this.ycsz = ycsz; + } + public Integer getOralCheckYn() { return oralCheckYn; } @@ -1982,6 +1996,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != oralCheckYn) { condition = condition.and("oralCheckYn", oralCheckYn, MongoOper.IS); } + if (StringUtils.isNotEmpty(ycsz)) { + condition = condition.and("ycsz", ycsz, MongoOper.IS); + } Criteria c = null; if (null != birthStart) { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java index 33e637a..2a9aa53 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java @@ -118,10 +118,15 @@ public class BabyOralCheckQuery extends BaseQuery implements IConvertToNativeQue private List oralHighRisk; /** - * 牙齿生长数量 + * 牙齿生长数量-1正常2异常 */ private String ycsz; + + /** + * 出牙数 + */ private String ycszCount; + /** * 护齿（1已做/2未做） */ @@ -239,6 +244,9 @@ public class BabyOralCheckQuery extends BaseQuery implements IConvertToNativeQue if (StringUtils.isNotEmpty(wgfb)) { condition = condition.and("wgfb", wgfb, MongoOper.IS); } + if (StringUtils.isNotEmpty(ycsz)) { + condition = condition.and("ycsz", ycsz, MongoOper.IS); + } Criteria c = null; 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 df9be61..5f84282 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 @@ -3399,15 +3399,18 @@ public class BabyBookbuildingFacade { babyQuery.setQueryNo(request.getQueryNo()); //滦平、隆化-儿保管理-全部 加健康/高危筛选 babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null); + //用隆华新口腔模块中数据筛选 牙齿异常2项 + babyQuery.setYcsz(null!=request.getCyNumType()?request.getCyNumType().toString():""); + babyQuery.setQcStart(null!=request.getQcNumType()?2==request.getCyNumType()?"1":"":""); System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString()); - //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选 + //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选(这里牙齿异常2项不用了，用隆华新做的口腔模块代替) if(StringUtils.isNotEmpty(request.getMildAnaemia())||StringUtils.isNotEmpty(request.getModerateAnaemia())|| - StringUtils.isNotEmpty(request.getHeartMurmur())||null!=request.getCyNumType()||null!=request.getQcNumType()){ + StringUtils.isNotEmpty(request.getHeartMurmur())){//||null!=request.getCyNumType()||null!=request.getQcNumType() final String mildAnaemia=request.getMildAnaemia(); final String moderateAnaemia=request.getModerateAnaemia(); final String heartMurmur=request.getHeartMurmur(); - final Integer cyNumType=request.getCyNumType(); - final Integer qcNumType=request.getQcNumType(); +// final Integer cyNumType=request.getCyNumType(); +// final Integer qcNumType=request.getQcNumType(); List list=babyBookbuildingService.queryBabyBuildByCond(babyQuery); Set data = new HashSet<>(); int batchSize = 20; @@ -3436,27 +3439,27 @@ public class BabyBookbuildingFacade { if (StringUtils.isNotEmpty(heartMurmur)) { query.addCriteria(Criteria.where("heartMurmur").is(heartMurmur)); } - if (null != cyNumType) { - if (cyNumType == 1) {//正常 - Criteria criteria = new Criteria(); - Criteria criteria1 = Criteria.where("cyNumType").is(cyNumType); - Criteria criteria2 = Criteria.where("cyNumType").exists(false); - criteria.orOperator(criteria2, criteria1); - query.addCriteria(criteria1);//如需兼容历史数据用criteria。没有该字段的暂时默认正常 - } - if (cyNumType == 2) {//异常 - query.addCriteria(Criteria.where("cyNumType").is(cyNumType)); - } - } - if (null != qcNumType) { - if (qcNumType == 2) {//异常 - //字符串判断大小 - String formatQcNum = String.format("function() {\n" + - " return this.qcNum > %s \n" + - " }", "0"); - query.addCriteria(Criteria.where("$where").is(formatQcNum)); - } - } +// if (null != cyNumType) { +// if (cyNumType == 1) {//正常 +// Criteria criteria = new Criteria(); +// Criteria criteria1 = Criteria.where("cyNumType").is(cyNumType); +// Criteria criteria2 = Criteria.where("cyNumType").exists(false); +// criteria.orOperator(criteria2, criteria1); +// query.addCriteria(criteria1);//如需兼容历史数据用criteria。没有该字段的暂时默认正常 +// } +// if (cyNumType == 2) {//异常 +// query.addCriteria(Criteria.where("cyNumType").is(cyNumType)); +// } +// } +// if (null != qcNumType) { +// if (qcNumType == 2) {//异常 +// //字符串判断大小 +// String formatQcNum = String.format("function() {\n" + +// " return this.qcNum > %s \n" + +// " }", "0"); +// query.addCriteria(Criteria.where("$where").is(formatQcNum)); +// } +// } BabyCheckModel checkModel = mongoTemplate.findOne(query, BabyCheckModel.class); if (null != checkModel) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java index 6759c14..bad7fe6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java @@ -127,6 +127,8 @@ public class BabyOralCheckFacade { update.set("hc",babyOralCheck.getHc() ); update.set("wgfb",babyOralCheck.getWgfb() ); update.set("oralCheckMonthAge",babyOralCheck.getCheckMonthAge() ); + update.set("ycsz",babyOralCheck.getYcsz() ); + update.set("ycszCount",babyOralCheck.getYcszCount() ); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyOralCheck.getBabyId())), update, BabyModel.class); } -- 1.8.3.1