From 1cc0a4a5ebb76e53e5d5b6f4c6946c655aa1a3d6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 31 Oct 2024 13:33:08 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=8C=BB=E4=BF=A1?= =?UTF-8?q?=E7=85=A7=E6=8A=A4=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8F=8A=E7=BB=AD=E8=B4=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LymsHisInfoController.java | 4 +-- .../talkonlineweb/controller/OrderController.java | 25 ++++++++++++++++ .../controller/PatientController.java | 2 ++ .../com/lyms/talkonlineweb/domain/LymsPatient.java | 3 +- .../talkonlineweb/mapper/LymsHisInfoMapper.java | 2 ++ .../talkonlineweb/result/OrderDetailsResult.java | 14 +++++++++ .../talkonlineweb/result/OrderListResponse.java | 1 + .../talkonlineweb/service/LymsOrderService.java | 2 ++ .../service/impl/LymsHisInfoServiceImpl.java | 17 ++++++----- .../service/impl/LymsOrderServiceImpl.java | 34 +++++++++++++++++++--- .../talkonlineweb/task/GetPatientInfoTask.java | 2 +- .../main/resources/mapper/LymsHisInfoMapper.xml | 10 +++++++ .../src/main/resources/mapper/LymsOrderMapper.xml | 1 + 13 files changed, 102 insertions(+), 15 deletions(-) create mode 100644 talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/OrderDetailsResult.java diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java index 8f8673b..95c2feb 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/LymsHisInfoController.java @@ -100,8 +100,8 @@ public class LymsHisInfoController { * @return */ @PostMapping("upAllHisInfo") - /* @TokenRequired - @Resubmit*/ + @TokenRequired + @Resubmit public BaseResponse upAllHisInfo(){ BaseResponse baseResponse=new BaseResponse(); baseResponse.setErrorcode(0); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java index 854b5f3..3a32569 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/OrderController.java @@ -14,6 +14,7 @@ import com.lyms.talkonlineweb.enums.PayStatus; import com.lyms.talkonlineweb.request.HisInfoExportVO; import com.lyms.talkonlineweb.request.OrderRequest; import com.lyms.talkonlineweb.result.BaseResponse; +import com.lyms.talkonlineweb.result.OrderDetailsResult; import com.lyms.talkonlineweb.result.OrderListResponse; import com.lyms.talkonlineweb.service.*; import com.lyms.talkonlineweb.util.*; @@ -92,6 +93,23 @@ public class OrderController { } + /** + * 获取续费明细 + * @return + */ + @GetMapping("/getOrderDetails") + @TokenRequired + public BaseResponse selectOrderDetails(Integer pId){ + BaseResponse baseResponse = new BaseResponse(); + //参数校验 + if (pId== null) + { + baseResponse.setErrorcode(1); + baseResponse.setErrormsg("参数错误"); + return baseResponse; + } + return BaseResponse.ok(lymsOrderService.selectOrderList(pId)); + } /** * 创建支付订单，并把订单提交到微信平台 @@ -216,6 +234,13 @@ public class OrderController { if(CollectionUtils.isNotEmpty(orderListResponses.getRecords())){ for(OrderListResponse responses: orderListResponses.getRecords()){ + if (responses.getPcid()!=null){ + List detailsResults= lymsOrderService.selectOrderList(responses.getPid()); + if (CollectionUtils.isNotEmpty(detailsResults)){ + OrderDetailsResult orderDetailsResult= detailsResults.get(detailsResults.size()-1); + responses.setCnt(orderDetailsResult.getNum()/4); + } + } responses.setOrderType(responses.getPcid() != null ? 2 : 1); responses.setOrderTypeName(responses.getPcid() != null ? "续费" : "初次购买"); responses.setSex("1".equals(responses.getSex())?"男":"女"); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java index 7e20cf0..712a147 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java @@ -290,6 +290,8 @@ public class PatientController { pcase.setCreatedby(patient.getCreatedby()); pcase.setPid(patient.getId()); pcase.setCreatedtime(new Date()); + pcase.setHid(patient.getHId()); + pcase.setHname(patient.getHName()); f = lymsPcaseService.saveOrUpdate(pcase); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java index ef97c5c..0ba909f 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPatient.java @@ -301,7 +301,8 @@ public class LymsPatient implements Serializable { private String iname;//疾病名称 @TableField(value="hId") private Integer hId;//注册医院 - + @TableField(exist = false) + private String hName;//注册医院名称 /** * 修改/重置密码状态 0修改密码 1重置密码 diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsHisInfoMapper.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsHisInfoMapper.java index 9cca377..000781d 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsHisInfoMapper.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/mapper/LymsHisInfoMapper.java @@ -2,6 +2,7 @@ package com.lyms.talkonlineweb.mapper; import com.lyms.talkonlineweb.domain.LymsHisInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lyms.talkonlineweb.result.OrderDetailsResult; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -13,6 +14,7 @@ import java.util.List; public interface LymsHisInfoMapper extends BaseMapper { List selectByOrder(@Param("endTime") Date endTime,@Param("startTime") Date startTime); + List selectOrderList(@Param("pid") Integer pid); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/OrderDetailsResult.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/OrderDetailsResult.java new file mode 100644 index 0000000..5366b70 --- /dev/null +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/OrderDetailsResult.java @@ -0,0 +1,14 @@ +package com.lyms.talkonlineweb.result; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +import java.util.Date; + +@Data +public class OrderDetailsResult { + @TableField(value = "up_time") + private Date upTime; + private String amount; + private Integer num; +} diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/OrderListResponse.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/OrderListResponse.java index 9bf18e5..954e1d0 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/OrderListResponse.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/result/OrderListResponse.java @@ -9,6 +9,7 @@ import java.util.Date; @Data @ExcelTarget("order_list_response") public class OrderListResponse { + private Integer pid; @Excel(name = "姓名", width = 10,orderNum = "0") private String pname; @Excel(name = "性别", width = 10,orderNum = "1") diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java index a4c2bdc..1899f41 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/LymsOrderService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.lyms.talkonlineweb.domain.LymsAttention; import com.lyms.talkonlineweb.domain.LymsOrder; import com.lyms.talkonlineweb.request.OrderRequest; +import com.lyms.talkonlineweb.result.OrderDetailsResult; import com.lyms.talkonlineweb.result.OrderListResponse; import com.lyms.talkonlineweb.result.PushOrderResult; @@ -31,4 +32,5 @@ public interface LymsOrderService extends IService { List selectPushOrder(Integer pId); Page queryOrderList(Page page, OrderRequest orderRequest); + List selectOrderList(Integer pId); } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java index afdedea..ae5c45d 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java @@ -118,7 +118,7 @@ public class LymsHisInfoServiceImpl extends ServiceImpl orderList = lymsOrderService.selectPushOrder(patient.getId()); - log.info("SendWeChatMsg--->orderList," + orderList.toString()); + //log.info("SendWeChatMsg--->orderList," + orderList.toString()); if (CollectionUtils.isNotEmpty(orderList)) { PushOrderResult order = orderList.get(0); if (!order.getDname().contains("产科")){ @@ -510,7 +510,7 @@ public class LymsHisInfoServiceImpl extends ServiceImpl list = lymsOrderService.list(queryWrapper); LymsOrder lymsOrder; Integer renew = 0; @@ -731,12 +732,14 @@ public class LymsHisInfoServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("idno", patient.getIdno().toUpperCase()); map.put("name", patient.getPname()); - map.put("weeks", patient.getCcnt() / 6 * 4); + map.put("weeks", ccnt / 6 * 4); map.put("renew", renew); map.put("phone",patient.getEnrolmentPhone()); map.put("hospitalId",pcase.getHid()); @@ -788,7 +791,7 @@ public class LymsHisInfoServiceImpl extends ServiceImplis",response); + //log.info("/yxzh/patSer--->is",response); lymsOrderService.saveOrUpdate(lymsOrder); }catch (Exception e){ log.error("/yxzh/patSer,"+e.getMessage()); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java index 40396f6..990ae7d 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsOrderServiceImpl.java @@ -7,11 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lyms.talkonlineweb.domain.*; import com.lyms.talkonlineweb.enums.PayStatus; -import com.lyms.talkonlineweb.mapper.LymsAttentionMapper; -import com.lyms.talkonlineweb.mapper.LymsOrderMapper; -import com.lyms.talkonlineweb.mapper.LymsPatientMapper; -import com.lyms.talkonlineweb.mapper.LymsTcardMapper; +import com.lyms.talkonlineweb.mapper.*; import com.lyms.talkonlineweb.request.OrderRequest; +import com.lyms.talkonlineweb.result.OrderDetailsResult; import com.lyms.talkonlineweb.result.OrderListResponse; import com.lyms.talkonlineweb.result.PushOrderResult; import com.lyms.talkonlineweb.service.LymsAttentionService; @@ -27,6 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -49,6 +48,8 @@ public class LymsOrderServiceImpl extends ServiceImpl selectOrderList(Integer pId) { + List list= lymsHisInfoMapper.selectOrderList(pId); + if (list==null || list.size()<2){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pid",pId); + queryWrapper.eq("status",1); + List orderList= list(queryWrapper); + list=new ArrayList<>(); + if (CollectionUtils.isNotEmpty(orderList)){ + for (LymsOrder lymsOrder :orderList) { + OrderDetailsResult orderDetailsResult=new OrderDetailsResult(); + orderDetailsResult.setUpTime(lymsOrder.getPayTime()); + orderDetailsResult.setAmount(String.valueOf(lymsOrder.getAmount()/100)); + orderDetailsResult.setNum(lymsOrder.getCnt()*4); + list.add(orderDetailsResult); + } + } + return list; + }else { + return list; + } + + } + } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java index a3ccec4..ed49f2f 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/GetPatientInfoTask.java @@ -74,7 +74,7 @@ public class GetPatientInfoTask { if (StringUtil.isNotEmpty(param)) { //返回数据 String result = HttpUtil.getData(url + "?" + param); - log.info("task get qhddeyy his info result ,{}", result); + // log.info("task get qhddeyy his info result ,{}", result); if (StringUtil.isNotEmpty(result)) { List> listMap = JsonUtil.str2Obj(result, List.class); for (Map map : listMap) { diff --git a/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml index 4234f81..a7bf7b2 100644 --- a/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml +++ b/talkonlineweb/src/main/resources/mapper/LymsHisInfoMapper.xml @@ -41,4 +41,14 @@ WHERE ((=#{endTime}]]> ) or (hi.num >0)) + + diff --git a/talkonlineweb/src/main/resources/mapper/LymsOrderMapper.xml b/talkonlineweb/src/main/resources/mapper/LymsOrderMapper.xml index b4d036a..39c2afd 100644 --- a/talkonlineweb/src/main/resources/mapper/LymsOrderMapper.xml +++ b/talkonlineweb/src/main/resources/mapper/LymsOrderMapper.xml @@ -33,6 +33,7 @@ resultType="com.lyms.talkonlineweb.result.OrderListResponse"> select + p.id as pid, p.pname, p.sex, p.birth, -- 1.8.3.1