Commit a4cdaccd0daf2335d371f39b264f05e23a93d13c
1 parent
1e8e6e120d
Exists in
master
and in
6 other branches
秦皇岛冠新接口修改
Showing 2 changed files with 135 additions and 62 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
View file @
a4cdacc
| ... | ... | @@ -1409,37 +1409,58 @@ |
| 1409 | 1409 | map.put("SKINABNORMVALUE",null); |
| 1410 | 1410 | }else if("yes".equals(mapskin.get("yesOrNo"))){ |
| 1411 | 1411 | map.put("SKINABNORMCODE","2"); |
| 1412 | - String skinZw = null; | |
| 1413 | - if(true==mapskin.get("sz")){ | |
| 1414 | - skinZw+="湿疹"; | |
| 1412 | + String skinZw = new String(); | |
| 1413 | + if(mapskin.get("sz") != null){ | |
| 1414 | + if(true==mapskin.get("sz")){ | |
| 1415 | + skinZw+="湿疹"; | |
| 1416 | + } | |
| 1415 | 1417 | } |
| 1416 | - if(true==mapskin.get("hr")){ | |
| 1417 | - skinZw+=",黄染"; | |
| 1418 | + if(mapskin.get("hr") != null){ | |
| 1419 | + if(true==mapskin.get("hr")){ | |
| 1420 | + skinZw+=",黄染"; | |
| 1421 | + } | |
| 1418 | 1422 | } |
| 1419 | - if(true==mapskin.get("fg")){ | |
| 1420 | - skinZw+=",发绀"; | |
| 1423 | + if(mapskin.get("fg") != null){ | |
| 1424 | + if(true==mapskin.get("fg")){ | |
| 1425 | + skinZw+=",发绀"; | |
| 1426 | + } | |
| 1421 | 1427 | } |
| 1422 | - if(true==mapskin.get("qb")){ | |
| 1423 | - skinZw+=",苍白"; | |
| 1428 | + if(mapskin.get("qb") != null){ | |
| 1429 | + if(true==mapskin.get("qb")){ | |
| 1430 | + skinZw+=",苍白"; | |
| 1431 | + } | |
| 1424 | 1432 | } |
| 1425 | - if("true".equals(mapskin.get("mxxgl"))){ | |
| 1426 | - skinZw+=",毛细血管瘤"; | |
| 1433 | + if(mapskin.get("mxxgl") != null){ | |
| 1434 | + if("true".equals(mapskin.get("mxxgl"))){ | |
| 1435 | + skinZw+=",毛细血管瘤"; | |
| 1436 | + } | |
| 1427 | 1437 | } |
| 1428 | - if(true==mapskin.get("bk")){ | |
| 1429 | - skinZw+=",包块"; | |
| 1438 | + if(mapskin.get("bk") != null){ | |
| 1439 | + if(true==mapskin.get("bk")){ | |
| 1440 | + skinZw+=",包块"; | |
| 1441 | + } | |
| 1430 | 1442 | } |
| 1431 | - if(true==mapskin.get("yz")){ | |
| 1432 | - skinZw+=",硬肿"; | |
| 1443 | + if(mapskin.get("yz") != null){ | |
| 1444 | + if(true==mapskin.get("yz")){ | |
| 1445 | + skinZw+=",硬肿"; | |
| 1446 | + } | |
| 1433 | 1447 | } |
| 1434 | - if(true==mapskin.get("hz")){ | |
| 1435 | - skinZw+=",红肿"; | |
| 1448 | + if(mapskin.get("hz") != null){ | |
| 1449 | + if(true==mapskin.get("hz")){ | |
| 1450 | + skinZw+=",红肿"; | |
| 1451 | + } | |
| 1436 | 1452 | } |
| 1437 | - if(true==mapskin.get("ch")){ | |
| 1438 | - skinZw+=",潮红"; | |
| 1453 | + if(mapskin.get("ch") != null){ | |
| 1454 | + if(true==mapskin.get("ch")){ | |
| 1455 | + skinZw+=",潮红"; | |
| 1456 | + } | |
| 1439 | 1457 | } |
| 1440 | - if(true==mapskin.get("ml")){ | |
| 1441 | - skinZw+=",糜烂"; | |
| 1458 | + if(mapskin.get("ml") != null){ | |
| 1459 | + if(true==mapskin.get("ml")){ | |
| 1460 | + skinZw+=",糜烂"; | |
| 1461 | + } | |
| 1442 | 1462 | } |
| 1463 | + | |
| 1443 | 1464 | map.put("SKINABNORMVALUE",skinZw); |
| 1444 | 1465 | } |
| 1445 | 1466 | } |
| 1446 | 1467 | |
| ... | ... | @@ -1529,20 +1550,23 @@ |
| 1529 | 1550 | } |
| 1530 | 1551 | |
| 1531 | 1552 | Map mapnavel = babyCheckModel.getNavel(); |
| 1532 | - if("1".equals(mapnavel.get("select"))){ | |
| 1533 | - map.put("UMBCORDFALLCODE","1"); | |
| 1534 | - map.put("UMBCORDFALLVALUE","未脱"); | |
| 1535 | - }else if("2".equals(mapnavel.get("select"))){ | |
| 1536 | - map.put("UMBCORDFALLCODE","2"); | |
| 1537 | - map.put("UMBCORDFALLVALUE","已脱"); | |
| 1538 | - }else if("3".equals(mapnavel.get("select"))){ | |
| 1539 | - map.put("UMBCORDFALLCODE","3"); | |
| 1540 | - map.put("UMBCORDFALLVALUE","脐部有渗出"); | |
| 1541 | - }else if("4".equals(mapnavel.get("select"))){ | |
| 1542 | - map.put("UMBCORDFALLCODE","4"); | |
| 1543 | - map.put("UMBCORDFALLVALUE","其他"); | |
| 1553 | + if(MapUtils.isNotEmpty(mapnavel)){ | |
| 1554 | + if("1".equals(mapnavel.get("select"))){ | |
| 1555 | + map.put("UMBCORDFALLCODE","1"); | |
| 1556 | + map.put("UMBCORDFALLVALUE","未脱"); | |
| 1557 | + }else if("2".equals(mapnavel.get("select"))){ | |
| 1558 | + map.put("UMBCORDFALLCODE","2"); | |
| 1559 | + map.put("UMBCORDFALLVALUE","已脱"); | |
| 1560 | + }else if("3".equals(mapnavel.get("select"))){ | |
| 1561 | + map.put("UMBCORDFALLCODE","3"); | |
| 1562 | + map.put("UMBCORDFALLVALUE","脐部有渗出"); | |
| 1563 | + }else if("4".equals(mapnavel.get("select"))){ | |
| 1564 | + map.put("UMBCORDFALLCODE","4"); | |
| 1565 | + map.put("UMBCORDFALLVALUE","其他"); | |
| 1566 | + } | |
| 1544 | 1567 | } |
| 1545 | 1568 | |
| 1569 | + | |
| 1546 | 1570 | if(babyCheckModel.getSpineFours() != null){ |
| 1547 | 1571 | if("未见异常".equals(babyCheckModel.getSpineFours())){ |
| 1548 | 1572 | map.put("LIMBSABNORMCODE","1"); |
| 1549 | 1573 | |
| ... | ... | @@ -1567,20 +1591,38 @@ |
| 1567 | 1591 | map.put("ANUSABNORMCODE","1"); |
| 1568 | 1592 | }else if("yes".equals(mappor.get("yesOrNo"))){ |
| 1569 | 1593 | map.put("ANUSABNORMCODE","2"); |
| 1570 | - String porzw = null; | |
| 1571 | - if(true==mappor.get("ynsz")){ | |
| 1572 | - porzw+=",阴囊水肿"; | |
| 1573 | - }if(true==mappor.get("xmjy")){ | |
| 1574 | - porzw+=",鞘膜积液"; | |
| 1575 | - }if(true==mappor.get("ndxy")){ | |
| 1576 | - porzw+=",尿道下裂"; | |
| 1577 | - }if(true==mappor.get("fggs")){ | |
| 1578 | - porzw+=",腹股沟疝"; | |
| 1579 | - }if(true==mappor.get("yg")){ | |
| 1580 | - porzw+=",隐睾"; | |
| 1581 | - }if(true==mappor.get("ycnx")){ | |
| 1582 | - porzw+=",阴唇粘连"; | |
| 1594 | + String porzw = new String(); | |
| 1595 | + if(mappor.get("ynsz") != null){ | |
| 1596 | + if(true==mappor.get("ynsz")){ | |
| 1597 | + porzw+=",阴囊水肿"; | |
| 1598 | + } | |
| 1583 | 1599 | } |
| 1600 | + if(mappor.get("xmjy") != null){ | |
| 1601 | + if(true==mappor.get("xmjy")){ | |
| 1602 | + porzw+=",鞘膜积液"; | |
| 1603 | + } | |
| 1604 | + } | |
| 1605 | + if(mappor.get("ndxy") != null){ | |
| 1606 | + if(true==mappor.get("ndxy")){ | |
| 1607 | + porzw+=",尿道下裂"; | |
| 1608 | + } | |
| 1609 | + } | |
| 1610 | + if(mappor.get("fggs") != null){ | |
| 1611 | + if(true==mappor.get("fggs")){ | |
| 1612 | + porzw+=",腹股沟疝"; | |
| 1613 | + } | |
| 1614 | + } | |
| 1615 | + if(mappor.get("yg") != null){ | |
| 1616 | + if(true==mappor.get("yg")){ | |
| 1617 | + porzw+=",隐睾"; | |
| 1618 | + } | |
| 1619 | + } | |
| 1620 | + if(mappor.get("ycnx") != null){ | |
| 1621 | + if(true==mappor.get("ycnx")){ | |
| 1622 | + porzw+=",阴唇粘连"; | |
| 1623 | + } | |
| 1624 | + } | |
| 1625 | + | |
| 1584 | 1626 | map.put("ANUSABNORMVALUE",porzw); |
| 1585 | 1627 | } |
| 1586 | 1628 | |
| 1587 | 1629 | |
| ... | ... | @@ -1612,14 +1654,23 @@ |
| 1612 | 1654 | if("no".equals(mapsto.get("yesOrNo"))){ |
| 1613 | 1655 | map.put("RICKETSSYMPTOMS","1"); |
| 1614 | 1656 | }else{ |
| 1615 | - String zhi = null; | |
| 1616 | - if(true==mapsto.get("yj")){ | |
| 1617 | - zhi+="2"; | |
| 1618 | - }if(true==mapsto.get("dh")){ | |
| 1619 | - zhi+=",3"; | |
| 1620 | - }if(true==mapsto.get("fz")){ | |
| 1621 | - zhi+=",4"; | |
| 1657 | + String zhi = new String(); | |
| 1658 | + if(mapsto.get("yj") != null){ | |
| 1659 | + if(true==mapsto.get("yj")){ | |
| 1660 | + zhi+="2"; | |
| 1661 | + } | |
| 1622 | 1662 | } |
| 1663 | + if(mapsto.get("dh") != null){ | |
| 1664 | + if(true==mapsto.get("dh")){ | |
| 1665 | + zhi+=",3"; | |
| 1666 | + } | |
| 1667 | + } | |
| 1668 | + if(mapsto.get("fz") !=null){ | |
| 1669 | + if(true==mapsto.get("fz")){ | |
| 1670 | + zhi+=",4"; | |
| 1671 | + } | |
| 1672 | + } | |
| 1673 | + | |
| 1623 | 1674 | map.put("RICKETSSYMPTOMS",zhi); |
| 1624 | 1675 | } |
| 1625 | 1676 | } |
| 1626 | 1677 | |
| ... | ... | @@ -1629,16 +1680,28 @@ |
| 1629 | 1680 | if("no".equals(mapsign.get("yesOrNo"))){ |
| 1630 | 1681 | map.put("RICKETSSIGN68","1"); |
| 1631 | 1682 | }else{ |
| 1632 | - String zhi=null; | |
| 1633 | - if(true==mapsign.get("lcz")){ | |
| 1634 | - zhi+="2"; | |
| 1635 | - }if(true==mapsign.get("lrgg")){ | |
| 1636 | - zhi+=",3"; | |
| 1637 | - }if(true==mapsign.get("jx")){ | |
| 1638 | - zhi+=",4"; | |
| 1639 | - }if(true==mapsign.get("szz")){ | |
| 1640 | - zhi+=",5"; | |
| 1683 | + String zhi=new String(); | |
| 1684 | + if(mapsign.get("lcz") != null){ | |
| 1685 | + if(true==mapsign.get("lcz")){ | |
| 1686 | + zhi+="2"; | |
| 1687 | + } | |
| 1641 | 1688 | } |
| 1689 | + if(mapsign.get("lrgg") != null){ | |
| 1690 | + if(true==mapsign.get("lrgg")){ | |
| 1691 | + zhi+=",3"; | |
| 1692 | + } | |
| 1693 | + } | |
| 1694 | + if(mapsign.get("jx") != null){ | |
| 1695 | + if(true==mapsign.get("jx")){ | |
| 1696 | + zhi+=",4"; | |
| 1697 | + } | |
| 1698 | + } | |
| 1699 | + if(mapsign.get("szz") != null){ | |
| 1700 | + if(true==mapsign.get("szz")){ | |
| 1701 | + zhi+=",5"; | |
| 1702 | + } | |
| 1703 | + } | |
| 1704 | + | |
| 1642 | 1705 | map.put("RICKETSSIGN68",zhi); |
| 1643 | 1706 | } |
| 1644 | 1707 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/QhdJbgwController.java
View file @
a4cdacc
| ... | ... | @@ -144,5 +144,15 @@ |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | |
| 147 | + @RequestMapping(value = "/qhd/xsetj") | |
| 148 | + @ResponseBody | |
| 149 | + public List<Map<String,String>> qhdxinshengerTiJian(String startDate,String endDate){ | |
| 150 | + if(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)){ | |
| 151 | + return qhdJbgwInterface.getEb(startDate, endDate); | |
| 152 | + } | |
| 153 | + return null; | |
| 154 | + } | |
| 155 | + | |
| 156 | + | |
| 147 | 157 | } |