jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c902bb6c9ecedd29e54f29cd9245d6a380a0dcda

Authored by yangfei
2 parents da57c60257 f261d01fa7
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/HighriskChangeHospitalQuery.java View file @ c902bb6
... ... @@ -21,6 +21,10 @@
21 21 */
22 22 private String targetId;
23 23 /**
  24 + * 查询号
  25 + */
  26 + private String queryNo;
  27 + /**
24 28 * 转出医院ID
25 29 */
26 30 private String outOrgid;
... ... @@ -65,6 +69,14 @@
65 69 */
66 70 private Date createTime;
67 71 /**
  72 + * 创建时间（转出开始时间）
  73 + */
  74 + private String createStartTime;
  75 + /**
  76 + * 创建时间（转出结束时间）
  77 + */
  78 + private String createEndTime;
  79 + /**
68 80 * 接收时间
69 81 */
70 82 private Date receiveTime;
71 83  
... ... @@ -72,12 +84,19 @@
72 84 * 接收医生
73 85 */
74 86 private String receiveDoctorid;
75   -
76 87 /**
77 88 * 听筛记录ID
78 89 */
79 90 private String scrreenId;
80 91  
  92 + public String getQueryNo() {
  93 + return queryNo;
  94 + }
  95 +
  96 + public void setQueryNo(String queryNo) {
  97 + this.queryNo = queryNo;
  98 + }
  99 +
