jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ea2e3b57520d325d658b2614dffc8923fb37ae76

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

修改初诊返回数据bug

Showing 1 changed file with 48 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ ea2e3b5
... ... @@ -23,10 +23,7 @@
23 23 import org.springframework.beans.factory.annotation.Autowired;
24 24 import org.springframework.stereotype.Component;
25 25  
26   -import java.util.ArrayList;
27   -import java.util.HashMap;
28   -import java.util.List;
29   -import java.util.Map;
  26 +import java.util.*;
30 27  
31 28 /**
32 29 * Created by Administrator on 2017/1/16 0016.
33 30  
34 31  
... ... @@ -120,13 +117,30 @@
120 117  
121 118 /* 院内信息 */
122 119 map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses()));
  120 + //孕周(用末次月经去计算)
  121 + map.put("lastMensesWeek", ResolveUtils.getPregnancyWeek(data.getLastMenses(),new Date()));
123 122 //纠正末次月经,取末次月经数据
124 123 map.put("correctionLastMenses", DateUtil.getyyyy_MM_dd(data.getLastMenses()));
  124 + //纠正末次月经孕周
  125 + map.put("correctionLastMensesWeek", ResolveUtils.getPregnancyWeek(data.getLastMenses(),new Date()));
  126 +
125 127 map.put("dueDate", DateUtil.getyyyy_MM_dd(data.getDueDate()));
126 128 map.put("vcCardNo", data.getVcCardNo());
127 129 //条码(暂时去掉)
128 130 //档案编号
129 131 map.put("fileCode", data.getFileCode());
  132 + //建档医生
  133 + String bookbuildingDoctor = "";
  134 + if (StringUtils.isNotEmpty(data.getBookbuildingDoctor()) && FunvCommonUtil.isNumeric(data.getBookbuildingDoctor())){
  135 + Users users = usersService.getUsers(Integer.parseInt(data.getBookbuildingDoctor()));
  136 + if (users!=null && users.getYn()==YnEnums.YES.getId()){
  137 + bookbuildingDoctor = users.getName();
  138 + }
  139 + }
  140 + map.put("bookbuildingDoctor", bookbuildingDoctor);
  141 + //建档日期
  142 + map.put("bookbuildingDate", DateUtil.getyyyy_MM_dd(data.getBookbuildingDate()));
  143 +
130 144 map.put("mremark", data.getMremark());
131 145 //服务类型
132 146 String serviceType = "";
... ... @@ -157,7 +171,6 @@
157 171 return "";
158 172 }
159 173  
160   -
161 174 private void getRisk(String highRisk,String oRisk,Map<String,Object> map){
162 175 HighScoreResult highScoreResult = null;
163 176 if (StringUtils.isNotEmpty(highRisk)){
... ... @@ -246,7 +259,8 @@
246 259 map.put("birth", DateUtil.getyyyy_MM_dd(patients.getBirth()));
247 260 map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
248 261 map.put("phone",patients.getPhone());
249   - map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek()));
  262 + //基本信息孕周
  263 + map.put("fmWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),new Date()));
250 264 map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
251 265 map.put("mremark",patients.getMremark());
252 266  
... ... @@ -256,7 +270,7 @@
256 270 //产检基本信息
257 271 map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckTime()));
258 272 //产检孕周
259   - map.put("cDueWeek",data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek())));
  273 + map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckTime()));
260 274 String checkDoctor = "";
261 275  
262 276 if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())){
... ... @@ -274,6 +288,8 @@
274 288 }
275 289 }
276 290 map.put("hospital", hospital);
  291 + //产检劵
  292 + map.put("barCode", data.getBarCode());
277 293 map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
278 294 /* 初诊信息 */
279 295 //既往史
... ... @@ -332,7 +348,17 @@
332 348 cestationInfo = FunvCommonUtil.replace(map1,new StringBuilder(),basicConfigService);
333 349 }
334 350 map.put("cestationInfo", cestationInfo);
335   -
  351 + //丈夫健康情况
  352 + String hHealthInfo = "";
  353 + Map<String, String> hHealthInfoMap = JsonUtil.getMap(data.gethHealthInfo());
  354 + if (MapUtils.isNotEmpty(hHealthInfoMap)){
  355 + if (hHealthInfoMap.get("yesOrNo").equals("yes")){
  356 + hHealthInfo = "健康";
  357 + }else if (hHealthInfoMap.get("yesOrNo").equals("no")){
  358 + hHealthInfo = hHealthInfoMap.get("qt");
  359 + }
  360 + }
  361 + map.put("hHealthInfo", hHealthInfo);
