Commit e7e9da51880bf2ba7376413a2a5bcf66a22c9291
1 parent
72d0a20fea
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 24 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
e7e9da5
| ... | ... | @@ -1082,9 +1082,9 @@ |
| 1082 | 1082 | sieveApplyOrderQuery1.setLymsSieveId(lymsSieveId);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个 |
| 1083 | 1083 | } |
| 1084 | 1084 | sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); |
| 1085 | - | |
| 1085 | + Patients pat = null; | |
| 1086 | 1086 | if (CollectionUtils.isNotEmpty(localPatients)) { |
| 1087 | - Patients pat = localPatients.get(0); | |
| 1087 | + pat = localPatients.get(0); | |
| 1088 | 1088 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); |
| 1089 | 1089 | PatientBaseResult patientBaseResult = new PatientBaseResult(); |
| 1090 | 1090 | patientBaseResult.convert(pat); |
| ... | ... | @@ -1172,9 +1172,12 @@ |
| 1172 | 1172 | result.put("nasalBone", sieveApply.getNasalBone()); |
| 1173 | 1173 | result.put("monozygous", sieveApply.getMonozygous()); |
| 1174 | 1174 | result.put("patientType", sieveApply.getPatientType()); |
| 1175 | - result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou()); | |
| 1176 | - | |
| 1177 | - | |
| 1175 | + if( pat!= null && StringUtils.isEmpty(sieveApply.getCaiyangyunzhou())){ | |
| 1176 | + yunZhouMth(sieveApply,pat); | |
| 1177 | + result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou()); | |
| 1178 | + }else { | |
| 1179 | + result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou()); | |
| 1180 | + } | |
| 1178 | 1181 | result.put("id", sieveApply.getId()); |
| 1179 | 1182 | result.put("parentId", sieveApply.getParentId()); |
| 1180 | 1183 | result.put("check", sieveApply.getCheckItem()); |
| ... | ... | @@ -1215,7 +1218,12 @@ |
| 1215 | 1218 | result.put("fetusNum", sieveApply.getFetusNum()); |
| 1216 | 1219 | result.put("fetusAbnormalInfo", sieveApply.getFetusAbnormalInfo()); |
| 1217 | 1220 | result.put("sieveModel", sieveApply.getSieveModel()); |
| 1218 | - result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek()); | |
| 1221 | + if(pat!=null && StringUtils.isEmpty(sieveApply.getUltrasonicNtWeek())){ | |
| 1222 | + yunZhouMth(sieveApply,pat); | |
| 1223 | + result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek()); | |
| 1224 | + }else { | |
| 1225 | + result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek()); | |
| 1226 | + } | |
| 1219 | 1227 | result.put("ultrasonicNtVal", sieveApply.getUltrasonicNtVal()); |
| 1220 | 1228 | result.put("serumScreeningRisk", sieveApply.getSerumScreeningRisk()); |
| 1221 | 1229 | result.put("syndrome21", sieveApply.getSyndrome21()); |
| ... | ... | @@ -1365,6 +1373,16 @@ |
| 1365 | 1373 | } |
| 1366 | 1374 | |
| 1367 | 1375 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); |
| 1376 | + } | |
| 1377 | + private void yunZhouMth(SieveApplyOrderModel sieveApplyOrderModel, Patients p) { | |
| 1378 | + //打印需要 根据采样时间算出采样孕周 | |
| 1379 | + if(sieveApplyOrderModel.getCollectionDate()!=null && p.getLastMenses()!=null){ | |
| 1380 | + sieveApplyOrderModel.setCaiyangyunzhou(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate())); | |
| 1381 | + } | |
| 1382 | + // 根据B超时间算出B超孕周 | |
| 1383 | + if(sieveApplyOrderModel.getBcCheckDate()!=null && p.getLastMenses()!=null){ | |
| 1384 | + sieveApplyOrderModel.setUltrasonicNtWeek(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate())); | |
| 1385 | + } | |
| 1368 | 1386 | } |
| 1369 | 1387 | |
| 1370 | 1388 | /** |