jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f434484811e26b019dc915a6937e2f26e0a358dc

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

聊城妇幼产检增加字段

Showing 1 changed file with 28 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ f434484
... ... @@ -1315,7 +1315,7 @@
1315 1315  
1316 1316 if (StringUtils.isNotEmpty(data.getVulvaSele())) {
1317 1317 if ("2".equals(data.getVulvaSele())) {
1318   - map.put("vulvaSele", "未见异常");
  1318 + map.put("vulva", "未见异常");
1319 1319 } else if ("1".equals(data.getVulvaSele())) {
1320 1320 map.put("vulva", data.getVulva());
1321 1321 }
... ... @@ -1324,7 +1324,7 @@
1324 1324 }
1325 1325 if (StringUtils.isNotEmpty(data.getVaginaSele())) {
1326 1326 if ("2".equals(data.getVaginaSele())) {
1327   - map.put("vaginaSele", "未见异常");
  1327 + map.put("vagina", "未见异常");
1328 1328 } else if ("1".equals(data.getVaginaSele())) {
1329 1329 map.put("vagina", data.getVagina());
1330 1330 }
... ... @@ -1333,7 +1333,7 @@
1333 1333 }
1334 1334 if (StringUtils.isNotEmpty(data.getCervicalSele())) {
1335 1335 if ("2".equals(data.getCervicalSele())) {
1336   - map.put("cervicalSele", "未见异常");
  1336 + map.put("cervical", "未见异常");
1337 1337 } else if ("1".equals(data.getCervicalSele())) {
1338 1338 map.put("cervical", data.getCervical());
1339 1339 }
... ... @@ -1342,7 +1342,7 @@
1342 1342 }
1343 1343 if (StringUtils.isNotEmpty(data.getUterusSele())) {
1344 1344 if ("2".equals(data.getUterusSele())) {
1345   - map.put("uterusSele", "未见异常");
  1345 + map.put("uterus", "未见异常");
1346 1346 } else if ("1".equals(data.getUterusSele())) {
1347 1347 map.put("uterus", data.getUterus());
1348 1348 }
... ... @@ -1353,7 +1353,7 @@
1353 1353 if ("1".equals(data.getFujianSele())) {
1354 1354 map.put("fujian", data.getFujian());
1355 1355 } else if ("2".equals(data.getFujianSele())) {
1356   - map.put("fujianSele", "未见异常");
  1356 + map.put("fujian", "未见异常");
1357 1357 }
1358 1358 } else {//空
1359 1359 map.put("fujian", data.getFujian());
1360 1360  
1361 1361  
1362 1362  
... ... @@ -1389,13 +1389,17 @@
1389 1389 }
1390 1390 mapData.put("gestaDate", antExcAddOther.getGestaDate());
1391 1391 if(antExcAddOther.getFmType()!=null){
1392   - mapData.put("fmType", CZFmTypeEnums.getTitle(antExcAddOther.getFmType()));
  1392 + mapData.put("fmType", CZFmTypeEnums.getTitle(antExcAddOther.getFmType())+"，"+antExcAddOther.getFmTypeRemark()==null?"":antExcAddOther.getFmTypeRemark());
  1393 + }else{
  1394 + mapData.put("fmTypeRemark", antExcAddOther.getFmTypeRemark());
1393 1395 }
1394   - mapData.put("fmTypeRemark", antExcAddOther.getFmTypeRemark());
  1396 +
1395 1397 if(antExcAddOther.getFitness()!=null){
1396   - mapData.put("fitness", FitnessEnums.getTitle(antExcAddOther.getFitness()));
  1398 + mapData.put("fitness", FitnessEnums.getTitle(antExcAddOther.getFitness())+"，"+antExcAddOther.getFitnessRemark()==null?"":antExcAddOther.getFitnessRemark());
  1399 + }else{
  1400 + mapData.put("fitness", antExcAddOther.getFitnessRemark());
1397 1401 }
1398   - mapData.put("fitnessRemark", antExcAddOther.getFitnessRemark());
  1402 +
1399 1403 mapData.put("newborWeight", antExcAddOther.getNewborWeight());
1400 1404 antExcAddOthersList.add(mapData);
1401 1405 }
1402 1406  
1403 1407  
1404 1408  
1405 1409  
... ... @@ -1414,16 +1418,23 @@
1414 1418 }
1415 1419 if (otherMap.containsKey("fmType")) {
1416 1420 String fmType = CZFmTypeEnums.getTitle(Integer.parseInt(otherMap.get("fmType").toString()));
1417   - mapData.put("fmType", fmType);
  1421 + if(otherMap.get("fmTypeRemark")!=null){
  1422 + mapData.put("fmType", fmType+"，"+otherMap.get("fmTypeRemark"));
  1423 + }else{
  1424 + mapData.put("fmType", fmType);
  1425 + }
  1426 + }else{
  1427 + mapData.put("fmType", otherMap.get("fmTypeRemark"));
1418 1428 }
1419   - mapData.put("fmTypeRemark", otherMap.get("fmTypeRemark"));
1420 1429 if (otherMap.containsKey("fitness")) {
1421 1430 String fitness = FitnessEnums.getTitle(Integer.parseInt(otherMap.get("fitness").toString()));
  1431 + if(otherMap.get("fitnessRemark")!=null){
  1432 + mapData.put("fitness", fitness+"，"+otherMap.get("fitnessRemark"));
  1433 + }
1422 1434 mapData.put("fitness", fitness);
  1435 + }else{
  1436 + mapData.put("fitness", otherMap.get("fitnessRemark"));
1423 1437 }
1424   - if (otherMap.get("fitnessRemark") != null) {
1425   - mapData.put("fitnessRemark", otherMap.get("fitnessRemark"));
1426   - }
1427 1438 if (otherMap.get("newborWeight") != null) {
1428 1439 mapData.put("newborWeight", UnitUtils.unitSplice(otherMap.get("newborWeight"),UnitConstants.G));
1429 1440 }
... ... @@ -1745,6 +1756,9 @@
1745 1756 map.put("textpjbc", Boolean.valueOf(data.getTextpjbc()) ? "已检查" : "未检查");
1746 1757 map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
1747 1758 map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
  1759 +
  1760 +
  1761 + map.put("zdjcxm","早孕期病毒检测："+map.get("zyqbdjc")+"， NT检查："+map.get("ntjc")+"， 产前筛查："+map.get("cjsc")+"， 胎儿系统排畸B超："+map.get("textpjbc")+"， 75gOGTT："+map.get("s75gdgtt")+"， 甲状腺功能："+map.get("jzxgn")+"\n");
1748 1762  
1749 1763 //早孕期病毒检测
1750 1764 // private String zyqbdjc;