diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java index 4d958b6..67512cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java @@ -1,6 +1,5 @@ package com.lyms.hospitalapi.pojo; -import java.util.Date; /** * Created by Administrator on 2016/9/9 0009. @@ -37,12 +36,12 @@ public class LisCheckInfo { private String P_ADMISSIONNUM; private String P_REPORTTYPENAME; private String P_APPLATIONDOCNAME; - private Date P_REPORTISSUETIME; - private Date P_APPLATIONTIME; - private Date P_REPORTTIME; - private Date P_CHECKTIME; - private Date MODIFIED; - private Integer STATUS; + private String P_REPORTISSUETIME; + private String P_APPLATIONTIME; + private String P_REPORTTIME; + private String P_CHECKTIME; + private String MODIFIED; + private String STATUS; public String getP_TITLE() { return P_TITLE; @@ -140,51 +139,51 @@ public class LisCheckInfo { P_APPLATIONDOCNAME = p_APPLATIONDOCNAME; } - public Date getP_REPORTISSUETIME() { + public String getP_REPORTISSUETIME() { return P_REPORTISSUETIME; } - public void setP_REPORTISSUETIME(Date p_REPORTISSUETIME) { + public void setP_REPORTISSUETIME(String p_REPORTISSUETIME) { P_REPORTISSUETIME = p_REPORTISSUETIME; } - public Date getP_APPLATIONTIME() { + public String getP_APPLATIONTIME() { return P_APPLATIONTIME; } - public void setP_APPLATIONTIME(Date p_APPLATIONTIME) { + public void setP_APPLATIONTIME(String p_APPLATIONTIME) { P_APPLATIONTIME = p_APPLATIONTIME; } - public Date getP_REPORTTIME() { + public String getP_REPORTTIME() { return P_REPORTTIME; } - public void setP_REPORTTIME(Date p_REPORTTIME) { + public void setP_REPORTTIME(String p_REPORTTIME) { P_REPORTTIME = p_REPORTTIME; } - public Date getP_CHECKTIME() { + public String getP_CHECKTIME() { return P_CHECKTIME; } - public void setP_CHECKTIME(Date p_CHECKTIME) { + public void setP_CHECKTIME(String p_CHECKTIME) { P_CHECKTIME = p_CHECKTIME; } - public Date getMODIFIED() { + public String getMODIFIED() { return MODIFIED; } - public void setMODIFIED(Date MODIFIED) { + public void setMODIFIED(String MODIFIED) { this.MODIFIED = MODIFIED; } - public Integer getSTATUS() { + public String getSTATUS() { return STATUS; } - public void setSTATUS(Integer STATUS) { + public void setSTATUS(String STATUS) { this.STATUS = STATUS; } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java index 39812b3..9d93f78 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java @@ -1,7 +1,5 @@ package com.lyms.hospitalapi.pojo; -import java.util.Date; - /** * Created by Administrator on 2016/9/9 0009. * 字段名称 字段类型 字段描述 @@ -31,9 +29,9 @@ public class LisCheckResult { private String P_ITEMRESULT; private String P_UNIT; private String P_CODERESULT; - private Date P_REPORTTIME; - private Integer P_PRINTORDER; - private Integer P_PRINTGROUP; + private String P_REPORTTIME; + private String P_PRINTORDER; + private String P_PRINTGROUP; public String getP_APPLICATIONNUM() { return P_APPLICATIONNUM; @@ -115,27 +113,27 @@ public class LisCheckResult { P_CODERESULT = p_CODERESULT; } - public Date getP_REPORTTIME() { + public String getP_REPORTTIME() { return P_REPORTTIME; } - public void setP_REPORTTIME(Date p_REPORTTIME) { + public void setP_REPORTTIME(String p_REPORTTIME) { P_REPORTTIME = p_REPORTTIME; } - public Integer getP_PRINTORDER() { + public String getP_PRINTORDER() { return P_PRINTORDER; } - public void setP_PRINTORDER(Integer p_PRINTORDER) { + public void setP_PRINTORDER(String p_PRINTORDER) { P_PRINTORDER = p_PRINTORDER; } - public Integer getP_PRINTGROUP() { + public String getP_PRINTGROUP() { return P_PRINTGROUP; } - public void setP_PRINTGROUP(Integer p_PRINTGROUP) { + public void setP_PRINTGROUP(String p_PRINTGROUP) { P_PRINTGROUP = p_PRINTGROUP; } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/RisCheckInfo.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/RisCheckInfo.java index fa8bbd3..1088dc0 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/RisCheckInfo.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/RisCheckInfo.java @@ -1,8 +1,5 @@ package com.lyms.hospitalapi.pojo; -import com.lyms.platform.common.utils.DateUtil; - -import java.util.Date; /** * Created by Administrator on 2016/9/9 0009. @@ -20,7 +17,7 @@ import java.util.Date; APPLY_DOCTOR VARCHAR2 申请医生 EXECUTE_DEPT VARCHAR2 执行科室名称 EXECUTE_MAN VARCHAR2 执行人 - APPLY_TIME Date 申请时间(检查时间) + APPLY_TIME String 申请时间(检查时间) STATUS NUMBER 1:申请中,2:检查中,3:诊断完成 MODIFIED DATE 最后修改时间 ITEM_RESULT,ITEM_FINDING,IMGS,P_TITLE @@ -40,10 +37,10 @@ public class RisCheckInfo { private String APPLY_DOCTOR; private String EXECUTE_DEPT; private String EXECUTE_MAN; - private Integer AGE; - private Integer STATUS; - private Date APPLY_TIME; - private Date MODIFIED; + private String AGE; + private String STATUS; + private String APPLY_TIME; + private String MODIFIED; private String ITEM_RESULT; private String ITEM_FINDING; private String IMGS; @@ -153,36 +150,36 @@ public class RisCheckInfo { this.EXECUTE_MAN = EXECUTE_MAN; } - public Integer getAGE() { + public String getAGE() { return AGE; } - public void setAGE(Integer AGE) { + public void setAGE(String AGE) { this.AGE = AGE; } - public Integer getSTATUS() { + public String getSTATUS() { return STATUS; } - public void setSTATUS(Integer STATUS) { + public void setSTATUS(String STATUS) { this.STATUS = STATUS; } - public Date getAPPLY_TIME() { + public String getAPPLY_TIME() { return APPLY_TIME; } public void setAPPLY_TIME(String APPLY_TIME) { - this.APPLY_TIME = DateUtil.parseYMDHMS(APPLY_TIME); + this.APPLY_TIME = APPLY_TIME; } - public Date getMODIFIED() { + public String getMODIFIED() { return MODIFIED; } public void setMODIFIED(String MODIFIED) { - this.MODIFIED = DateUtil.parseYMDHMS(MODIFIED); + this.MODIFIED = MODIFIED; } public String getITEM_RESULT() { diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java index 18fafbc..b13282a 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java @@ -3,6 +3,7 @@ package com.lyms.hospitalapi.v1; import com.lyms.hospitalapi.pojo.*; import com.lyms.hospitalapi.v2.*; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import org.apache.commons.dbutils.DbUtils; import org.apache.commons.dbutils.QueryRunner; import org.apache.commons.dbutils.handlers.BeanListHandler; @@ -29,7 +30,7 @@ public class HisService { List list = new ArrayList<>(); Date tempDate = null; for (CheckResponse check:result) { - if (check.getModified().equals(tempDate)) { + if (check.getModified() != null && check.getModified().equals(tempDate)) { continue; } list.add(check); @@ -39,6 +40,12 @@ public class HisService { // 排序 Collections.sort(list, new Comparator() { public int compare(Object a, Object b) { + if (((CheckResponse)a).getModified() == null) { + return 0; + } + if (((CheckResponse)b).getModified() == null) { + return 0; + } if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) { return 1; } @@ -78,6 +85,7 @@ public class HisService { CheckResult checkResult = new CheckResult(); checkResult.setJianyan(dayMap.get("jianyan")); checkResult.setYingxiang(dayMap.get("yingxiang")); + checkResult.setYmd(key); resultList.add(checkResult); } } @@ -98,13 +106,13 @@ public class HisService { List resultList = queryRunner.query(conn, "select * from lis_check_result where P_APPLICATIONNUM = '"+info.getP_APPLICATIONNUM()+"'", new BeanListHandler(LisCheckResult.class)); if (resultList != null && resultList.size() > 0) { CheckResponse check = new CheckResponse(); - check.setModified(info.getMODIFIED()); + check.setModified(DateUtil.parseYMDHMS(info.getMODIFIED())); check.setType(1); check.setName(info.getP_NAME()); check.setTitle(info.getP_TITLE()); check.setAge(info.getP_AGE()); - check.setApplyDate(info.getP_CHECKTIME()); - check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(info.getP_CHECKTIME())); + check.setApplyDate(DateUtil.parseYMDHMS(info.getP_CHECKTIME())); + check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(DateUtil.parseYMDHMS(info.getP_CHECKTIME()))); check.setCheckDept(info.getP_CHECKDEPARTNAME()); check.setDoctor(info.getP_APPLATIONDOCNAME()); if ("1".equals(info.getP_SEX())) { @@ -151,14 +159,14 @@ public class HisService { for (RisCheckInfo info:list) { if (StringUtils.isNotBlank(info.getITEM_RESULT())) { CheckResponse check = new CheckResponse(); - check.setModified(info.getMODIFIED()); + check.setModified(DateUtil.parseYMDHMS(info.getMODIFIED())); check.setType(2); check.setName(info.getNAME()); if (info.getAGE() != null) { check.setAge(info.getAGE().toString()); } - check.setApplyDate(info.getAPPLY_TIME()); - check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(info.getAPPLY_TIME())); + check.setApplyDate(DateUtil.parseYMDHMS(info.getAPPLY_TIME())); + check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(DateUtil.parseYMDHMS(info.getAPPLY_TIME()))); check.setCheckDept(info.getAPPLY_DEPT()); check.setDoctor(info.getEXECUTE_MAN()); if ("F".equals(info.getSEX())) {