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 e814f82..fc94a17 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 @@ -55,7 +55,7 @@ public class QhdfyHisService { public void syncLisReportTimer() { - Date date = new Date(); + Date date = new Date(); queryLisReport(new Date(date.getTime()-1000*60*60)); } @@ -274,8 +274,8 @@ public class QhdfyHisService { return resultList; } - - + + /** * gxk 新建接口(与queryCheckList接口显示格式不同) * 根据日期或检查项目分类调用的方法 @@ -284,9 +284,9 @@ public class QhdfyHisService { * @return */ public List queryCheckListupdate(String cardNo,int ftype){ - - CheckResponse check1=new CheckResponse(); - check1.setModified(DateUtil.parseYMDHMS("2017-3-31")); + + CheckResponse check1=new CheckResponse(); + check1.setModified(DateUtil.parseYMDHMS("1452126368000")); check1.setType(1); check1.setName("张三"); check1.setTitle("血常规"); @@ -295,9 +295,9 @@ public class QhdfyHisService { check1.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31"))); check1.setCheckDept("血科"); check1.setDoctor("王医生"); - + CheckResponse check10=new CheckResponse(); - check10.setModified(DateUtil.parseYMDHMS("2017-3-31")); + check10.setModified(DateUtil.parseYMDHMS("1452126368000")); check10.setType(1); check10.setName("张三"); check10.setTitle("肝功能"); @@ -306,9 +306,9 @@ public class QhdfyHisService { check10.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31"))); check10.setCheckDept("肝科"); check10.setDoctor("刘医生"); - + CheckResponse check9=new CheckResponse(); - check9.setModified(DateUtil.parseYMDHMS("2017-3-31")); + check9.setModified(DateUtil.parseYMDHMS("1452126368000")); check9.setType(2); check9.setName("张三"); check9.setTitle("肝功能"); @@ -317,23 +317,23 @@ public class QhdfyHisService { check9.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS("2017-3-31"))); check9.setCheckDept("肝科"); check9.setDoctor("刘医生"); - + CheckItemResponse check2=new CheckItemResponse(); check2.setName("白细胞"); check2.setCode("0101001"); check2.setRefer("4.00--10.00"); check2.setResult("13.68"); check2.setSpecial("H"); - + CheckItemResponse check3=new CheckItemResponse(); - + check3.setName("超敏 C反应蛋白"); check3.setCode("0101501"); check3.setRefer("0--5"); check3.setResult("3.2"); check3.setSpecial("M"); check3.setUnit("mg/L"); - + CheckItemResponse check4=new CheckItemResponse(); check4.setName("大便性状"); check4.setCode("0103003"); @@ -341,7 +341,7 @@ public class QhdfyHisService { check4.setResult("稀便"); check4.setSpecial("M"); check4.setUnit(""); - + CheckItemResponse check5=new CheckItemResponse(); check5.setName("大便颜色"); check5.setCode("0103002"); @@ -349,7 +349,7 @@ public class QhdfyHisService { check5.setResult("黄色"); check5.setSpecial("M"); check5.setUnit(""); - + List listc=new ArrayList(); listc.add(check2); listc.add(check3); @@ -359,199 +359,200 @@ public class QhdfyHisService { check1.setItemList(listc); check10.setItemList(listc2); check9.setItemList(listc2); - List l=new ArrayList(); + List l=new ArrayList(); l.add(check1); l.add(check10); l.add(check9); - - if(1==ftype){ - List result = new ArrayList<>(); - - List CheckByDate=new ArrayList(); - List CheckType=new ArrayList(); - result.addAll(l); - //result.addAll(queryLisCheckList(cardNo));解开 - //result.addAll(queryPacsCheckList(cardNo)); - List keyList = new ArrayList<>(); - // 去重 - List list = new ArrayList<>(); - Date tempDate = null; - for (CheckResponse check:result) { - if (check.getModified() != null && check.getModified().equals(tempDate)) { - continue; - } - list.add(check); - tempDate = check.getModified(); - } - // 排序 - Collections.sort(list, new Comparator() { - public int compare(Object a, Object b) { - if (((CheckResponse)a).getModified() == null) { - return -1; - } - if (((CheckResponse)b).getModified() == null) { - return -1; - } - if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) { - return 1; - } - return -1; - } - }); - - for (CheckResponse check:list) { - String ymd = DateUtil.getyyyy_MM_dd(check.getModified()); - if (!keyList.contains(ymd)) { - keyList.add(ymd); - } - - } - - for(String time:keyList){ - List result2=new ArrayList<>(); - CheckType jianyan=new CheckType(); - jianyan.setType("检验报告"); - CheckType yingxiang=new CheckType(); - yingxiang.setType("影像报告"); - CheckType other=new CheckType(); - other.setType("其它报告"); - for(CheckResponse chre:result){ - if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){ - if(chre.getType() == 1){ - result2.add(chre); - jianyan.setTypeName(result2); - CheckType.add(jianyan); - }else if(chre.getType() == 2){ - result2.add(chre); - yingxiang.setTypeName(result2); - CheckType.add(yingxiang); - }else{ - result2.add(chre); - other.setTypeName(result2); - CheckType.add(other); - } - } - } - - CheckByDate CheckByDate1=new CheckByDate(); - CheckByDate1.setTime(time); - CheckByDate1.setTypes(CheckType); - CheckByDate.add(CheckByDate1); - } - - return CheckByDate; - - }else{ - List result = new ArrayList<>(); - List CheckByDate=new ArrayList(); - List CheckType=new ArrayList(); - result.addAll(l); - //result.addAll(queryLisCheckList(cardNo));解开 - //result.addAll(queryPacsCheckList(cardNo)); - List keyList = new ArrayList<>(); - List listtype=new ArrayList<>(); - List listt = new ArrayList<>(); - // 去重 - List list = new ArrayList<>(); - Integer num=0; - for(CheckResponse check:result){ - if(check.getType()!=null && check.getType()==num){ - continue; - } - list.add(check); - num=check.getType(); - } - String t=null; - for(CheckResponse check:result){ - if(check.getTitle()!=null && check.getTitle().equals(t)){ - continue; - } - listt.add(check); - t=check.getTitle(); - } - - - // 排序 - Collections.sort(list, new Comparator() { - public int compare(Object a, Object b) { - if (((CheckResponse)a).getModified() == null) { - return -1; - } - if (((CheckResponse)b).getModified() == null) { - return -1; - } - if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) { - return 1; - } - return -1; - } - }); - - for (CheckResponse check:list) { - Integer ymd = check.getType(); - if (!keyList.contains(ymd.toString())) { - keyList.add(ymd.toString()); - } - - } - for(CheckResponse check:listt){ - String ty=check.getTitle(); - if(!listtype.contains(ty)){ - listtype.add(ty); - } - } - - - - - for(String type:keyList){ - - - - for(String typ:listtype){ - List result2=new ArrayList<>(); - CheckType CheckType1=new CheckType(); - CheckType1.setType(typ); - for(CheckResponse chre:result){ - if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){ - chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle()); - result2.add(chre); - CheckType1.setTypeName(result2); - CheckType.add(CheckType1); - } - - } - } - - - CheckByDate CheckByDate1=new CheckByDate(); - if("1".equals(type)){ - CheckByDate1.setTime("检验报告"); - CheckByDate1.setTypes(CheckType); - CheckByDate.add(CheckByDate1); - }else if("2".equals(type)){ - CheckByDate1.setTime("影像报告"); - CheckByDate1.setTypes(CheckType); - CheckByDate.add(CheckByDate1); - }else{ - CheckByDate1.setTime("其它报告"); - CheckByDate1.setTypes(CheckType); - CheckByDate.add(CheckByDate1); - } - - } - - - return CheckByDate; - } - + + if(1==ftype){ + List result = new ArrayList<>(); + + List CheckByDate=new ArrayList(); + List CheckType=new ArrayList(); + result.addAll(l); + //result.addAll(queryLisCheckList(cardNo));解开 + //result.addAll(queryPacsCheckList(cardNo)); + List keyList = new ArrayList<>(); + // 去重 + List list = new ArrayList<>(); + Date tempDate = null; + for (CheckResponse check:result) { + if (check.getModified() != null && check.getModified().equals(tempDate)) { + continue; + } + list.add(check); + tempDate = check.getModified(); + } + // 排序 + Collections.sort(list, new Comparator() { + public int compare(Object a, Object b) { + if (((CheckResponse)a).getModified() == null) { + return -1; + } + if (((CheckResponse)b).getModified() == null) { + return -1; + } + if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) { + return 1; + } + return -1; + } + }); + + for (CheckResponse check:list) { + String ymd = DateUtil.getyyyy_MM_dd(check.getModified()); + if (!keyList.contains(ymd)) { + keyList.add(ymd); + } + + } + + for(String time:keyList){ + List result2=new ArrayList<>(); + CheckType jianyan=new CheckType(); + jianyan.setType("检验报告"); + CheckType yingxiang=new CheckType(); + yingxiang.setType("影像报告"); + CheckType other=new CheckType(); + other.setType("其它报告"); + for(CheckResponse chre:result){ + if(time.equals(DateUtil.getyyyy_MM_dd(chre.getModified()))){ + if(chre.getType() == 1){ + result2.add(chre); + jianyan.setTypeName(result2); + CheckType.add(jianyan); + }else if(chre.getType() == 2){ + result2.add(chre); + yingxiang.setTypeName(result2); + CheckType.add(yingxiang); + }else{ + result2.add(chre); + other.setTypeName(result2); + CheckType.add(other); + } + + } + } + + CheckByDate CheckByDate1=new CheckByDate(); + CheckByDate1.setTime(time); + CheckByDate1.setTypes(CheckType); + CheckByDate.add(CheckByDate1); + } + + return CheckByDate; + + }else{ + List result = new ArrayList<>(); + List CheckByDate=new ArrayList(); + List CheckType=new ArrayList(); + result.addAll(l); + //result.addAll(queryLisCheckList(cardNo));解开 + //result.addAll(queryPacsCheckList(cardNo)); + List keyList = new ArrayList<>(); + List listtype=new ArrayList<>(); + List listt = new ArrayList<>(); + // 去重 + List list = new ArrayList<>(); + Integer num=0; + for(CheckResponse check:result){ + if(check.getType()!=null && check.getType()==num){ + continue; + } + list.add(check); + num=check.getType(); + } + String t=null; + for(CheckResponse check:result){ + if(check.getTitle()!=null && check.getTitle().equals(t)){ + continue; + } + listt.add(check); + t=check.getTitle(); + } + + + // 排序 + Collections.sort(list, new Comparator() { + public int compare(Object a, Object b) { + if (((CheckResponse)a).getModified() == null) { + return -1; + } + if (((CheckResponse)b).getModified() == null) { + return -1; + } + if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) { + return 1; + } + return -1; + } + }); + + for (CheckResponse check:list) { + Integer ymd = check.getType(); + if (!keyList.contains(ymd.toString())) { + keyList.add(ymd.toString()); + } + + } + for(CheckResponse check:listt){ + String ty=check.getTitle(); + if(!listtype.contains(ty)){ + listtype.add(ty); + } + } + + + + + for(String type:keyList){ + + + + for(String typ:listtype){ + List result2=new ArrayList<>(); + CheckType CheckType1=new CheckType(); + CheckType1.setType(typ); + for(CheckResponse chre:result){ + if(type.equals(chre.getType().toString()) && typ.equals(chre.getTitle())){ + chre.setTitle(DateUtil.getyyyy_MM_dd(chre.getModified())+" "+chre.getTitle()); + result2.add(chre); + CheckType1.setTypeName(result2); + CheckType.add(CheckType1); + } + + } + } + + + CheckByDate CheckByDate1=new CheckByDate(); + if("1".equals(type)){ + CheckByDate1.setTime("检验报告"); + CheckByDate1.setTypes(CheckType); + CheckByDate.add(CheckByDate1); + }else if("2".equals(type)){ + CheckByDate1.setTime("影像报告"); + CheckByDate1.setTypes(CheckType); + CheckByDate.add(CheckByDate1); + }else{ + CheckByDate1.setTime("其它报告"); + CheckByDate1.setTypes(CheckType); + CheckByDate.add(CheckByDate1); + } + + } + + + return CheckByDate; + } + } - - - - - - + + + + + + public List queryLisCheckList(String cardNo) { List result = new ArrayList<>(); @@ -684,7 +685,7 @@ public class QhdfyHisService { QueryRunner queryRunner = new QueryRunner(); try { - // List list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler(DiagnosisInfo.class)); + // List list = queryRunner.query(conn, "select cyzdmc as diagnosisItem from ZY_BRSYK where blh= '"+blNo+"'", new BeanListHandler(DiagnosisInfo.class)); List list = queryRunner.query(conn, "select ZDMC as diagnosisItem from JHMK_BRZDQK where ZYHM = '"+blNo+"'", new BeanListHandler(DiagnosisInfo.class)); if (CollectionUtils.isNotEmpty(list)) { // for (DiagnosisInfo info:list) {