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 839d9c8..ff7c429 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,6 +24,8 @@ public class LisReportQuery extends BaseQuery { private String type; // 就诊卡号 private String vcCardNo; + //儿童社保卡 + private String sINCard; // 就诊卡号 private List vcCardNos; @@ -73,6 +75,14 @@ public class LisReportQuery extends BaseQuery { //检验明细json private String itemJson; + public String getsINCard() { + return sINCard; + } + + public void setsINCard(String sINCard) { + this.sINCard = sINCard; + } + public Integer getId() { return id; } @@ -283,13 +293,34 @@ public class LisReportQuery extends BaseQuery { @Override public String toString() { - return "LisReportModel [id=" + id + ", lisId=" + lisId + ", title=" - + title + ", type=" + type + ", vcCardNo=" + vcCardNo - + ", name=" + name + ", bhnum=" + bhnum + ", age=" + age - + ", sex=" + sex + ", applyTime=" + applyTime + ", checkTime=" - + checkTime + ", publishTime=" + publishTime + ", applyDoctor=" - + applyDoctor + ", applyDept=" + applyDept + ", checker=" - + checker + ", modified=" + modified + ", created=" + created - + ", hospitalId=" + hospitalId + "]"; + return "LisReportQuery{" + + "id=" + id + + ", lisId='" + lisId + '\'' + + ", title='" + title + '\'' + + ", titles=" + titles + + ", type='" + type + '\'' + + ", vcCardNo='" + vcCardNo + '\'' + + ", sINCard='" + sINCard + '\'' + + ", vcCardNos=" + vcCardNos + + ", name='" + name + '\'' + + ", bhnum='" + bhnum + '\'' + + ", age='" + age + '\'' + + ", sex='" + sex + '\'' + + ", applyTime='" + applyTime + '\'' + + ", checkTime='" + checkTime + '\'' + + ", publishTime='" + publishTime + '\'' + + ", applyDoctor='" + applyDoctor + '\'' + + ", applyDept='" + applyDept + '\'' + + ", checker='" + checker + '\'' + + ", modified='" + modified + '\'' + + ", created='" + created + '\'' + + ", hospitalId='" + hospitalId + '\'' + + ", hospitalIds=" + hospitalIds + + ", phone='" + phone + '\'' + + ", phones=" + phones + + ", items=" + items + + ", status=" + status + + ", itemJson='" + itemJson + '\'' + + '}'; } } 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 9b24239..2c7acc0 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml @@ -111,10 +111,9 @@ AND LIS_ID = #{lisId} - - AND VCCARDNO = #{vcCardNo} + + AND VCCARDNO = #{vcCardNo} or VCCARDNO = #{sINCard} - AND VCCARDNO IN checkByDate = new ArrayList(); //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(userId); - List result = queryLisCheckList(vcCardNo, phone, hospitalId, cardNo, perType, userName); + List result = queryLisCheckList(vcCardNo,sINCard, phone, hospitalId, cardNo, perType, userName); //排序检查大项 sortLis(result); @@ -232,7 +232,7 @@ public class LisFacade { * @param perType 2-儿童 * @return */ - public List queryLisCheckList(String vcCardNo, String phone, String hospitalId, String cardNo, int perType,String userName) { + public List queryLisCheckList(String vcCardNo,String sINCard, String phone, String hospitalId, String cardNo, int perType,String userName) { //保存这个人在所有医院的lis记录 List result = new ArrayList<>(); @@ -256,7 +256,7 @@ public class LisFacade { if (perType == 2) {//儿童 model.setHospitalId(hospitalId); //通过就诊卡号和医院id查询到医院下面的lis记录 - lises = queryLisData(vcCardNo, "", "",perType, model); + lises = queryLisData(vcCardNo, sINCard,"", "",perType, model); } else if (perType == 3) { @@ -269,7 +269,7 @@ public class LisFacade { { //通过就诊卡号和医院id查询到医院下面的lis记录 model.setHospitalId("2100001580"); - lises = queryLisData(vcCardNo, phone, cardNo,perType, model); + lises = queryLisData(vcCardNo,null, phone, cardNo,perType, model); } else { @@ -309,7 +309,7 @@ public class LisFacade { } model.setHospitalId(pat.getHospitalId()); //通过就诊卡号和医院id查询到医院下面的lis记录 - lises = queryLisData(pat.getVcCardNo(), pat.getPhone(), pat.getCardNo(),perType, model); + lises = queryLisData(pat.getVcCardNo(),null, pat.getPhone(), pat.getCardNo(),perType, model); } } } @@ -390,11 +390,11 @@ public class LisFacade { * @param model * @return */ - private List queryLisData(String vcCardNo, String phone, String cardNo,int perType, LisReportQuery model) { + private List queryLisData(String vcCardNo,String sINCard, String phone, String cardNo,int perType, LisReportQuery model) { List reportModelList = new ArrayList<>(); //通过就诊卡号和医院id查询到医院下面的lis记录 - if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo)) { + if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(sINCard) || StringUtils.isNotEmpty(cardNo)) { //德州市妇幼 if ("1000000114".equals(model.getHospitalId())) { model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); @@ -438,10 +438,10 @@ public class LisFacade { // else if("2100001605".equals(model.getHospitalId())){ // model.setVcCardNo(cardNo); //TODO // } - else if (StringUtils.isNotEmpty(vcCardNo)) { + else if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(sINCard)) { model.setVcCardNo(vcCardNo); - } - else if (StringUtils.isNotEmpty(cardNo)) + model.setsINCard(sINCard); + } else if (StringUtils.isNotEmpty(cardNo)) { model.setVcCardNo(cardNo); }