Commit 71620c60e06774ad73f964aeb9f143f72bd22c37
1 parent
4e6ec4af70
Exists in
master
and in
8 other branches
code update
Showing 2 changed files with 14 additions and 3 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/JdbcUtil.java
View file @
71620c6
| ... | ... | @@ -593,6 +593,17 @@ |
| 593 | 593 | chuModel.setGonggao(getString(map.get("FE_UTERUSHEIGHT"))); |
| 594 | 594 | chuModel.setFuwei(getString(map.get("FE_ABGIRTH"))); |
| 595 | 595 | |
| 596 | + | |
| 597 | + String doctorId = getString(map.get("FE_DOCTOR")); | |
| 598 | + if (doctorId != null && !"".equals(doctorId)) | |
| 599 | + { | |
| 600 | + String dname = getString(getOralceSingleObjBySql("select e.e_name from mommy_employee e where e.e_id = '" + doctorId + "'")); | |
| 601 | + String id = getString(getMysqlSingleObjBySql("select id from users where name = '" + dname + "'")); | |
| 602 | + chuModel.setProdDoctor(id);//产检医生 | |
| 603 | + } | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 596 | 607 | Integer tireNum = 1; |
| 597 | 608 | if (map.get("FE_ISSECOND") !=null ) |
| 598 | 609 | { |
| ... | ... | @@ -615,7 +626,7 @@ |
| 615 | 626 | chuModel.setCreated(getDate(map.get("FE_CREATETIME"))); |
| 616 | 627 | chuModel.setNextCheckTime(getDate(map.get("FE_ORDERNEXT"))); |
| 617 | 628 | chuModel.setCheckTime(getDate(map.get("FE_ROCTORTIME"))); |
| 618 | - | |
| 629 | + chuModel.setOtherHighRisk("{}"); | |
| 619 | 630 | String hid = getString(map.get("FE_HOSPITALID")); |
| 620 | 631 | if (hid != null && !"".equals(hid)) |
| 621 | 632 | { |
| ... | ... | @@ -736,7 +747,7 @@ |
| 736 | 747 | " --高危风险关系表\n" + |
| 737 | 748 | " MOMMY_EXAMINWARNING J\n" + |
| 738 | 749 | " --高危内容\n" + |
| 739 | - " INNER JOIN PLAT_DATACONTENT K ON J.ME_WORNINGID = K.DC_ID AND K.DC_ISVALID=1 AND K.DC_DATATYPEID='fb43fd5a-b153-4cb9-9180-c46f5612ba43'\n" + | |
| 750 | + " INNER JOIN PLAT_DATACONTENT K ON J.ME_WORNINGID = K.DC_ID AND K.DC_ISVALID=1 AND K.DC_DATATYPEID='fb43fd5a-b153-4cb9-9180-c46f5612ba43' AND K.DC_NAME<>'其他' \n" + | |
| 740 | 751 | " --高危等级\n" + |
| 741 | 752 | " INNER JOIN PLAT_DATACONTENT L ON K.DC_PARENTID=L.DC_ID AND L.DC_ISVALID=1\n" + |
| 742 | 753 | " INNER JOIN LYMS_BASICCONFIG LL ON K.DC_NAME=LL.NAME\n" + |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
71620c6
| ... | ... | @@ -1753,7 +1753,7 @@ |
| 1753 | 1753 | if (CollectionUtils.isNotEmpty(basicConfigs2)) { |
| 1754 | 1754 | for (BasicConfig bc : basicConfigs2) { |
| 1755 | 1755 | String name = bc.getName(); |
| 1756 | - if (name != null && name.indexOf("预警") > -1) { | |
| 1756 | + if (name.indexOf("预警") > -1) { | |
| 1757 | 1757 | name = name.replace("预警", ""); |
| 1758 | 1758 | } |
| 1759 | 1759 | map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); |