shiyang / regional-platform

Download as
Browse Code »

Commit 9c60d4629d96ece171c4b171bc7c817c970298cc

Authored by baohanddd
2 parents 946a3e8ac2 88a3499b46
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java View file @ 9c60d46
... ... @@ -113,26 +113,21 @@
113 113  
114 114 /**
115 115 * 只要子节点
116   - * @param id
117 116 * @return
118 117 */
119   - public static List<Map> getSmsServiceLeaf(int id)
  118 + public static List<Map> getSmsServiceLeaf()
120 119 {
121 120  
122 121 List<Map> list = new ArrayList<>();
123 122 for (SmsServiceEnums e : SmsServiceEnums.values()) {
124   - if(e.getPid() == id) {
125 123 Map rootMap = new HashMap();
126 124 rootMap.put("id",e.getId());
127   - rootMap.put("name",e.getName());
  125 + rootMap.put("name", e.getName());
128 126 rootMap.put("pid", e.getPid());
129 127 if (!isLeaf(e.getId()))
130 128 {
131 129 list.add(rootMap);
132 130 }
133   -
134   -
135   - }
136 131 }
137 132 return list;
138 133  
... ... @@ -167,6 +162,7 @@
167 162 rootMap.put("id",e.getId());
168 163 rootMap.put("name", e.getName());
169 164 rootMap.put("pid", e.getPid());
  165 + list.add(rootMap);
170 166 }
171 167 }
172 168 return list;
platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java View file @ 9c60d46
... ... @@ -116,5 +116,77 @@
116 116 public void setHospitalId(Integer hospitalId) {
117 117 this.hospitalId = hospitalId;
118 118 }
  119 +
  120 + public Integer getServiceObj() {
  121 + return serviceObj;
  122 + }
  123 +
  124 + public void setServiceObj(Integer serviceObj) {
  125 + this.serviceObj = serviceObj;
  126 + }
  127 +
  128 + public Integer getServiceType() {
  129 + return serviceType;
  130 + }
  131 +
  132 + public void setServiceType(Integer serviceType) {
  133 + this.serviceType = serviceType;
  134 + }
  135 +
  136 + public Integer getServiceStatus() {
  137 + return serviceStatus;
  138 + }
  139 +
  140 + public void setServiceStatus(Integer serviceStatus) {
  141 + this.serviceStatus = serviceStatus;
  142 + }
  143 +
  144 + public Integer getSmsType() {
  145 + return smsType;
  146 + }
  147 +
  148 + public void setSmsType(Integer smsType) {
  149 + this.smsType = smsType;
  150 + }
  151 +
  152 + public Integer getSendFrequency() {
  153 + return sendFrequency;
  154 + }
  155 +
  156 + public void setSendFrequency(Integer sendFrequency) {
  157 + this.sendFrequency = sendFrequency;
  158 + }
  159 +
  160 + public Integer getSendDateType() {
  161 + return sendDateType;
  162 + }
  163 +
  164 + public void setSendDateType(Integer sendDateType) {
  165 + this.sendDateType = sendDateType;
  166 + }
  167 +
  168 + public Integer getSpecialDateType() {
  169 + return specialDateType;
  170 + }
  171 +
  172 + public void setSpecialDateType(Integer specialDateType) {
  173 + this.specialDateType = specialDateType;
  174 + }
  175 +
  176 + public Integer getSendTimeType() {
  177 + return sendTimeType;
  178 + }
  179 +
  180 + public void setSendTimeType(Integer sendTimeType) {
  181 + this.sendTimeType = sendTimeType;
  182 + }
  183 +
  184 + public String getContent() {
  185 + return content;
  186 + }
  187 +
  188 + public void setContent(String content) {
  189 + this.content = content;
  190 + }
