diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java index 7c0f90c..d3c81db 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java @@ -12,6 +12,8 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.permission.model.LisReportItemModel; +import com.lyms.platform.permission.model.LisReportModel; import com.lyms.platform.pojo.*; import com.lyms.platform.query.LisReportQuery; import com.lyms.platform.query.PatientsQuery; @@ -480,7 +482,7 @@ public class QhdfyHisService { }else{ List result = new ArrayList(); List CheckByDate=new ArrayList(); - //List CheckType=new ArrayList(); + //List CheckType=new ArrayList(); //result.addAll(l); result.addAll(queryLisCheckList(cardNo)); //result.addAll(queryPacsCheckList(cardNo)); @@ -668,6 +670,78 @@ public class QhdfyHisService { return result; } + public List queryQhdCheckLisInfo(String vcCardNo,String phone,String titles,String checkTime) { + System.out.println("checktime = " + checkTime); + String startDate = DateUtil.getyyyy_MM_dd(DateUtil.parseYMD(checkTime))+" 00:00:00"; + String endDate = DateUtil.getyyyy_MM_dd(DateUtil.addDay(DateUtil.parseYMD(checkTime),2))+" 00:00:00"; + + List result = new ArrayList<>(); + Connection conn = ConnTools.makeLisConnection(); + QueryRunner queryRunner = new QueryRunner(true); + if (StringUtils.isNotBlank(vcCardNo)) { + + try { + String sql = " SELECT shenqinghao as lisId, " + + " baogaoleibiemingcheng as title, " + + " '' as type, " + + " kahao as vcCardNo, " + + " huanzhexingming as name, " + + " zhuyuanhao as bhnum, " + + " nianling as age, " + + " xingbie as sex, " + + " shengqingshijian as applyTime, " + + " jianchashijian as checkTime, " + + " baogaofabushijian as publishTime, " + + " shenqingyishengmingcheng as applyDoctor, " + + " shenqingkeshimingcheng as applyDept, " + + " '' as checker, " + + " baogaofabushijian as modified, " + + " baogaofabushijian as created, " + + " phone as phone " + + " from valllist_ex_en where kahao = '"+vcCardNo+"' " + + " and baogaofabushijian >= CONVERT(DATETIME,'" + startDate +"', 120) " + + " and baogaofabushijian <= CONVERT(DATETIME,'" + endDate +"', 120) " + + " and baogaoleibiemingcheng in "+ titles + " order by baogaofabushijian desc "; + String subSql = " select " + + " sheqingdanhao as lisId, " + + " xiangmudaima as code, " + + " xiangmumingcheng as name, " + + " zifujieguo as charResult, " + + " shuzijieguo as numberResult, " + + " zifujieguo as result, " + + " shuzijieguo as resultFlag, " + + " cankaozhi as ref, " + + " jieguoleixing as resultType," + + " danwei as unit, " + + " '216' as hospitalId " + + " from valresult_ex_en " + + " where sheqingdanhao ='"; + System.out.println("lis sql = " + sql); + List lisReportList = queryRunner.query(conn, sql, new BeanListHandler(LisReportModel.class)); + if (CollectionUtils.isNotEmpty(lisReportList)) { + for (LisReportModel lisReport : lisReportList) { + if (StringUtils.isNotBlank(lisReport.getLisId())) { + List lisReportItemList = + queryRunner.query(conn, subSql+lisReport.getLisId()+"'", + new BeanListHandler(LisReportItemModel.class)); + if (CollectionUtils.isNotEmpty(lisReportItemList)) { + System.out.println("items = " + lisReportItemList.size()); + lisReport.setItems(lisReportItemList); + } + } + } + return lisReportList; + } + } catch (SQLException e) { + e.printStackTrace(); + return result; + }finally { + DbUtils.closeQuietly(conn); + } + } + return result; + } + public List> getPatientInfoList(String cardNo){ List> result = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 936fea8..c3069e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -61,6 +61,9 @@ public class LisFacade { @Autowired private QhdfyHisService qhdfyHisService; + @Autowired + private NczxyyLisService nczxyyLisService; + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); /** @@ -76,7 +79,7 @@ public class LisFacade { //获取lis数据 if("7".equals(HIS_VERSION)){ //根据调用接口获取四川南充中心医院的Lis数据 - result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); + result.addAll(nczxyyLisService.queryLisCheckList(vcCardNo)); }else{ result.addAll(queryLisCheckList(vcCardNo,phone,userId)); } @@ -164,7 +167,7 @@ public class LisFacade { List result = new ArrayList(); if("7".equals(HIS_VERSION)){ //根据调用接口获取四川南充中心医院的Lis数据 - result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); + result.addAll(nczxyyLisService.queryLisCheckList(vcCardNo)); }else{ result.addAll(queryLisCheckList(vcCardNo,phone,userId)); }