jiangjiazhi / regional-platform

Download as
Browse Code »

Commit fa9ca215e8ba10408756c788eaa5eb6a8558303c

Authored by wangbo
1 parent 790a92a341
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

出院小结列表展示

Showing 3 changed files with 105 additions and 43 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java View file @ fa9ca21
... ... @@ -870,8 +870,9 @@
870 870 String finalDiagnosis, Integer page, Integer limit) {
871 871 List<Map<String, Object>> result = new ArrayList<>();
872 872 String startDate = startDischargeDate + "00:00:00";
873   - String endDate = endDischargeDate + "00:00:00";
  873 + String endDate = endDischargeDate + "23:59:59";
874 874 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
  875 + SimpleDateFormat sdfcyrq = new SimpleDateFormat("yyyyMMddHH:mm:ss");
875 876 PageInfo pageInfo = new PageInfo();
876 877 int startPage = 1;
877 878 int endlimit = 10;
... ... @@ -918,7 +919,7 @@
918 919 }
919 920 sql = hospitalizationNoSql + babyNameSql + finalDiagnosisSql + dischargeDateSql + birthDateSql;
920 921 }
921   - String sqls = "select * from (select top 99999999 ROW_NUMBER() OVER(ORDER BY lrrq DESC ) " +
  922 + String sqls = "select * from (select top 99999999 ROW_NUMBER() OVER(ORDER BY cyrq DESC ) " +
922 923 "AS ROWID,blh,cyrq,hzxm,sex,birth,cyzdmc from VW_LYMS_XSE_BRSYK where cyrq is not null " + sql + ") " +
923 924 "AS TEMP where ROWID BETWEEN " + startPage + " and " + endlimit + " order by ROWID Asc";
924 925  
... ... @@ -932,7 +933,7 @@
932 933 Map<String, Object> map = new HashMap<>();
933 934 try {
934 935 if (StringUtils.isNotEmpty(info.getCyrq())) {
935   - Date date = sdf.parse(info.getCyrq());
  936 + Date date = sdfcyrq.parse(info.getCyrq());
936 937 map.put("dischargeDate", DateUtil.getyyyy_MM_dd(date));
937 938 }
938 939 } catch (Exception e) {
... ... @@ -975,6 +976,17 @@
975 976 return objectResponse;
976 977 }
977 978  
  979 + public static void main(String[] args) {
  980 + String str = "20160504121330";
  981 + SimpleDateFormat sdfcyrq = new SimpleDateFormat("yyyyMMddHHmmss");
  982 + try {
  983 + Date date = sdfcyrq.parse(str);
  984 + System.out.println(date);
  985 + } catch (Exception e) {
  986 +
  987 + }
  988 +
  989 + }
978 990  
979 991 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java View file @ fa9ca21
... ... @@ -15,6 +15,7 @@
15 15 import com.lyms.platform.operate.web.result.DischargeAbstractSaveResult;
16 16 import com.lyms.platform.permission.service.CouponService;
17 17 import org.springframework.beans.factory.annotation.Autowired;
  18 +import org.springframework.beans.factory.annotation.Value;
