diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java index 8240436..b9c132e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java @@ -24,8 +24,7 @@ public class LisReportQuery extends BaseQuery { private String type; // 就诊卡号 private String vcCardNo; - //身份证 - private String cardNo; + //儿童社保卡 private String sINCard; @@ -34,7 +33,7 @@ public class LisReportQuery extends BaseQuery { // 患者姓名 private String name; - // 住院号 + // 住院号(滦平使用存储身份证号码) private String bhnum; // 患者年龄 private String age; @@ -77,14 +76,6 @@ public class LisReportQuery extends BaseQuery { //检验明细json private String itemJson; - public String getCardNo() { - return cardNo; - } - - public void setCardNo(String cardNo) { - this.cardNo = cardNo; - } - public String getsINCard() { return sINCard; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml index fa6aef2..1dbb594 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml @@ -91,7 +91,6 @@ TITLE AS title, TYPE AS type, VCCARDNO AS vcCardNo, - CARDNO AS cardNo, NAME AS name, BHNUM AS bhnum, AGE AS age, @@ -115,8 +114,8 @@ AND VCCARDNO = #{vcCardNo} or VCCARDNO = #{sINCard} - - AND CARDNO = #{cardNo} + + AND BHNUM = #{bhnum} AND name = #{name} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index ff1b08c..410ff8a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -522,7 +522,7 @@ public class LisFacade { } /** - * 婚检查询lis检查数据,条件是身份证、就诊卡 + * 婚检查询lis检查数据,条件是身份证(使用bhnum)、就诊卡 * @param vcCardNo * @param cardNo * @param model @@ -533,7 +533,7 @@ public class LisFacade { //通过就诊卡号和医院id查询到医院下面的lis记录 if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo)) { if (StringUtils.isNotEmpty(cardNo)) { - model.setCardNo(cardNo); + model.setBhnum(cardNo); } List lises = lisService.queryLisDataByModel(model); if (CollectionUtils.isNotEmpty(lises)) {