diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java index dfa4d71..d9c8354 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java @@ -21,6 +21,10 @@ public class HighriskChangeHospitalQuery extends BaseQuery { */ private String targetId; /** + * 查询号 + */ + private String queryNo; + /** * 转出医院ID */ private String outOrgid; @@ -65,6 +69,14 @@ public class HighriskChangeHospitalQuery extends BaseQuery { */ private Date createTime; /** + * 创建时间（转出开始时间） + */ + private String createStartTime; + /** + * 创建时间（转出结束时间） + */ + private String createEndTime; + /** * 接收时间 */ private Date receiveTime; @@ -72,12 +84,19 @@ public class HighriskChangeHospitalQuery extends BaseQuery { * 接收医生 */ private String receiveDoctorid; - /** * 听筛记录ID */ private String scrreenId; + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + public String getScrreenId() { return scrreenId; } @@ -96,6 +115,22 @@ public class HighriskChangeHospitalQuery extends BaseQuery { } + public String getCreateStartTime() { + return createStartTime; + } + + public void setCreateStartTime(String createStartTime) { + this.createStartTime = createStartTime; + } + + public String getCreateEndTime() { + return createEndTime; + } + + public void setCreateEndTime(String createEndTime) { + this.createEndTime = createEndTime; + } + public Integer getTargetType() { return targetType; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml b/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml index c26cbe7..9f8653d 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml @@ -147,6 +147,19 @@ select ID,TARGET_TYPE,TARGET_ID,OUT_ORGID,INTO_ORGID,DESCRIPTION,MUSTDESC,RISK,C and CREATE_TIME = #{createTime,jdbcType=TIMESTAMP} + + AND + + + + AND + =0 + ]]> + + and RECEIVE_TIME = #{receiveTime,jdbcType=TIMESTAMP} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java new file mode 100644 index 0000000..0e8b56e --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java @@ -0,0 +1,171 @@ +package com.lyms.platform.common.enums; + +/** + * @auther yangfei + * @createTime 2017年07月14日 16时24分 + * @discription + */ +public class HdEnums { + + public enum IsConfirmEnums { + BY(1, "已确诊"), + WY(2, "待确诊"); + + private int id; + private String name; + + IsConfirmEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + //1-轻度，2-中度，3-重度，4-极重 + public enum ConfirmLevelEnums { + QD(1, "轻度"), + ZD(2, "中度"), + ZHD(3, "重度"), + JZ(4, "极重"); + + private int id; + private String name; + + ConfirmLevelEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + //1-轻度耳聋，2-中度耳聋，3-重度耳聋，4-极重耳聋 + public enum ConfirmResultEnums { + QD(1, "轻度耳聋"), + ZD(2, "中度耳聋"), + ZHD(3, "重度耳聋"), + JZD(4, "极重耳聋"); + + private int id; + private String name; + + ConfirmResultEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + public enum SourceEnums { + BY(1, "本院"), + ALL(3, "全部"), + WY(2, "*外院"); + + private int id; + private String name; + + SourceEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + public enum StatusEnums { + YZD(1, "已诊断"), + DZD(2, "待诊断"); + + private int id; + private String name; + + StatusEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + + public static String getTitle(int id) { + if (id == 0) { + return ""; + } + for (StatusEnums cfEnums : StatusEnums.values()) { + if (id == cfEnums.getId()) { + return cfEnums.getName(); + } + } + return ""; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 79fafc5..7619fbc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -14,6 +14,7 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.InitFollowUp; import com.lyms.platform.operate.web.result.InitFollowUpListData; import com.lyms.platform.operate.web.result.InitHearingDiagnose; +import com.lyms.platform.operate.web.result.InitHearingDiagnoseListData; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import org.springframework.beans.factory.annotation.Autowired; @@ -137,6 +138,25 @@ public class EarController extends BaseController { } /** + * 随访模块列表管理初始化数据 + * + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnoseListData") + @ResponseBody + @TokenRequired + public BaseResponse initHearingDiagnoseListData() { + InitHearingDiagnoseListData baseResponse = new InitHearingDiagnoseListData(); + //状态 + baseResponse.setStatus(EnumUtil.toJson(HdEnums.StatusEnums.class)); + baseResponse.setSource(EnumUtil.toJson(HdEnums.SourceEnums.class)); + baseResponse.setIsConfirm(EnumUtil.toJson(HdEnums.IsConfirmEnums.class)); + baseResponse.setConfirmResult(EnumUtil.toJson(HdEnums.ConfirmResultEnums.class)); + baseResponse.setConfirmLevel(EnumUtil.toJson(HdEnums.ConfirmLevelEnums.class)); + return baseResponse; + } + + /** * 进入新增听力诊断页面前，验证及初始化数据 * * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index a5a6a61..73bbbe8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -259,6 +259,10 @@ public class HighriskChangeHospitalController extends BaseController { if (loginState == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } + //查询号 queryNo + //查询儿童表 和 母亲表 获取id + + //医院id String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); if (type != null && type == 1) {//转出 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnoseListData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnoseListData.java new file mode 100644 index 0000000..e679000 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnoseListData.java @@ -0,0 +1,64 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.result.BaseResponse; + +import java.util.List; +import java.util.Map; + +/** + * @auther yangfei + * @createTime 2017年05月15日 15时04分 + * @discription 听力诊断管理列表页面初始化数据 + */ +public class InitHearingDiagnoseListData extends BaseResponse{ + //状态 + private List> status; + //来源 + private List> source; + //是否确诊确诊结果 + private List> isConfirm; + //确诊结果 + private List> confirmResult; + //确诊程度 + private List> confirmLevel; + + public List> getStatus() { + return status; + } + + public void setStatus(List> status) { + this.status = status; + } + + public List> getSource() { + return source; + } + + public void setSource(List> source) { + this.source = source; + } + + public List> getIsConfirm() { + return isConfirm; + } + + public void setIsConfirm(List> isConfirm) { + this.isConfirm = isConfirm; + } + + public List> getConfirmResult() { + return confirmResult; + } + + public void setConfirmResult(List> confirmResult) { + this.confirmResult = confirmResult; + } + + public List> getConfirmLevel() { + return confirmLevel; + } + + public void setConfirmLevel(List> confirmLevel) { + this.confirmLevel = confirmLevel; + } +}