18 19 import org.springframework.stereotype.Controller;
19 20 import org.springframework.web.bind.annotation.*;
20 21  
21 22  
22 23  
... ... @@ -98,14 +99,25 @@
98 99 @TokenRequired
99 100 @ResponseBody
100 101 @RequestMapping(value = "discharge", method = RequestMethod.DELETE)
101   - public BaseResponse delDisCharge(@RequestParam("id")String id,HttpServletRequest request){
102   - return dischargeAbstractFacade.delDisCharge(id,getUserId(request));
  102 + public BaseResponse delDisCharge(@RequestParam("id") String id, HttpServletRequest request) {
  103 + return dischargeAbstractFacade.delDisCharge(id, getUserId(request));
103 104 }
104 105  
105 106 @RequestMapping(value = "correct", method = RequestMethod.GET)
106 107 @ResponseBody
107   - public BaseResponse correctDisCharge(){
  108 + public BaseResponse correctDisCharge() {
108 109 return dischargeAbstractFacade.correctDisCharge();
  110 + }
  111 +
  112 + @RequestMapping(value = "list", method = RequestMethod.GET)
  113 + @ResponseBody
  114 + @TokenRequired
  115 + public BaseResponse list(HttpServletRequest request,
  116 +
  117 + @RequestParam(value = "page") Integer page,
  118 + @RequestParam(value = "limit") Integer limit) {
  119 +
  120 + return dischargeAbstractFacade.list(page, limit, getUserId(request));
109 121 }
110 122 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ fa9ca21
... ... @@ -9,20 +9,16 @@
9 9 import com.lyms.platform.common.enums.OptActionEnums;
10 10 import com.lyms.platform.common.enums.RenShenJieJuEnums;
11 11 import com.lyms.platform.common.enums.YnEnums;
12   -import com.lyms.platform.common.result.BaseObjectResponse;
13   -import com.lyms.platform.common.result.BaseResponse;
14   -import com.lyms.platform.common.result.ResponseCode;
  12 +import com.lyms.platform.common.result.*;
15 13 import com.lyms.platform.common.utils.BeanUtils;
16 14 import com.lyms.platform.common.utils.DateUtil;
17 15 import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest;
18 16 import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest;
19 17 import com.lyms.platform.operate.web.result.*;
  18 +import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
20 19 import com.lyms.platform.permission.service.CouponService;
21 20 import com.lyms.platform.permission.service.UsersService;
22   -import com.lyms.platform.pojo.BabyModel;
23   -import com.lyms.platform.pojo.DischargeAbstractBabyModel;
24   -import com.lyms.platform.pojo.DischargeAbstractMotherModel;
25   -import com.lyms.platform.pojo.Patients;
  21 +import com.lyms.platform.pojo.*;
26 22 import com.lyms.platform.query.BabyModelQuery;
27 23 import com.lyms.platform.query.DischargeAbstractBabyQuery;
28 24 import com.lyms.platform.query.DischargeAbstractMotherQuery;
29 25  
... ... @@ -30,13 +26,14 @@
30 26 import org.apache.commons.collections.CollectionUtils;
31 27 import org.apache.commons.lang3.StringUtils;
32 28 import org.springframework.beans.factory.annotation.Autowired;
  29 +import org.springframework.data.domain.Sort;
  30 +import org.springframework.data.mongodb.core.MongoTemplate;
  31 +import org.springframework.data.mongodb.core.query.Criteria;
  32 +import org.springframework.data.mongodb.core.query.Query;
33 33 import org.springframework.stereotype.Component;
34 34  
35 35 import java.text.SimpleDateFormat;
36   -import java.util.ArrayList;
37   -import java.util.Date;
38   -import java.util.List;
39   -import java.util.Map;
  36 +import java.util.*;
40 37  
41 38 /**
42 39 * @auther HuJiaqi
... ... @@ -44,7 +41,7 @@
44 41 * @discription
45 42 */
46 43 @Component
47   -public class DischargeAbstractFacade {
  44 +public class DischargeAbstractFacade extends BaseServiceImpl {
48 45  
49 46 @Autowired
50 47 private DischargeAbstractMotherService dischargeAbstractMotherService;
51 48  
52 49  
53 50  
... ... @@ -77,14 +74,20 @@
77 74 @Autowired
78 75 private OperateLogFacade operateLogFacade;
79 76  
  77 + @Autowired
  78 + private MongoTemplate mongoTemplate;
  79 +
  80 + @Autowired
  81 + private OrganizationGroupsFacade groupsFacade;
  82 +
80 83 public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest, Integer userId) {
81 84  
82 85 DischargeAbstractSaveResult dischargeAbstractSaveResult = new DischargeAbstractSaveResult();
83   - String hId=autoMatchFacade.getHospitalId(userId);
  86 + String hId = autoMatchFacade.getHospitalId(userId);
84 87 /** 验证产检券是否可用 可用就改为已使用状态 */
85   - if(StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
  88 + if (StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
86 89 BaseObjectResponse resp = couponService.validate(dischargeAbstractSaveRequest.getCouponCode(), dischargeAbstractSaveRequest.getCouponType(), autoMatchFacade.getHospitalId(userId));
87   - if(resp.getErrorcode() != 0) {
  90 + if (resp.getErrorcode() != 0) {
88 91 ResponseCode data = (ResponseCode) resp.getData();
89 92 dischargeAbstractSaveResult.setErrorcode(data.getCode());
90 93 dischargeAbstractSaveResult.setErrormsg(data.getMsg());
91 94  
... ... @@ -107,9 +110,9 @@
107 110 dischargeAbstractMotherModel.setHospitalId(hId);
108 111 if (StringUtils.isEmpty(dischargeAbstractMotherModel.getId())) {
109 112 dischargeAbstractMotherModel = dischargeAbstractMotherService.save(dischargeAbstractMotherModel);
110   - operateLogFacade.addAddOptLog(userId,Integer.parseInt(hId),dischargeAbstractMotherModel, OptActionEnums.ADD.getId(),"添加出院小结母亲内容");
  113 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hId), dischargeAbstractMotherModel, OptActionEnums.ADD.getId(), "添加出院小结母亲内容");
111 114 /** 使用优惠券 */
112   - if(StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
  115 + if (StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) {
113 116 couponService.use(hId, dischargeAbstractSaveRequest.getCouponCode(), userId, dischargeAbstractMotherModel.getId());
114 117 }
115 118 } else {
... ... @@ -129,8 +132,7 @@
129 132 if (babyList != null && babyList.size() > 0) {
130 133 for (DischargeAbstractSaveRequest.Baby baby : babyList) {
131 134  
132   - if (StringUtils.isEmpty(baby.getpId()))
133   - {
  135 + if (StringUtils.isEmpty(baby.getpId())) {
134 136 continue;
135 137 }
136 138  
... ... @@ -157,7 +159,7 @@
157 159 List<DischargeAbstractBabyModel> list = dischargeAbstractBabyService.query(dischargeAbstractBabyQuery);
158 160 dischargeAbstractBabyService.update(dischargeAbstractBabyModel);
159 161  
160   - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hId), list.get(0),dischargeAbstractBabyModel, OptActionEnums.UPDATE.getId(), "修改出院小结儿童内容");
  162 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hId), list.get(0), dischargeAbstractBabyModel, OptActionEnums.UPDATE.getId(), "修改出院小结儿童内容");
161 163 }
162 164 }
163 165 }
164 166  
... ... @@ -196,15 +198,11 @@
196 198 patientsQuery.setCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getCardNo()) ? null : dischargeAbstractSaveRequest.getCardNo());
197 199  
198 200 //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy
199   - if ("1000000114".equals(hospitalId))
200   - {
201   - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(dischargeAbstractSaveRequest.getVcCardNo()))
202   - {
  201 + if ("1000000114".equals(hospitalId)) {
  202 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(dischargeAbstractSaveRequest.getVcCardNo())) {
203 203 patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(dischargeAbstractSaveRequest.getVcCardNo()));
204 204 }
205   - }
206   - else
207   - {
  205 + } else {
208 206 patientsQuery.setVcCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getVcCardNo()) ? null : dischargeAbstractSaveRequest.getVcCardNo());
209 207 }
210 208  
... ... @@ -245,7 +243,6 @@
245 243 }
246 244  
247 245  
248   -
249 246 if (!hospitalId.equals(patients.getFmHospital())) {
250 247 dischargeAbstractQueryResult.setStatus("6");
251 248 dischargeAbstractQueryResult.setErrormsg("外院分娩不可进行出院小结");
252 249  
... ... @@ -343,13 +340,13 @@
343 340 dischargeAbstractBabyQueryModel.setbCGAndHBVVaccinationDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate()));
344 341 dischargeAbstractBabyQueryModel.sethBIGInjectDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.gethBIGInjectDate()));
345 342 //新增字段
346   - if(dischargeAbstractBabyModel.getbCGVaccinDate()!=null||dischargeAbstractBabyModel.getHbvVaccinDate()!=null||
347   - org.apache.commons.lang.StringUtils.isNotEmpty(dischargeAbstractBabyModel.getHbvInjectUserName())|| org.apache.commons.lang.StringUtils.isNotEmpty(dischargeAbstractBabyModel.getbCGInjectUserName())){//如果修改过数据
  343 + if (dischargeAbstractBabyModel.getbCGVaccinDate() != null || dischargeAbstractBabyModel.getHbvVaccinDate() != null ||
  344 + org.apache.commons.lang.StringUtils.isNotEmpty(dischargeAbstractBabyModel.getHbvInjectUserName()) || org.apache.commons.lang.StringUtils.isNotEmpty(dischargeAbstractBabyModel.getbCGInjectUserName())) {//如果修改过数据
348 345 dischargeAbstractBabyQueryModel.setbCGVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGVaccinDate()));
349 346 dischargeAbstractBabyQueryModel.setHbvVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getHbvVaccinDate()));
350 347 dischargeAbstractBabyQueryModel.setHbvInjectUserName(dischargeAbstractBabyModel.getHbvInjectUserName());
351 348 dischargeAbstractBabyQueryModel.setbCGInjectUserName(dischargeAbstractBabyModel.getbCGInjectUserName());
352   - }else{//使用老数据兼容数据
  349 + } else {//使用老数据兼容数据
353 350 dischargeAbstractBabyQueryModel.setbCGVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate()));
354 351 dischargeAbstractBabyQueryModel.setHbvVaccinDate(DateUtil.getyyyy_MM_dd(dischargeAbstractBabyModel.getbCGAndHBVVaccinationDate()));
355 352 dischargeAbstractBabyQueryModel.setHbvInjectUserName(dischargeAbstractBabyModel.getbCGAndHBVVaccinationInjectUserName());
356 353  
357 354  
358 355  
359 356  
360 357  
... ... @@ -369,27 +366,28 @@
369 366  
370 367 /**
371 368 * 删除出院小结
  369 + *
372 370 * @return
373 371 */
374   - public BaseResponse delDisCharge(String id,Integer userId){
  372 + public BaseResponse delDisCharge(String id, Integer userId) {
375 373 String hospitalId = autoMatchFacade.getHospitalId(userId);
376 374 DischargeAbstractMotherModel dischargeAbstractMotherQueryModel = new DischargeAbstractMotherModel();
377 375 dischargeAbstractMotherQueryModel.setYn(YnEnums.NO.getId());
378 376 dischargeAbstractMotherQueryModel.setId(id);
379 377 dischargeAbstractMotherService.update(dischargeAbstractMotherQueryModel);
380   - operateLogFacade.addDeleteOptLog(userId, Integer.parseInt(hospitalId), dischargeAbstractMotherQueryModel, OptActionEnums.DELETE.getId(),"删除出院小结");
  378 + operateLogFacade.addDeleteOptLog(userId, Integer.parseInt(hospitalId), dischargeAbstractMotherQueryModel, OptActionEnums.DELETE.getId(), "删除出院小结");
381 379 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
382 380 }
383 381  
384 382  
385   - public BaseResponse correctDisCharge(){
  383 + public BaseResponse correctDisCharge() {
386 384 DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery();
387 385 dischargeAbstractMotherQuery.setYn(YnEnums.YES.getId());
388 386 List<DischargeAbstractMotherModel> models = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery);
389   - if(CollectionUtils.isNotEmpty(models)){
390   - for(DischargeAbstractMotherModel mode:models){
  387 + if (CollectionUtils.isNotEmpty(models)) {
  388 + for (DischargeAbstractMotherModel mode : models) {
391 389 Patients patients = patientsService.findOnePatientById(mode.getPatientId());
392   - if(null!=patients){
  390 + if (null != patients) {
393 391 mode.setHospitalId(patients.getHospitalId());
394 392 mode.setPid(patients.getPid());
395 393 dischargeAbstractMotherService.update(mode);
... ... @@ -397,6 +395,46 @@
397 395 }
398 396 }
399 397 return new BaseResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS);
  398 + }
  399 +
  400 + public BaseResponse list(Integer page, Integer limit, Integer userId) {
  401 + List<String> hospital = groupsFacade.findGroupHospital(userId, false);
  402 + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  403 + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
  404 + boolean flag = true;
  405 +
  406 +
  407 + if (flag) {
  408 + List<DischargeAbstractMotherModel> discharge = mongoTemplate.find(Query.query(pCriteria), DischargeAbstractMotherModel.class);
  409 + List<String> ids = new ArrayList<>();
  410 + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(discharge)) {
  411 + for (DischargeAbstractMotherModel dischargeAbstract : discharge) {
  412 + ids.add(dischargeAbstract.getId());
  413 + }
  414 + }
  415 + criteria.and("_id").in(ids);
  416 + }
  417 + PageResult pageResult = findMongoPage(DischargeAbstractMotherModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "createDate")), page, limit);
  418 + List<DischargeAbstractMotherModel> discharge = (List<DischargeAbstractMotherModel>) pageResult.getGrid();
  419 + List<Map<String, Object>> data = new ArrayList<>();
  420 + if (CollectionUtils.isNotEmpty(discharge)) {
  421 + for (DischargeAbstractMotherModel dischargeAbstract : discharge) {
  422 + Map<String, Object> map = new HashMap<>();
  423 + Patients patients = patientsService.findOnePatientById(dischargeAbstract.getPatientId());
  424 + if (null != patients) {
  425 + map.put("name", patients.getUsername());
  426 + map.put("phoen", patients.getPhone());
  427 + map.put("age", patients.getAge() + "岁");
  428 + }
  429 + map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(dischargeAbstract.getLeaveHospitalDate()));
  430 + map.put("description", dischargeAbstract.getDescription());
  431 + map.put("afterMakeBabyDays", dischargeAbstract.getAfterMakeBabyDays());
  432 +
  433 + data.add(map);
  434 + }
  435 + }
  436 + pageResult.setGrid(data);
  437 + return RespBuilder.buildSuccess(pageResult);
400 438 }
401 439 }