119 191 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ 9c60d46
... ... @@ -150,16 +150,30 @@
150 150 }
151 151  
152 152  
153   -
154   -
155 153 /**
156   - * 查询儿童记录
157   - * @param request
  154 + * 查询儿童管理页面
  155 + * @param mcardNo 母亲身份证
  156 + * @param page
  157 + * @param limit
  158 + * @param serviceStatus 服务状态
  159 + * @param name 儿童姓名
158 160 * @return
159 161 */
160   - @RequestMapping(value = "/queryBabyList", method = RequestMethod.POST)
  162 + @RequestMapping(value = "/queryBabyList", method = RequestMethod.GET)
161 163 @ResponseBody
162   - public BaseListResponse queryBabyList(@RequestBody BabyManageRequest request){
  164 + public BaseListResponse queryBabyList(@RequestParam(value = "mcardNo", required = false) String mcardNo,
  165 + @RequestParam("page") Integer page,
  166 + @RequestParam("limit") Integer limit,
  167 + @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
  168 + @RequestParam(value = "name", required = false) String name){
  169 +
  170 + BabyManageRequest request = new BabyManageRequest();
  171 + request.setMcardNo(mcardNo);
  172 + request.setServiceStatus(serviceStatus);
  173 + request.setName(request.getName());
  174 + request.setLimit(limit);
  175 + request.setPage(page);
  176 +
163 177 return babyBookbuildingFacade.queryBabyList(request);
164 178 }
165 179  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java View file @ 9c60d46
... ... @@ -233,12 +233,36 @@
233 233 */
234 234 @RequestMapping(value = "/getSmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
235 235 @ResponseBody
236   - public List<Map> getAllServiceStatus(@PathVariable("serviceObjId") Integer serviceObjId) {
  236 + public List<Map> getSmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
237 237 List<Map> list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
238 238 return list;
239 239 }
240 240  
  241 +
241 242 /**
  243 + * 获取查询页面的消息类型通过对象类型
  244 + * @param serviceObjId
  245 + * @return
  246 + */
  247 + @RequestMapping(value = "/getQuerySmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
  248 + @ResponseBody
  249 + public List<Map> getQuerySmsTypeByObjId(@PathVariable("serviceObjId") Integer serviceObjId) {
  250 + List<Map> list = null;
  251 + if (serviceObjId == 0)
  252 + {
  253 + list = SmsServiceEnums.getSmsServiceLeaf();
  254 + }
  255 + else
  256 + {
  257 + list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
  258 + }
  259 +
  260 + return list;
  261 + }
  262 +
  263 +
  264 +
  265 + /**
242 266 * 特殊日期类型查询
243 267 * @param serviceObjId 服务对象
244 268 * @param sendDateType 日期类型
... ... @@ -248,7 +272,7 @@
248 272 @RequestMapping(value = "/getSpecialType/{serviceObjId}/{sendDateType}/{freq}", method = RequestMethod.GET)
249 273 @ResponseBody
250 274 public List<Map> getSpecialType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("sendDateType") Integer sendDateType,@PathVariable("freq") Integer freq) {
251   - List<Map> list =SpecialDateEnums.getSpecialDateByServiceObj(serviceObjId, sendDateType,freq);
  275 + List<Map> list =SpecialDateEnums.getSpecialDateByServiceObj(serviceObjId, sendDateType, freq);
252 276 return list;
253 277 }
254 278  
... ... @@ -262,7 +286,7 @@
262 286 @RequestMapping(value = "/getDateType/{serviceObjId}/{freq}", method = RequestMethod.GET)
263 287 @ResponseBody
264 288 public List<Map> getDateType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("freq") Integer freq) {
265   - List<Map> list =SendDateEnums.getSendFrequency(serviceObjId,freq);
  289 + List<Map> list =SendDateEnums.getSendFrequency(serviceObjId, freq);
266 290 return list;
267 291 }
268 292  
269 293  
... ... @@ -291,10 +315,9 @@
291 315  
292 316 public static void main(String a[]) {
293 317  
294   - for (PatientsTypeEnum e : PatientsTypeEnum.values()) {
  318 + List list = SmsServiceEnums.getSmsServiceLeaf();
295 319  
296   - System.out.println(e.getText());
297   - }
  320 + System.out.println(list);
298 321 }
299 322  
300 323 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java View file @ 9c60d46
... ... @@ -53,12 +53,26 @@
53 53  
54 54 /**
55 55 * 根据条件查询短信模板列表
56   - * @param request
57 56 * @return
58 57 */
59   - @RequestMapping(method = RequestMethod.POST, value = "/querySmsTempList")
  58 + @RequestMapping(method = RequestMethod.GET, value = "/querySmsTempList")
60 59 @ResponseBody
61   - public BaseListResponse querySmsTemps(@RequestBody SmsTemplateRequest request) {
  60 + public BaseListResponse querySmsTemps(@RequestParam(value = "serviceObj", required = false) Integer serviceObj,
  61 + @RequestParam("page") Integer page,
  62 + @RequestParam("limit") Integer limit,
  63 + @RequestParam(value = "serviceType", required = false) Integer serviceType,
  64 + @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
  65 + @RequestParam(value = "smsType", required = false) Integer smsType,
  66 + @RequestParam(value = "content", required = false) String content) {
  67 +
  68 + SmsTemplateRequest request = new SmsTemplateRequest();
  69 + request.setServiceObj(serviceObj);
  70 + request.setContent(content);
  71 + request.setServiceType(serviceType);
  72 + request.setSmsType(smsType);
  73 + request.setServiceStatus(serviceStatus);
  74 + request.setLimit(limit);
  75 + request.setPage(page);
62 76 return smsTemplateFacade.querySmsTemps(request);
63 77 }
64 78  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9c60d46
... ... @@ -639,9 +639,10 @@
639 639 BabyModelQuery babyQuery = new BabyModelQuery();
640 640 babyQuery.setYn(YnEnums.YES.getId());
641 641 babyQuery.setMcertNo(request.getMcardNo());
642   - babyQuery.setCardNo(request.getBcardNo());
  642 + babyQuery.setServiceStatus(request.getServiceStatus());
643 643 babyQuery.setName(request.getName());
644 644 babyQuery.setNeed("1");
  645 +
645 646  
646 647 babyQuery.setPage(request.getPage());
647 648 babyQuery.setLimit(request.getLimit());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 9c60d46
... ... @@ -418,6 +418,7 @@
418 418 */
419 419 private BabyCheckResult getBabyCheckResult(BabyCheckModel checkModel) {
420 420 BabyCheckResult model = new BabyCheckResult();
  421 + model.setId(model.getId());
421 422  
422 423 model.setBuildId(checkModel.getBuildId());
423 424  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java View file @ 9c60d46
... ... @@ -152,16 +152,23 @@
152 152 SmsTemplateQuery query = new SmsTemplateQuery();
153 153 query.setYn(YnEnums.YES.getId());
154 154 query.setNeed("1");
  155 + query.setLimit(request.getLimit());
  156 + query.setPage(request.getPage());
  157 + query.setSmsType(request.getSmsType());
  158 + query.setServiceStatus(request.getServiceStatus());
  159 + query.setServiceType(request.getServiceType());
  160 + query.setContent(request.getContent());
  161 + query.setServiceObj(request.getServiceObj());
155 162 if (request.getServiceObj() != null && request.getServiceObj() == 0)
156 163 {
157 164 //查询全部
158 165 request.setServiceObj(null);
159 166 }
160 167  
161   -// if (request.getSmsType() != null && request.getSmsType() == 0)
162   -// {
163   -//
164   -// }
  168 + if (request.getSmsType() != null && request.getSmsType() == 0)
  169 + {
  170 + request.setSmsType(null);
  171 + }
165 172 if (request.getServiceType() != null && request.getServiceType() == 100)
166 173 {
167 174 request.setServiceType(null);