From edeedd891c7ea78f3a385475e5c09554dcdf32c4 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 8 Sep 2022 09:15:39 +0800 Subject: [PATCH] update --- .../biz/service/BabyBookbuildingService.java | 63 ++++++++++++---------- .../lyms/platform/query/BabyCheckModelQuery.java | 13 +++++ 2 files changed, 49 insertions(+), 27 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 6411a3d..c9e389f 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 @@ -34,7 +34,8 @@ public class BabyBookbuildingService { private PatientsService patientsService; @Autowired private BabyBuildClassifyService babyBuildClassifyService; - + @Autowired + private BabyCheckService babyCheckService; @Autowired private MongoTemplate mongoTemplate; @@ -233,32 +234,40 @@ public class BabyBookbuildingService { MongoQuery query = babyQuery.convertToQuery(); List babyModelList = babyBookBuildingDao.queryBabyWithQuery(query); for (BabyModel babyModel : babyModelList) { - //防止重复 - BabyBuildClassifyQuery classifyQuery=new BabyBuildClassifyQuery(); - classifyQuery.setBabyId(babyModel.getId()); - classifyQuery.setMonthAge(MonthAgeTropeEnum.getMonthAgeById(i)); - classifyQuery.setYn(YnEnums.YES.getId()); - List classifyModelList = babyBuildClassifyService.queryList(classifyQuery, null, null); - if(CollectionUtils.isEmpty(classifyModelList)) { - //保存 - try { - BabyBuildClassifyModel ClassifyModel = new BabyBuildClassifyModel(); - ClassifyModel.setHospitalId(babyModel.getHospitalId()); - ClassifyModel.setMonthAge(MonthAgeTropeEnum.getMonthAgeById(i)); - ClassifyModel.setBabyBuildDate(babyModel.getBuildDate()); - ClassifyModel.setBabyId(babyModel.getId()); - ClassifyModel.setIsCheck(1); - ClassifyModel.setName(babyModel.getName()); - ClassifyModel.setSex(babyModel.getSex()); - ClassifyModel.setBirth(babyModel.getBirth()); - ClassifyModel.setmName(babyModel.getMname()); - ClassifyModel.setmCardNo(babyModel.getMcertNo()); - ClassifyModel.setmPhone(babyModel.getMphone()); - ClassifyModel.setVcCardNo(babyModel.getVcCardNo()); - ClassifyModel.setsINCard(babyModel.getsINCard()); - babyBuildClassifyService.add(ClassifyModel); - } catch (Exception e) { - throw new RuntimeException(e); + //是否做过儿保检查 + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); + babyCheckModelQuery.setYn(YnEnums.YES.getId()); + babyCheckModelQuery.setBuildId(babyModel.getId()); + babyCheckModelQuery.setTcType(MonthAgeTropeEnum.getMonthAgeById(i)); + int babyCheckCount = babyCheckService.queryBabyCheckCount(babyCheckModelQuery); + if (babyCheckCount == 0) { + //防止重复 + BabyBuildClassifyQuery classifyQuery = new BabyBuildClassifyQuery(); + classifyQuery.setBabyId(babyModel.getId()); + classifyQuery.setMonthAge(MonthAgeTropeEnum.getMonthAgeById(i)); + classifyQuery.setYn(YnEnums.YES.getId()); + List classifyModelList = babyBuildClassifyService.queryList(classifyQuery, null, null); + if (CollectionUtils.isEmpty(classifyModelList)) { + //保存 + try { + BabyBuildClassifyModel ClassifyModel = new BabyBuildClassifyModel(); + ClassifyModel.setHospitalId(babyModel.getHospitalId()); + ClassifyModel.setMonthAge(MonthAgeTropeEnum.getMonthAgeById(i)); + ClassifyModel.setBabyBuildDate(babyModel.getBuildDate()); + ClassifyModel.setBabyId(babyModel.getId()); + ClassifyModel.setIsCheck(1); + ClassifyModel.setName(babyModel.getName()); + ClassifyModel.setSex(babyModel.getSex()); + ClassifyModel.setBirth(babyModel.getBirth()); + ClassifyModel.setmName(babyModel.getMname()); + ClassifyModel.setmCardNo(babyModel.getMcertNo()); + ClassifyModel.setmPhone(babyModel.getMphone()); + ClassifyModel.setVcCardNo(babyModel.getVcCardNo()); + ClassifyModel.setsINCard(babyModel.getsINCard()); + babyBuildClassifyService.add(ClassifyModel); + } catch (Exception e) { + throw new RuntimeException(e); + } } } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java index 5f097f2..2b35936 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java @@ -93,6 +93,8 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu //滦平儿保血红蛋白统计 private String hemoglobinStart; private String hemoglobinEnd; + // 检查套餐 + private Integer tcType; public String getHemoglobinStart() { return hemoglobinStart; @@ -189,6 +191,9 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu if(null!=hospitalId){ condition=condition.and("hospitalId", hospitalId, MongoOper.IS); } + if(null!=tcType){ + condition=condition.and("tcType", tcType, MongoOper.IS); + } if(null!=buildIds && buildIds.length > 0){ Criteria c = Criteria.where("buildId").in(Arrays.asList(buildIds)); condition.andCondition( new MongoCondition(c)); @@ -426,4 +431,12 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu public void setCheckMonth(Integer checkMonth) { this.checkMonth = checkMonth; } + + public Integer getTcType() { + return tcType; + } + + public void setTcType(Integer tcType) { + this.tcType = tcType; + } } \ No newline at end of file -- 1.8.3.1