shiyang / regional-platform

Download as
Browse Code »

Commit 0febfd944bbffda8d13cbfe597db27b83c41b031

Authored by jiangjiazhi
1 parent b901b97465
Exists in master and in 1 other branch nobuildprocess

孕妇分娩后 变成产妇

Showing 2 changed files with 8 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 0febfd9
... ... @@ -149,7 +149,6 @@
149 149 */
150 150 public HighScoreResult findLastRisk(String parentId) {
151 151 List<AntenatalExaminationModel> list = antenatalExaminationService.findAllByParentId(parentId);
152   - List result = new ArrayList();
153 152 AntenatalExaminationModel model = null;
154 153 if (CollectionUtils.isNotEmpty(list)) {
155 154 model = list.get(0);
... ... @@ -160,7 +159,6 @@
160 159 if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"{}".equals(model.getRiskFactor())) {
161 160 List list1 = JsonUtil.toList(model.getRiskFactor(), List.class);
162 161 highScoreResult = queryRisk(list1);
163   - result.addAll(highScoreResult.getHighRisk());
164 162 }
165 163 if (null != model &&!"{}".equals(model.getOtherRisk())) {
166 164 Map map = JsonUtil.str2Obj(model.getOtherRisk(), Map.class);
... ... @@ -169,7 +167,7 @@
169 167 Map map1 = new HashMap();
170 168 map1.put("id", "");
171 169 map1.put("name", map.get("fxysu"));
172   - result.add(map1);
  170 + highScoreResult.getHighRisk().add(map1);
173 171 //风险评分
174 172 Object idObj = map.get("fxpf");
175 173 if (null != idObj) {
... ... @@ -196,7 +194,7 @@
196 194 Map map1 = new HashMap();
197 195 map1.put("id", "");
198 196 map1.put("name", map.get("fxysu"));
199   - result.add(map1);
  197 + highScoreResult.getHighRisk().add(map1);
200 198 //风险评分
201 199 Object idObj = map.get("fxpf");
202 200 if (null != idObj) {
203 201  
204 202  
... ... @@ -451,13 +449,13 @@
451 449 antExChuQuery.setYn(YnEnums.YES.getId());
452 450 //获取初诊记录
453 451 List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
454   - AntExChuModel antExChuModel = null;
  452 + /* AntExChuModel antExChuModel = null;
455 453 if (CollectionUtils.isNotEmpty(antExChulist)) {
456 454 antExChuModel = antExChulist.get(0);
457   - }
458   - HighScoreResult highScoreResult = findLastRisk(patients1.getId());
  455 + }*/
  456 + HighScoreResult highScoreResult = findLastRisk(patients.getId());
459 457 //查询产前检查记录
460   - List<AntenatalExaminationModel> list = antenatalExaminationService.findAllByParentId(patients1.getId());
  458 + List<AntenatalExaminationModel> list = antenatalExaminationService.findAllByParentId(patients.getId());
461 459 /* List data = new ArrayList();
462 460 if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) {
463 461 List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
... ... @@ -476,7 +474,7 @@
476 474  
477 475  
478 476 antexListResult.convertToResult(list, patients, antExChulist);
479   - antexListResult.setIsSieve(cap(patients.getLastMenses(), patients1.getId()));
  477 + antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId()));
480 478 antexListResult.setRiskFactor(highScoreResult.getHighRisk());
481 479 antexListResult.setRiskScore(highScoreResult.getScore()+"");
482 480 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 0febfd9
... ... @@ -148,6 +148,7 @@
148 148 babyModel.setMphone(patients.getPhone());
149 149 babyModel.setMbirth(patients.getBirth());
150 150 babyModel.setMcertNo(patients.getCardNo());
  151 + babyModel.setMcertTypeId(patients.getPcerteTypeId());
151 152 //父亲信息
152 153 babyModel.setFjob(patients.getHworkUnit());
153 154 babyModel.setFname(patients.getHusbandName());