Commit edeedd891c7ea78f3a385475e5c09554dcdf32c4
1 parent
f7ecf50fb2
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 49 additions and 27 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java
View file @
edeedd8
| ... | ... | @@ -34,8 +34,9 @@ |
| 34 | 34 | private PatientsService patientsService; |
| 35 | 35 | @Autowired |
| 36 | 36 | private BabyBuildClassifyService babyBuildClassifyService; |
| 37 | + @Autowired | |
| 38 | + private BabyCheckService babyCheckService; | |
| 37 | 39 | |
| 38 | - | |
| 39 | 40 | @Autowired |
| 40 | 41 | private MongoTemplate mongoTemplate; |
| 41 | 42 | |
| ... | ... | @@ -233,32 +234,40 @@ |
| 233 | 234 | MongoQuery query = babyQuery.convertToQuery(); |
| 234 | 235 | List<BabyModel> babyModelList = babyBookBuildingDao.queryBabyWithQuery(query); |
| 235 | 236 | for (BabyModel babyModel : babyModelList) { |
| 236 | - //防止重复 | |
| 237 | - BabyBuildClassifyQuery classifyQuery=new BabyBuildClassifyQuery(); | |
| 238 | - classifyQuery.setBabyId(babyModel.getId()); | |
| 239 | - classifyQuery.setMonthAge(MonthAgeTropeEnum.getMonthAgeById(i)); | |
| 240 | - classifyQuery.setYn(YnEnums.YES.getId()); | |
| 241 | - List<BabyBuildClassifyModel> classifyModelList = babyBuildClassifyService.queryList(classifyQuery, null, null); | |
| 242 | - if(CollectionUtils.isEmpty(classifyModelList)) { | |
| 243 | - //保存 | |
| 244 | - try { | |
| 245 | - BabyBuildClassifyModel ClassifyModel = new BabyBuildClassifyModel(); | |
| 246 | - ClassifyModel.setHospitalId(babyModel.getHospitalId()); | |
| 247 | - ClassifyModel.setMonthAge(MonthAgeTropeEnum.getMonthAgeById(i)); | |
| 248 | - ClassifyModel.setBabyBuildDate(babyModel.getBuildDate()); | |
| 249 | - ClassifyModel.setBabyId(babyModel.getId()); | |
| 250 | - ClassifyModel.setIsCheck(1); | |
| 251 | - ClassifyModel.setName(babyModel.getName()); | |
| 252 | - ClassifyModel.setSex(babyModel.getSex()); | |
| 253 | - ClassifyModel.setBirth(babyModel.getBirth()); | |
| 254 | - ClassifyModel.setmName(babyModel.getMname()); | |
| 255 | - ClassifyModel.setmCardNo(babyModel.getMcertNo()); | |
| 256 | - ClassifyModel.setmPhone(babyModel.getMphone()); | |
| 257 | - ClassifyModel.setVcCardNo(babyModel.getVcCardNo()); | |
| 258 | - ClassifyModel.setsINCard(babyModel.getsINCard()); | |
| 259 | - babyBuildClassifyService.add(ClassifyModel); | |
| 260 | - } catch (Exception e) { | |
| 261 | - throw new RuntimeException(e); | |
| 237 | + //是否做过儿保检查 | |
| 238 | + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); | |
| 239 | + babyCheckModelQuery.setYn(YnEnums.YES.getId()); | |
| 240 | + babyCheckModelQuery.setBuildId(babyModel.getId()); | |
| 241 | + babyCheckModelQuery.setTcType(MonthAgeTropeEnum.getMonthAgeById(i)); | |
| 242 | + int babyCheckCount = babyCheckService.queryBabyCheckCount(babyCheckModelQuery); | |
| 243 | + if (babyCheckCount == 0) { | |
| 244 | + //防止重复 | |
| 245 | + BabyBuildClassifyQuery classifyQuery = new BabyBuildClassifyQuery(); | |
| 246 | + classifyQuery.setBabyId(babyModel.getId()); | |
| 247 | + classifyQuery.setMonthAge(MonthAgeTropeEnum.getMonthAgeById(i)); | |
| 248 | + classifyQuery.setYn(YnEnums.YES.getId()); | |
| 249 | + List<BabyBuildClassifyModel> classifyModelList = babyBuildClassifyService.queryList(classifyQuery, null, null); | |
| 250 | + if (CollectionUtils.isEmpty(classifyModelList)) { | |
| 251 | + //保存 | |
| 252 | + try { | |
| 253 | + BabyBuildClassifyModel ClassifyModel = new BabyBuildClassifyModel(); | |
| 254 | + ClassifyModel.setHospitalId(babyModel.getHospitalId()); | |
| 255 | + ClassifyModel.setMonthAge(MonthAgeTropeEnum.getMonthAgeById(i)); | |
| 256 | + ClassifyModel.setBabyBuildDate(babyModel.getBuildDate()); | |
| 257 | + ClassifyModel.setBabyId(babyModel.getId()); | |
| 258 | + ClassifyModel.setIsCheck(1); | |
| 259 | + ClassifyModel.setName(babyModel.getName()); | |
| 260 | + ClassifyModel.setSex(babyModel.getSex()); | |
| 261 | + ClassifyModel.setBirth(babyModel.getBirth()); | |
| 262 | + ClassifyModel.setmName(babyModel.getMname()); | |
| 263 | + ClassifyModel.setmCardNo(babyModel.getMcertNo()); | |
| 264 | + ClassifyModel.setmPhone(babyModel.getMphone()); | |
| 265 | + ClassifyModel.setVcCardNo(babyModel.getVcCardNo()); | |
| 266 | + ClassifyModel.setsINCard(babyModel.getsINCard()); | |
| 267 | + babyBuildClassifyService.add(ClassifyModel); | |
| 268 | + } catch (Exception e) { | |
| 269 | + throw new RuntimeException(e); | |
| 270 | + } | |
| 262 | 271 | } |
| 263 | 272 | } |
| 264 | 273 | } |
platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java
View file @
edeedd8
| ... | ... | @@ -93,6 +93,8 @@ |
| 93 | 93 | //滦平儿保血红蛋白统计 |
| 94 | 94 | private String hemoglobinStart; |
| 95 | 95 | private String hemoglobinEnd; |
| 96 | + // 检查套餐<JCTCEnums> | |
| 97 | + private Integer tcType; | |
| 96 | 98 | |
| 97 | 99 | public String getHemoglobinStart() { |
| 98 | 100 | return hemoglobinStart; |
| ... | ... | @@ -189,6 +191,9 @@ |
| 189 | 191 | if(null!=hospitalId){ |
| 190 | 192 | condition=condition.and("hospitalId", hospitalId, MongoOper.IS); |
| 191 | 193 | } |
| 194 | + if(null!=tcType){ | |
| 195 | + condition=condition.and("tcType", tcType, MongoOper.IS); | |
| 196 | + } | |
| 192 | 197 | if(null!=buildIds && buildIds.length > 0){ |
| 193 | 198 | Criteria c = Criteria.where("buildId").in(Arrays.asList(buildIds)); |
| 194 | 199 | condition.andCondition( new MongoCondition(c)); |
| ... | ... | @@ -425,6 +430,14 @@ |
| 425 | 430 | |
| 426 | 431 | public void setCheckMonth(Integer checkMonth) { |
| 427 | 432 | this.checkMonth = checkMonth; |
| 433 | + } | |
| 434 | + | |
| 435 | + public Integer getTcType() { | |
| 436 | + return tcType; | |
| 437 | + } | |
| 438 | + | |
| 439 | + public void setTcType(Integer tcType) { | |
| 440 | + this.tcType = tcType; | |
| 428 | 441 | } |
| 429 | 442 | } |