jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e5279304c6e76fcb3e909f4a5ce0305c146662f0

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

update

Showing 6 changed files with 8 additions and 28 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java View file @ e527930
... ... @@ -18,10 +18,9 @@
18 18 private String type;
19 19 // 就诊卡号
20 20 private String vcCardNo;
21   - private String cardNo;
22 21 // 患者姓名
23 22 private String name;
24   - // 住院号
  23 + // 住院号(身份证号码存储 承德滦平)
25 24 private String bhnum;
26 25 // 患者年龄
27 26 private String age;
... ... @@ -61,14 +60,6 @@
61 60 //医院名称
62 61 private String hospitalName;
63 62  
64   - public String getCardNo() {
65   - return cardNo;
66   - }
67   -
68   - public void setCardNo(String cardNo) {
69   - this.cardNo = cardNo;
70   - }
71   -
72 63 public String getHospitalName() {
73 64 return hospitalName;
74 65 }
... ... @@ -261,7 +252,6 @@
261 252 ", title='" + title + '\'' +
262 253 ", type='" + type + '\'' +
263 254 ", vcCardNo='" + vcCardNo + '\'' +
264   - ", cardNo='" + cardNo + '\'' +
265 255 ", name='" + name + '\'' +
266 256 ", bhnum='" + bhnum + '\'' +
267 257 ", age='" + age + '\'' +
platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml View file @ e527930
... ... @@ -8,7 +8,6 @@
8 8 TITLE,
9 9 TYPE,
10 10 VCCARDNO,
11   - CARDNO,
12 11 NAME,
13 12 BHNUM,
14 13 AGE,
... ... @@ -30,7 +29,6 @@
30 29 #{title},
31 30 #{type},
32 31 #{vcCardNo},
33   - #{cardNo},
34 32 #{name},
35 33 #{bhnum},
36 34 #{age},
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java View file @ e527930
... ... @@ -90,7 +90,6 @@
90 90 model.setName(lisRequest.getName());
91 91 model.setBhnum(lisRequest.getBhnum());
92 92 model.setPhone(lisRequest.getPhone());
93   - model.setCardNo(lisRequest.getCardNo());
94 93 model.setSex(lisRequest.getSex());
95 94 model.setTitle(lisRequest.getTitle());
96 95 model.setType(lisRequest.getType());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ e527930
... ... @@ -1660,8 +1660,9 @@
1660 1660 result.setYlSelect(model.getYlSelect());
1661 1661 result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
1662 1662 result.setIsUNHS(model.getIsUNHS());
1663   - result.setHearScrResult(model.getHearScrResult());
1664   -
  1663 + if(model.getIsUNHS()!=null && model.getIsUNHS() != 0){
  1664 + result.setHearScrResult(model.getHearScrResult());
  1665 + }
1665 1666 result.setZhlbxqState(model.getZhlbxqState());
1666 1667 result.setKouqNew(model.getKouqNew());
1667 1668 result.setTxngNew(model.getTxngNew());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ e527930
... ... @@ -5236,8 +5236,9 @@
5236 5236 result = result.convertToResult(model);
5237 5237 result.setYlSelect(model.getYlSelect());
5238 5238 result.setIsUNHS(model.getIsUNHS());
5239   - result.setHearScrResult(model.getHearScrResult());
5240   -
  5239 + if(model.getIsUNHS()!=null && model.getIsUNHS() != 0){
  5240 + result.setHearScrResult(model.getHearScrResult());
  5241 + }
5241 5242 result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
5242 5243 result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族
5243 5244 result.setEncoded(model.getEncoded());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java View file @ e527930
... ... @@ -18,10 +18,9 @@
18 18 private String type;
19 19 // 就诊卡号
20 20 private String vcCardNo;
21   - private String cardNo;
22 21 // 患者姓名
23 22 private String name;
24   - // 住院号
  23 + // 住院号(身份证号码存储 承德滦平)
25 24 private String bhnum;
26 25 // 患者年龄
27 26 private String age;
... ... @@ -53,14 +52,6 @@
53 52  
54 53 //检验项集合
55 54 private List<LisReportItemModel> items;
56   -
57   - public String getCardNo() {
58   - return cardNo;
59   - }
60   -
61   - public void setCardNo(String cardNo) {
62   - this.cardNo = cardNo;
63   - }
64 55  
65 56 public Integer getStatus() {
66 57 return status;