jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a3e97fafcf9d7a1b9a4048f573280ad741ed1c05

Authored by litao
2 parents c7c5527403 a9fede39b0
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'remotes/origin/master'

Showing 2 changed files

platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml View file @ a3e97fa
... ... @@ -112,6 +112,10 @@
112 112 AND VCCARDNO = #{vcCardNo}
113 113 </if>
114 114  
  115 + <if test="phone != null and phone != ''">
  116 + AND PHONE = #{phone}
  117 + </if>
  118 +
115 119 <if test="hospitalId != null and hospitalId != ''">
116 120 AND HOSPITAL_ID = #{hospitalId}
117 121 </if>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ a3e97fa
... ... @@ -302,9 +302,14 @@
302 302 if(CollectionUtils.isNotEmpty(list)){
303 303 for(Patients pat : list)
304 304 {
305   - if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && StringUtils.isNotEmpty(pat.getHospitalId()))
  305 + if (pat != null && StringUtils.isNotEmpty(pat.getHospitalId()))
306 306 {
307 307  
  308 + if (StringUtils.isNotEmpty(pat.getVcCardNo()) && StringUtils.isNotEmpty(pat.getPhone()))
  309 + {
  310 + continue;
  311 + }
  312 +
308 313 //获取医院的名称
309 314 String hospitalName = hIdNames.get(pat.getHospitalId());
310 315 if (!StringUtils.isNotEmpty(hospitalName))
... ... @@ -321,6 +326,7 @@
321 326 LisReportModel model = new LisReportModel();
322 327 model.setVcCardNo(pat.getVcCardNo());
323 328 model.setHospitalId(pat.getHospitalId());
  329 + model.setPhone(pat.getPhone());
324 330 //通过就诊卡号和医院id查询到医院下面的lis记录
325 331 List<LisReportModel> lises = lisService.queryLisDataByModel(model);
326 332 if (CollectionUtils.isNotEmpty(lises))