Commit 0b77a0b3ea618d429fea2246fe7dfa14e169bc40

Authored by wtt
1 parent e5279304c6

update

Showing 3 changed files with 6 additions and 16 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java View file @ 0b77a0b
... ... @@ -24,8 +24,7 @@
24 24 private String type;
25 25 // 就诊卡号
26 26 private String vcCardNo;
27   - //身份证
28   - private String cardNo;
  27 +
29 28 //儿童社保卡
30 29 private String sINCard;
31 30  
... ... @@ -34,7 +33,7 @@
34 33  
35 34 // 患者姓名
36 35 private String name;
37   - // 住院号
  36 + // 住院号(滦平使用存储身份证号码)
38 37 private String bhnum;
39 38 // 患者年龄
40 39 private String age;
... ... @@ -76,14 +75,6 @@
76 75  
77 76 //检验明细json
78 77 private String itemJson;
79   -
80   - public String getCardNo() {
81   - return cardNo;
82   - }
83   -
84   - public void setCardNo(String cardNo) {
85   - this.cardNo = cardNo;
86   - }
87 78  
88 79 public String getsINCard() {
89 80 return sINCard;
platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml View file @ 0b77a0b
... ... @@ -91,7 +91,6 @@
91 91 TITLE AS title,
92 92 TYPE AS type,
93 93 VCCARDNO AS vcCardNo,
94   - CARDNO AS cardNo,
95 94 NAME AS name,
96 95 BHNUM AS bhnum,
97 96 AGE AS age,
... ... @@ -115,8 +114,8 @@
115 114 <if test="(vcCardNo != null and vcCardNo != '') || (sINCard != null and sINCard != '') ">
116 115 AND VCCARDNO = #{vcCardNo} or VCCARDNO = #{sINCard}
117 116 </if>
118   - <if test="(cardNo != null and cardNo != '') ">
119   - AND CARDNO = #{cardNo}
  117 + <if test="(bhnum != null and bhnum != '') ">
  118 + AND BHNUM = #{bhnum}
120 119 </if>
121 120 <if test="(name != null and name != '') ">
122 121 AND name = #{name}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 0b77a0b
... ... @@ -522,7 +522,7 @@
522 522 }
523 523  
524 524 /**
525   - * 婚检查询lis检查数据,条件是身份证、就诊卡
  525 + * 婚检查询lis检查数据,条件是身份证(使用bhnum)、就诊卡
526 526 * @param vcCardNo
527 527 * @param cardNo
528 528 * @param model
... ... @@ -533,7 +533,7 @@
533 533 //通过就诊卡号和医院id查询到医院下面的lis记录
534 534 if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo)) {
535 535 if (StringUtils.isNotEmpty(cardNo)) {
536   - model.setCardNo(cardNo);
  536 + model.setBhnum(cardNo);
537 537 }
538 538 List<LisReportModel> lises = lisService.queryLisDataByModel(model);
539 539 if (CollectionUtils.isNotEmpty(lises)) {