diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java index 3c91f8b..ca62d9d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportModel.java @@ -18,10 +18,9 @@ public class LisReportModel { private String type; // 就诊卡号 private String vcCardNo; - private String cardNo; // 患者姓名 private String name; - // 住院号 + // 住院号(身份证号码存储 承德滦平) private String bhnum; // 患者年龄 private String age; @@ -61,14 +60,6 @@ public class LisReportModel { //医院名称 private String hospitalName; - public String getCardNo() { - return cardNo; - } - - public void setCardNo(String cardNo) { - this.cardNo = cardNo; - } - public String getHospitalName() { return hospitalName; } @@ -261,7 +252,6 @@ public class LisReportModel { ", title='" + title + '\'' + ", type='" + type + '\'' + ", vcCardNo='" + vcCardNo + '\'' + - ", cardNo='" + cardNo + '\'' + ", name='" + name + '\'' + ", bhnum='" + bhnum + '\'' + ", age='" + age + '\'' + 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 27560ce..fa6aef2 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml @@ -8,7 +8,6 @@ TITLE, TYPE, VCCARDNO, - CARDNO, NAME, BHNUM, AGE, @@ -30,7 +29,6 @@ #{title}, #{type}, #{vcCardNo}, - #{cardNo}, #{name}, #{bhnum}, #{age}, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index 58e79c5..1233eaa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -90,7 +90,6 @@ public class LisController extends BaseController { model.setName(lisRequest.getName()); model.setBhnum(lisRequest.getBhnum()); model.setPhone(lisRequest.getPhone()); - model.setCardNo(lisRequest.getCardNo()); model.setSex(lisRequest.getSex()); model.setTitle(lisRequest.getTitle()); model.setType(lisRequest.getType()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index bfeefb3..38be248 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1660,8 +1660,9 @@ public class BabyBookbuildingFacade { result.setYlSelect(model.getYlSelect()); result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); result.setIsUNHS(model.getIsUNHS()); - result.setHearScrResult(model.getHearScrResult()); - + if(model.getIsUNHS()!=null && model.getIsUNHS() != 0){ + result.setHearScrResult(model.getHearScrResult()); + } result.setZhlbxqState(model.getZhlbxqState()); result.setKouqNew(model.getKouqNew()); result.setTxngNew(model.getTxngNew()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 07920f9..e960cc3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5236,8 +5236,9 @@ public class ViewFacade { result = result.convertToResult(model); result.setYlSelect(model.getYlSelect()); result.setIsUNHS(model.getIsUNHS()); - result.setHearScrResult(model.getHearScrResult()); - + if(model.getIsUNHS()!=null && model.getIsUNHS() != 0){ + result.setHearScrResult(model.getHearScrResult()); + } result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族 result.setEncoded(model.getEncoded()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java index 6a203e8..97c5268 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/LisReportModelRequest.java @@ -18,10 +18,9 @@ public class LisReportModelRequest { private String type; // 就诊卡号 private String vcCardNo; - private String cardNo; // 患者姓名 private String name; - // 住院号 + // 住院号(身份证号码存储 承德滦平) private String bhnum; // 患者年龄 private String age; @@ -54,14 +53,6 @@ public class LisReportModelRequest { //检验项集合 private List items; - public String getCardNo() { - return cardNo; - } - - public void setCardNo(String cardNo) { - this.cardNo = cardNo; - } - public Integer getStatus() { return status; }