jiangjiazhi / regional-platform

Download as
Browse Code »

Commit cc930b1c3d9244b27491600ecdcf3e53939907e0

Authored by yangfei
1 parent fb945686eb
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

超过20周（21周及以后），产筛应该是X

Showing 1 changed file with 19 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ cc930b1
... ... @@ -178,9 +178,14 @@
178 178 List<SieveResultModel> sb = sieveService.queryListSieveResult(sieveResultQuery);
179 179 if (CollectionUtils.isNotEmpty(sb)) {
180 180 temp.put("cqsc", 1);//产前筛查
181   - } else if (patients.getType() == 3) {
182   - {//已经分娩，就是X
183   - temp.put("cqsc", 2);//产前筛查
  181 + } else {
  182 + if (patients.getType() == 3) {//已经分娩，就是X
  183 + temp.put("cqsc", 2);//产前筛查){
  184 + }else{//未分娩，
  185 + int week = DateUtil.getWeek2(patients.getLastMenses(),new Date());
  186 + if(week>20){//不能做产前筛查追访，产前检查追访
  187 + temp.put("cqsc", 2);//未做产筛
  188 + }
184 189 }
185 190 }
186 191 }
... ... @@ -294,9 +299,14 @@
294 299 List<SieveResultModel> sb = sieveService.queryListSieveResult(sieveResultQuery);
295 300 if (CollectionUtils.isNotEmpty(sb)) {
296 301 temp.put("cqsc", 1);//产前筛查
297   - } else if (patient.getType() == 3) {
298   - {//已经分娩，就是X
299   - temp.put("cqsc", 2);//产前筛查
  302 + } else {
  303 + if (patient.getType() == 3) {//已经分娩，就是X
  304 + temp.put("cqsc", 2);//产前筛查){
  305 + }else{//未分娩，
  306 + int week = DateUtil.getWeek2(patient.getLastMenses(),new Date());
  307 + if(week>20){//不能做产前筛查追访，产前检查追访
  308 + temp.put("cqsc", 2);//未做产筛
  309 + }
300 310 }
301 311 }
302 312  
303 313  
304 314  
... ... @@ -355,21 +365,21 @@
355 365  
356 366 if ((int) map.get("cqsc") == 3) {//产前筛查
357 367 //如果当前流程已经结束流程，则显示X
358   - if (trackDownRecord.getTrackType()!=9&&trackDownRecord.getTrackType() > TrackDownDateEnums.C.getId()) {
  368 + if (trackDownRecord.getTrackType() != 8 && trackDownRecord.getTrackType() != 9 && trackDownRecord.getTrackType() > TrackDownDateEnums.C.getId()) {
359 369 map.put("cqsc", 2);
360 370 }
361 371 }
362 372  
363 373 if ((int) map.get("fm") == 3) {//分娩
364 374 //如果当前流程已经结束流程，则显示X
365   - if (trackDownRecord.getTrackType() != 8&&trackDownRecord.getTrackType() != 9&&trackDownRecord.getTrackType() > TrackDownDateEnums.E.getId()) {
  375 + if (trackDownRecord.getTrackType() != 8 && trackDownRecord.getTrackType() != 9 && trackDownRecord.getTrackType() > TrackDownDateEnums.E.getId()) {
366 376 map.put("fm", 2);
367 377 }
368 378 }
369 379  
370 380 if ((int) map.get("chfc") == 3) {//产后复查
371 381 //如果当前流程已经结束流程，则显示X
372   - if (trackDownRecord.getTrackType() != 8&&trackDownRecord.getTrackType() != 9&&trackDownRecord.getTrackType() > TrackDownDateEnums.F.getId()) {
  382 + if (trackDownRecord.getTrackType() != 8 && trackDownRecord.getTrackType() != 9 && trackDownRecord.getTrackType() > TrackDownDateEnums.F.getId()) {
373 383 map.put("chfc", 2);
374 384 }
375 385 }