81 100 public String getScrreenId() {
82 101 return scrreenId;
83 102 }
... ... @@ -94,6 +113,22 @@
94 113 public void setId(String id) {
95 114 this.id = id;
96 115  
  116 + }
  117 +
  118 + public String getCreateStartTime() {
  119 + return createStartTime;
  120 + }
  121 +
  122 + public void setCreateStartTime(String createStartTime) {
  123 + this.createStartTime = createStartTime;
  124 + }
  125 +
  126 + public String getCreateEndTime() {
  127 + return createEndTime;
  128 + }
  129 +
  130 + public void setCreateEndTime(String createEndTime) {
  131 + this.createEndTime = createEndTime;
97 132 }
98 133  
99 134 public Integer getTargetType() {
platform-biz-service/src/main/resources/mainOrm/master/HighriskChangeHospital.xml View file @ c902bb6
... ... @@ -147,6 +147,19 @@
147 147 <if test="createTime != null">
148 148 and CREATE_TIME = #{createTime,jdbcType=TIMESTAMP}
149 149 </if>
  150 + <if test="createStartTime != null and createStartTime != ''">
  151 + AND
  152 + <![CDATA[
  153 + DATEDIFF(#{createStartTime},CREATE_TIME)<=0
  154 + ]]>
  155 + </if>
  156 + <if test="createEndTime != null and createEndTime != ''">
  157 + AND
  158 + <![CDATA[
  159 + DATEDIFF(#{createEndTime},CREATE_TIME)>=0
  160 + ]]>
  161 + </if>
  162 +
150 163 <if test="receiveTime != null">
151 164 and RECEIVE_TIME = #{receiveTime,jdbcType=TIMESTAMP}
152 165 </if>
platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java View file @ c902bb6
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +/**
  4 + * @auther yangfei
  5 + * @createTime 2017年07月14日 16时24分
  6 + * @discription
  7 + */
  8 +public class HdEnums {
  9 +
  10 + public enum IsConfirmEnums {
  11 + BY(1, "已确诊"),
  12 + WY(2, "待确诊");
  13 +
  14 + private int id;
  15 + private String name;
  16 +
  17 + IsConfirmEnums(int id, String name) {
  18 + this.id = id;
  19 + this.name = name;
  20 + }
  21 +
  22 + public int getId() {
  23 + return id;
  24 + }
  25 +
  26 + public void setId(int id) {
  27 + this.id = id;
  28 + }
  29 +
  30 + public String getName() {
  31 + return name;
  32 + }
  33 +
  34 + public void setName(String name) {
  35 + this.name = name;
  36 + }
  37 + }
  38 + //1-轻度，2-中度，3-重度，4-极重
  39 + public enum ConfirmLevelEnums {
  40 + QD(1, "轻度"),
  41 + ZD(2, "中度"),
  42 + ZHD(3, "重度"),
  43 + JZ(4, "极重");
  44 +
  45 + private int id;
  46 + private String name;
  47 +
  48 + ConfirmLevelEnums(int id, String name) {
  49 + this.id = id;
  50 + this.name = name;
  51 + }
  52 +
  53 + public int getId() {
  54 + return id;
  55 + }
  56 +
  57 + public void setId(int id) {
  58 + this.id = id;
  59 + }
  60 +
  61 + public String getName() {
  62 + return name;
  63 + }
  64 +
  65 + public void setName(String name) {
  66 + this.name = name;
  67 + }
  68 + }
  69 + //1-轻度耳聋，2-中度耳聋，3-重度耳聋，4-极重耳聋
  70 + public enum ConfirmResultEnums {
  71 + QD(1, "轻度耳聋"),
  72 + ZD(2, "中度耳聋"),
  73 + ZHD(3, "重度耳聋"),
  74 + JZD(4, "极重耳聋");
  75 +
  76 + private int id;
  77 + private String name;
  78 +
  79 + ConfirmResultEnums(int id, String name) {
  80 + this.id = id;
  81 + this.name = name;
  82 + }
  83 +
  84 + public int getId() {
  85 + return id;
  86 + }
  87 +
  88 + public void setId(int id) {
  89 + this.id = id;
  90 + }
  91 +
  92 + public String getName() {
  93 + return name;
  94 + }
  95 +
  96 + public void setName(String name) {
  97 + this.name = name;
  98 + }
  99 + }
  100 +
  101 + public enum SourceEnums {
  102 + BY(1, "本院"),
  103 + ALL(3, "全部"),
  104 + WY(2, "*外院");
  105 +
  106 + private int id;
  107 + private String name;
  108 +
  109 + SourceEnums(int id, String name) {
  110 + this.id = id;
  111 + this.name = name;
  112 + }
  113 +
  114 + public int getId() {
  115 + return id;
  116 + }
  117 +
  118 + public void setId(int id) {
  119 + this.id = id;
  120 + }
  121 +
  122 + public String getName() {
  123 + return name;
  124 + }
  125 +
  126 + public void setName(String name) {
  127 + this.name = name;
  128 + }
  129 + }
  130 +
  131 + public enum StatusEnums {
  132 + YZD(1, "已诊断"),
  133 + DZD(2, "待诊断");
  134 +
  135 + private int id;
  136 + private String name;
  137 +
  138 + StatusEnums(int id, String name) {
  139 + this.id = id;
  140 + this.name = name;
  141 + }
  142 +
  143 + public int getId() {
  144 + return id;
  145 + }
  146 +
  147 + public void setId(int id) {
  148 + this.id = id;
  149 + }
  150 +
  151 + public String getName() {
  152 + return name;
  153 + }
  154 +
  155 + public void setName(String name) {
  156 + this.name = name;
  157 + }
  158 + }
  159 +
  160 + public static String getTitle(int id) {
  161 + if (id == 0) {
  162 + return "";
  163 + }
  164 + for (StatusEnums cfEnums : StatusEnums.values()) {
  165 + if (id == cfEnums.getId()) {
  166 + return cfEnums.getName();
  167 + }
  168 + }
  169 + return "";
  170 + }
  171 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java View file @ c902bb6
... ... @@ -14,6 +14,7 @@
14 14 import com.lyms.platform.operate.web.result.InitFollowUp;
15 15 import com.lyms.platform.operate.web.result.InitFollowUpListData;
16 16 import com.lyms.platform.operate.web.result.InitHearingDiagnose;
  17 +import com.lyms.platform.operate.web.result.InitHearingDiagnoseListData;
17 18 import com.lyms.platform.permission.model.*;
18 19 import com.lyms.platform.permission.service.*;
19 20 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -134,6 +135,25 @@
134 135 InitFollowUp initHearingDiagnose = new InitFollowUp();
135 136 initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class));
136 137 return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
  138 + }
  139 +
  140 + /**
  141 + * 随访模块列表管理初始化数据
  142 + *
  143 + * @return
  144 + */
  145 + @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnoseListData")
  146 + @ResponseBody
  147 + @TokenRequired
  148 + public BaseResponse initHearingDiagnoseListData() {
  149 + InitHearingDiagnoseListData baseResponse = new InitHearingDiagnoseListData();
  150 + //状态
  151 + baseResponse.setStatus(EnumUtil.toJson(HdEnums.StatusEnums.class));
  152 + baseResponse.setSource(EnumUtil.toJson(HdEnums.SourceEnums.class));
  153 + baseResponse.setIsConfirm(EnumUtil.toJson(HdEnums.IsConfirmEnums.class));
  154 + baseResponse.setConfirmResult(EnumUtil.toJson(HdEnums.ConfirmResultEnums.class));
  155 + baseResponse.setConfirmLevel(EnumUtil.toJson(HdEnums.ConfirmLevelEnums.class));
  156 + return baseResponse;
137 157 }
138 158  
139 159 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java View file @ c902bb6
... ... @@ -259,6 +259,10 @@
259 259 if (loginState == null) {
260 260 return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
261 261 }
  262 + //查询号 queryNo
  263 + //查询儿童表 和 母亲表 获取id
  264 +
  265 +
262 266 //医院id
263 267 String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
264 268 if (type != null && type == 1) {//转出
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnoseListData.java View file @ c902bb6
  1 +package com.lyms.platform.operate.web.result;
  2 +
  3 +import com.lyms.platform.common.result.BaseResponse;
  4 +
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +
  8 +/**
  9 + * @auther yangfei
  10 + * @createTime 2017年05月15日 15时04分
  11 + * @discription 听力诊断管理列表页面初始化数据
  12 + */
  13 +public class InitHearingDiagnoseListData extends BaseResponse{
  14 + //状态
  15 + private List<Map<String,Object>> status;
  16 + //来源
  17 + private List<Map<String,Object>> source;
  18 + //是否确诊确诊结果
  19 + private List<Map<String,Object>> isConfirm;
  20 + //确诊结果
  21 + private List<Map<String,Object>> confirmResult;
  22 + //确诊程度
  23 + private List<Map<String,Object>> confirmLevel;
  24 +
  25 + public List<Map<String, Object>> getStatus() {
  26 + return status;
  27 + }
  28 +
  29 + public void setStatus(List<Map<String, Object>> status) {
  30 + this.status = status;
  31 + }
  32 +
  33 + public List<Map<String, Object>> getSource() {
  34 + return source;
  35 + }
  36 +
  37 + public void setSource(List<Map<String, Object>> source) {
  38 + this.source = source;
  39 + }
  40 +
  41 + public List<Map<String, Object>> getIsConfirm() {
  42 + return isConfirm;
  43 + }
  44 +
  45 + public void setIsConfirm(List<Map<String, Object>> isConfirm) {
  46 + this.isConfirm = isConfirm;
  47 + }
  48 +
  49 + public List<Map<String, Object>> getConfirmResult() {
  50 + return confirmResult;
  51 + }
  52 +
  53 + public void setConfirmResult(List<Map<String, Object>> confirmResult) {
  54 + this.confirmResult = confirmResult;
  55 + }
  56 +
  57 + public List<Map<String, Object>> getConfirmLevel() {
  58 + return confirmLevel;
  59 + }
  60 +
  61 + public void setConfirmLevel(List<Map<String, Object>> confirmLevel) {
  62 + this.confirmLevel = confirmLevel;
  63 + }
  64 +}