336 362 //孕产史
337 363 map.put("pregnancyTimes", UnitUtils.unitSplice(data.getPregnancyTimes(), UnitConstants.CI));
338 364 map.put("prodTime", UnitUtils.unitSplice(data.getProdTime(),UnitConstants.CI));
... ... @@ -346,6 +372,7 @@
346 372  
347 373 map.put("height", UnitUtils.unitSplice(data.getHeight(),UnitConstants.CM));
348 374 map.put("weight", UnitUtils.unitSplice(data.getWeight(),UnitConstants.KG));
  375 + map.put("baricIndex", data.getBaricIndex());
349 376 map.put("yqWeight", UnitUtils.unitSplice(data.getYqWeight(),UnitConstants.KG));
350 377 // 血压
351 378 String ssy = "";
... ... @@ -396,6 +423,10 @@
396 423 fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation();
397 424 //胎心率
398 425 heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString();
  426 +
  427 + Integer a = (int)Double.parseDouble(heartRate);
  428 + heartRate = String.valueOf(a);
  429 +
399 430 join = placenta.getJoin();
400 431 }
401 432  
... ... @@ -411,6 +442,10 @@
411 442 }
412 443 }
413 444 heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate");
  445 +
  446 + Integer a = (int)Double.parseDouble(heartRate);
  447 + heartRate = String.valueOf(a);
  448 +
414 449 fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation");
415 450 join = placenta.get("join");
416 451 }
417 452  
418 453  
419 454  
... ... @@ -432,24 +467,24 @@
432 467 map.put("platelet",UnitUtils.unitSplice(data.getPlatelet(),UnitConstants.TEN_LKG));
433 468 map.put("chgOther",data.getChgOther());
434 469  
435   - map.put("ndb",data.getNdb());
  470 + map.put("ndb",FunvCommonUtil.checkYiGan(data.getNdb()));
436 471 map.put("nt",data.getNt());
437 472 map.put("urineKetone",data.getUrineKetone());
438 473 map.put("bld",data.getBld());
439 474 map.put("ncgOther",data.getNcgOther());
440 475  
441 476 map.put("abo",FunvCommonUtil.getBaseicConfigByid(data.getAbo(), basicConfigService));
442   - map.put("rh",data.getRh());
443   - map.put("bloodSugar",data.getBloodSugar());
  477 + map.put("rh",FunvCommonUtil.checkYiGan(data.getRh()));
  478 + map.put("bloodSugar",UnitUtils.unitSplice(data.getBloodSugar(),UnitConstants.MMOLL));
444 479 map.put("xqgbzam",UnitUtils.unitSplice(data.getXqgbzam(), UnitConstants.UL));
445 480 map.put("xqgczam",UnitUtils.unitSplice(data.getXqgczam(), UnitConstants.UL));
446 481 map.put("albumin",UnitUtils.unitSplice(data.getAlbumin(), UnitConstants.GL));
447 482 map.put("totalBilirubin",UnitUtils.unitSplice(data.getTotalBilirubin(), UnitConstants.UMOLL));
448 483 map.put("jhBilirubin",UnitUtils.unitSplice(data.getJhBilirubin(), UnitConstants.UMOLL));
449   - map.put("bg",data.getBg());
  484 + map.put("bg",FunvCommonUtil.checkYiGan(data.getBg()));
450 485  
451 486 map.put("ygbmky",FunvCommonUtil.checkYiGan(data.getYgbmky()));
452   - map.put("ygbmkt",FunvCommonUtil.checkYiGan(data.getYgbmky()));
  487 + map.put("ygbmkt",FunvCommonUtil.checkYiGan(data.getYgbmkt()));
453 488 map.put("ygeky",FunvCommonUtil.checkYiGan(data.getYgeky()));
454 489 map.put("ygekt",FunvCommonUtil.checkYiGan(data.getYgekt()));
455 490 map.put("yghxkt",FunvCommonUtil.checkYiGan(data.getYghxkt()));