jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 77edbd6090f09b6657c283e98e14392900da82fe

Authored by yangfei
2 parents 3051c786e5 9407d22b12
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java View file @ 77edbd6
... ... @@ -146,6 +146,16 @@
146 146 */
147 147 private Date createDate;
148 148  
  149 + private Integer yn;
  150 +
  151 + public Integer getYn() {
  152 + return yn;
  153 + }
  154 +
  155 + public void setYn(Integer yn) {
  156 + this.yn = yn;
  157 + }
  158 +
149 159 public String getId() {
150 160 return id;
151 161 }
platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractMotherModel.java View file @ 77edbd6
... ... @@ -69,6 +69,16 @@
69 69 */
70 70 private Integer operatorId;
71 71  
  72 + private Integer yn;
  73 +
  74 + public Integer getYn() {
  75 + return yn;
  76 + }
  77 +
  78 + public void setYn(Integer yn) {
  79 + this.yn = yn;
  80 + }
  81 +
72 82 public String getId() {
73 83 return id;
74 84 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java View file @ 77edbd6
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.common.base.LoginContext;
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 7 import com.lyms.platform.common.result.BaseObjectResponse;
  8 +import com.lyms.platform.common.result.BaseResponse;
8 9 import com.lyms.platform.common.utils.ExceptionUtils;
9 10 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
10 11 import com.lyms.platform.operate.web.facade.DischargeAbstractFacade;
... ... @@ -15,10 +16,7 @@
15 16 import com.lyms.platform.permission.service.CouponService;
16 17 import org.springframework.beans.factory.annotation.Autowired;
17 18 import org.springframework.stereotype.Controller;
18   -import org.springframework.web.bind.annotation.RequestBody;
19   -import org.springframework.web.bind.annotation.RequestMapping;
20   -import org.springframework.web.bind.annotation.RequestMethod;
21   -import org.springframework.web.bind.annotation.ResponseBody;
  19 +import org.springframework.web.bind.annotation.*;
22 20  
23 21 import javax.servlet.http.HttpServletRequest;
24 22  
... ... @@ -97,5 +95,11 @@
97 95 return baseObjectResponse;
98 96 }
99 97  
  98 + @TokenRequired
  99 + @ResponseBody
  100 + @RequestMapping(value = "discharge", method = RequestMethod.DELETE)
  101 + public BaseResponse delDisCharge(@RequestParam("id")String id){
  102 + return dischargeAbstractFacade.delDisCharge(id);
  103 + }
100 104 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java View file @ 77edbd6
... ... @@ -23,6 +23,7 @@
23 23  
24 24 import javax.servlet.http.HttpServletRequest;
25 25 import java.util.ArrayList;
  26 +import java.util.HashMap;
26 27 import java.util.List;
27 28 import java.util.Map;
28 29  
29 30  
... ... @@ -165,14 +166,13 @@
165 166 */
166 167 @RequestMapping(method = RequestMethod.GET, value = "/getNoSendLis")
167 168 @ResponseBody
168   - public List<Map<String,String>> getNoSendLis(@RequestParam("page") Integer page,
  169 + public Map<String,Object> getNoSendLis(@RequestParam("page") Integer page,
169 170 @RequestParam("limit") Integer limit,
170 171 @RequestHeader("Authorization") String token) {
171 172  
172 173 if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token))
173 174 {
174   - ExceptionUtils.catchException("The request token is " + token);
175   - return new ArrayList<>();
  175 + return new HashMap<>();
176 176 }
177 177  
178 178 return lisFacade.getNoSendLis(page, limit);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 77edbd6
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.enums.RenShenJieJuEnums;
9 9 import com.lyms.platform.common.enums.YnEnums;
10 10 import com.lyms.platform.common.result.BaseObjectResponse;
  11 +import com.lyms.platform.common.result.BaseResponse;
11 12 import com.lyms.platform.common.result.ResponseCode;
12 13 import com.lyms.platform.common.utils.BeanUtils;
13 14 import com.lyms.platform.common.utils.DateUtil;
... ... @@ -92,6 +93,7 @@
92 93 dischargeAbstractMotherModel.setOperatorId(dischargeAbstractSaveRequest.getOperatorId());
93 94 dischargeAbstractMotherModel.setAfterMakeBabyDays(DateUtil.getDays(DateUtil.parseYMD(dischargeAbstractSaveRequest.getFmDate()), new Date()));
94 95 dischargeAbstractMotherModel.setpId(dischargeAbstractSaveRequest.getpId());
  96 + dischargeAbstractMotherModel.setYn(YnEnums.YES.getId());
95 97 if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) {
96 98 dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel);
97 99  
... ... @@ -295,5 +297,16 @@
295 297 return dischargeAbstractQueryResult;
296 298 }
297 299  
  300 + /**
  301 + * 删除出院小结
  302 + * @return
  303 + */
  304 + public BaseResponse delDisCharge(String id){
  305 + DischargeAbstractMotherModel dischargeAbstractMotherQueryModel = new DischargeAbstractMotherModel();
  306 + dischargeAbstractMotherQueryModel.setYn(YnEnums.NO.getId());
  307 + dischargeAbstractMotherQueryModel.setId(id);
  308 + dischargeAbstractMotherService.update(dischargeAbstractMotherQueryModel);
  309 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  310 + }
298 311 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 77edbd6
... ... @@ -668,7 +668,7 @@
668 668 return hospitalNames;
669 669 }
670 670  
671   - public List<Map<String,String>> getNoSendLis(Integer page, Integer limit) {
  671 + public Map<String,Object> getNoSendLis(Integer page, Integer limit) {
672 672  
673 673 LisReportQuery query = new LisReportQuery();
674 674 query.setPage(page);
... ... @@ -677,6 +677,10 @@
677 677 query.setSort(" PUBLISH_TIME DESC ");
678 678 query.setStatus(0); //未推送状态
679 679  
  680 +
  681 + Map<String,Object> result = new HashMap<>();
  682 +
  683 +
680 684 final CopyOnWriteArraySet<String> patientIds = new CopyOnWriteArraySet<>();
681 685 List<Map<String,String>> lists = new ArrayList<>();
682 686  
... ... @@ -724,7 +728,10 @@
724 728 }
725 729 patientIds.clear();
726 730  
727   - return lists;
  731 + result.put("list", lists);
  732 + result.put("hasNext",CollectionUtils.isNotEmpty(lises) && lises.size() >= limit ? "true" : "false");
  733 +
  734 + return result;
728 735 }
729 736  
730 737 public BaseResponse getBabyLisAssistCheckInfo(String vcCardNo, String phone, String checkTime,Integer userId) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 77edbd6
... ... @@ -1074,7 +1074,7 @@
1074 1074 for (Map<String, Object> m : data) {
1075 1075 Map<String, Object> result = new LinkedHashMap<>();
1076 1076 result.put("id", ++i);
1077   - result.put("phone", m.get("phone"));
  1077 + result.put("use_date", m.get("use_date"));
1078 1078 result.put("username", m.get("username"));
1079 1079 result.put("week", m.get("week"));
1080 1080 result.put("type_desc", m.get("type_desc"));