From 4023b7fbefd802991fd8e1a8f6438c9b85dd5389 Mon Sep 17 00:00:00 2001 From: mengkuiliang <1464081137@qq.com> Date: Mon, 16 Oct 2023 09:03:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=9B=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=AD=BE=E7=BA=A6=E5=8D=8F=E8=AE=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResidentServiceApplyController.java | 23 ++++- .../controller/applet/SignInfoController.java | 8 +- .../mapper/ResidentServiceApplyMapper.java | 9 ++ .../applet/pojo/query/ApplyQuery.java | 6 ++ .../applet/pojo/vo/OrderEvaluateInfoVo.java | 91 +++++++++++++++++++ .../applet/pojo/vo/ProtocolContentVo.java | 12 +++ .../pojo/vo/ResidentServiceApplyVo.java | 17 +++- .../applet/pojo/vo/SignInfoDataVo.java | 13 +++ .../applet/pojo/vo/SignInfoDetailVo.java | 1 + .../IResidentServiceAppletService.java | 9 ++ .../impl/ResidentServiceApplyServiceImpl.java | 21 +++++ .../sign/ResidentServiceApplyMapper.xml | 88 +++++++++++++++++- 12 files changed, 283 insertions(+), 15 deletions(-) create mode 100644 xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/OrderEvaluateInfoVo.java diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java index dec5de9..e25b5a8 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentServiceApplyController.java @@ -32,7 +32,7 @@ public class ResidentServiceApplyController extends BaseController { @Resource private IResidentServiceAppletService residentServiceAppletService; - @ApiOperation("提交服务申请") + @ApiOperation("提交服务预约") @PostMapping("/save") public R save(@RequestBody ResidentServiceApplyBody body) { if (body == null || StringUtils.isBlank(body.getPackageNo()) || StringUtils.isBlank(body.getFormNo())) { @@ -45,14 +45,14 @@ public class ResidentServiceApplyController extends BaseController { return R.ok(); } - @ApiOperation("取消服务申请") + @ApiOperation("取消服务预约") @GetMapping("/cancel/{bookingNo}") public R cancel(@PathVariable String bookingNo) { residentServiceAppletService.cancel(bookingNo); return R.ok(); } - @ApiOperation("服务申请列表") + @ApiOperation("服务预约列表") @PostMapping("/list") public TableDataInfo performanceBookingList(@RequestBody ApplyQuery query) { if (StringUtils.isBlank(query.getIdentity())) { @@ -67,7 +67,7 @@ public class ResidentServiceApplyController extends BaseController { } } - @ApiOperation("服务申请详情") + @ApiOperation("服务预约详情") @GetMapping("/detail/{bookingNo}") public R performanceBookingDetail(@PathVariable String bookingNo) { return R.ok(residentServiceAppletService.detail(bookingNo)); @@ -78,4 +78,19 @@ public class ResidentServiceApplyController extends BaseController { public R> getForm(@PathVariable String identity, String projectName, @RequestHeader("region") String region) { return R.ok(residentServiceAppletService.getForm(identity, projectName,region)); } + + @ApiOperation("服务记录列表") + @PostMapping("/record") + public TableDataInfo performanceBookingRecord(@RequestBody ApplyQuery query) { + if (StringUtils.isBlank(query.getIdentity())) { + throw new ServiceException("居民身份证号不能为空"); + } + try { + startPage(); + return getDataTable(residentServiceAppletService.record(query)); + } catch (Exception e) { + e.printStackTrace(); + throw new ServiceException(e.getMessage()); + } + } } diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java index 134d953..a4ec9c5 100644 --- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java +++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/SignInfoController.java @@ -203,10 +203,10 @@ public class SignInfoController extends BaseController { return getDataTable(null, 0); } - @ApiOperation("获取签约协议内容") - @GetMapping("/getContent/{orgNo}") - public R getAreaById(@PathVariable String orgNo, @RequestHeader("region") String region) { - String result = (String) httpService.get(SpringUtils.getFdUrl(region) + "/resident/signinfo/getContent/" + orgNo, null, String.class); + @ApiOperation(value = "获取签约协议模版内容", notes = "协议模版内容、机构公章照片base64、签约医生签名照片base64") + @GetMapping("/getContent/{userNo}") + public R getAreaById(@PathVariable String userNo, @RequestHeader("region") String region) { + String result = (String) httpService.get(SpringUtils.getFdUrl(region) + "/resident/signinfo/getContent/" + userNo, null, String.class); JSONObject jsonObject = JSONObject.parseObject(result); if ("0".equals(jsonObject.get("code"))) { return R.fail(jsonObject.get("msg").toString()); diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/mapper/ResidentServiceApplyMapper.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/mapper/ResidentServiceApplyMapper.java index e1d022b..c07948f 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/mapper/ResidentServiceApplyMapper.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/mapper/ResidentServiceApplyMapper.java @@ -89,6 +89,15 @@ public interface ResidentServiceApplyMapper { * @return void **/ void batchInsert(List entity); + + /** + * @Author mengkuiliang + * @Description 服务记录列表 + * @Date 2023-10-13 013 14:01 + * @Param [query] + * @return java.util.List + **/ + List getRecord(ApplyQuery query); } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/query/ApplyQuery.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/query/ApplyQuery.java index 955f785..bd5d8e8 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/query/ApplyQuery.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/query/ApplyQuery.java @@ -127,4 +127,10 @@ public class ApplyQuery { */ @ApiModelProperty(value = "数据范围过滤SQL", hidden = true) private String dataScope; + + /** + * 是否已评价（1： 是 2： 否） + */ + @ApiModelProperty(value = "是否已评价（1： 是 2： 否）") + private String isEvaluate; } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/OrderEvaluateInfoVo.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/OrderEvaluateInfoVo.java new file mode 100644 index 0000000..528f2ec --- /dev/null +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/OrderEvaluateInfoVo.java @@ -0,0 +1,91 @@ +package com.xinelu.familydoctor.applet.pojo.vo; + +import com.xinelu.common.core.domain.BaseDomain; +import com.xinelu.manage.domain.orderevaluatepictureinfo.OrderEvaluatePictureInfo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author mengkuiliang + * @Description 服务评价对象 + * @Date 2023-10-13 013 14:49 + * @Param + * @return + **/ +@Data +@ApiModel(value = "服务评价对象") +public class OrderEvaluateInfoVo extends BaseDomain { + /** + * 主键id + */ + private Long id; + + /** + * 会员id + */ + @ApiModelProperty(value = "会员id") + private Long patientId; + + /** + * 微信openid + */ + @ApiModelProperty(value = "微信openid") + private String openid; + + /** + * 微信unionid + */ + @ApiModelProperty(value = "微信unionid") + private String unionid; + + /** + * 订单编号 + */ + @ApiModelProperty(value = "订单编号") + private String orderNo; + + /** + * 服务编号 + */ + @ApiModelProperty(value = "服务编号") + private String serviceCode; + + /** + * 评价内容 + */ + @ApiModelProperty(value = "评价内容") + private String evaluateContent; + + /** + * 手机App：PHONE_APP，微信小程序：WE_CHAT_APPLET + */ + @ApiModelProperty(value = "手机App：PHONE_APP，微信小程序：WE_CHAT_APPLET") + private String evaluateChannel; + + /** + * 预约服务满意度，一般：COMMONLY，满意：SATISFIED，非常满意：VERY_SATISFIED，不满意(差)：DISSATISFIED，非常不满意(非常差)：VERY_DISSATISFIED + */ + @ApiModelProperty(value = "预约服务满意度，一般：COMMONLY，满意：SATISFIED，非常满意：VERY_SATISFIED，不满意(差)：DISSATISFIED，非常不满意(非常差)：VERY_DISSATISFIED") + private String evaluateSatisfaction; + + /** + * 商品订单综合评分，取值，1：代表1颗星，2：代表两颗星，3：代表三颗星，4：代表四颗星，5：代表五颗星 + */ + @ApiModelProperty(value = "商品订单综合评分，取值，1：代表1颗星，2：代表两颗星，3：代表三颗星，4：代表四颗星，5：代表五颗星") + private Integer compositeScore; + + /** + * 订单来源，泉医模块：SPRING_DOCTOR，家医模块：FAMILY_DOCTOR + */ + @ApiModelProperty(value = "订单来源，泉医模块：SPRING_DOCTOR，家医模块：FAMILY_DOCTOR") + private String orderSource; + + /** + * 订单评价图片信息 + */ + @ApiModelProperty(value = "订单评价图片信息") + private List orderEvaluatePictureInfoList; +} diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ProtocolContentVo.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ProtocolContentVo.java index bf712b8..9403648 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ProtocolContentVo.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ProtocolContentVo.java @@ -43,4 +43,16 @@ public class ProtocolContentVo { */ @ApiModelProperty(value = "内容") private String content; + + /** + * 医生签名照片Base64 + */ + @ApiModelProperty(value = "医生签名照片Base64") + private String doctorBase64; + + /** + * 机构公章照片Base64 + */ + @ApiModelProperty(value = "机构公章照片Base64") + private String orgBase64; } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ResidentServiceApplyVo.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ResidentServiceApplyVo.java index 14dce7d..608a42a 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ResidentServiceApplyVo.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ResidentServiceApplyVo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; /** * @Author mengkuiliang @@ -93,14 +94,14 @@ public class ResidentServiceApplyVo { * 预约时间 */ @ApiModelProperty("预约时间") - @JsonFormat(pattern ="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date bookingTime; /** * 申请时间 */ @ApiModelProperty("申请时间") - @JsonFormat(pattern ="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date applyTime; /** @@ -113,14 +114,14 @@ public class ResidentServiceApplyVo { * 取消时间 */ @ApiModelProperty("取消时间") - @JsonFormat(pattern ="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date cancelTime; /** * 完成时间 */ @ApiModelProperty("完成时间") - @JsonFormat(pattern ="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date completeTime; /** @@ -139,7 +140,7 @@ public class ResidentServiceApplyVo { * 审批时间 */ @ApiModelProperty("审批时间") - @JsonFormat(pattern ="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date approvalTime; /** @@ -160,4 +161,10 @@ public class ResidentServiceApplyVo { @ApiModelProperty("评价编号") private String evaluateNo; + /** + * 服务评价对象 + */ + @ApiModelProperty("服务评价对象") + OrderEvaluateInfoVo orderEvaluateInfo; + } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/SignInfoDataVo.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/SignInfoDataVo.java index a8d677e..b3b88b7 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/SignInfoDataVo.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/SignInfoDataVo.java @@ -3,6 +3,7 @@ package com.xinelu.familydoctor.applet.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -61,4 +62,16 @@ public class SignInfoDataVo { */ @ApiModelProperty(value = "机构公章照片Base64") private String orgBase64; + + /** + * 服务包签约价格 + */ + @ApiModelProperty(value = "服务包签约价格") + private BigDecimal packSignCost; + + /** + * 签约周期（年） + */ + @ApiModelProperty(value = "签约周期（年）") + private Integer signYears; } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/SignInfoDetailVo.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/SignInfoDetailVo.java index 0404b3a..7622cb6 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/SignInfoDetailVo.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/SignInfoDetailVo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; import java.util.List; diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/IResidentServiceAppletService.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/IResidentServiceAppletService.java index f8893f5..51cc427 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/IResidentServiceAppletService.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/IResidentServiceAppletService.java @@ -105,4 +105,13 @@ public interface IResidentServiceAppletService { * @return java.lang.Object **/ List getForm(String identity, String projectName, String region); + + /** + * @Author mengkuiliang + * @Description 服务记录列表 + * @Date 2023-10-13 013 13:41 + * @Param [query] + * @return java.util.List + **/ + List record(ApplyQuery query); } diff --git a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java index 85007c0..388feea 100644 --- a/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java +++ b/xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java @@ -88,6 +88,9 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe // 审批状态0:待批准 1:已同意 2:已拒绝 entity.setApprovalStatus("0"); entity.setBookingNo(IdUtils.simpleUUID()); + if(StringUtils.isBlank(entity.getServiceWay())) { + entity.setServiceWay("2"); + } residentServiceApplyMapper.insert(entity); } @@ -325,6 +328,24 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe } return projectList; } + + /** + * @Author mengkuiliang + * @Description 服务记录列表 + * @Date 2023-10-13 013 13:56 + * @Param [query] + * @return java.util.List + **/ + @Override + public List record(ApplyQuery query) { + if (query.getStartDate() != null) { + query.setStartDate(DateUtils.parseDate(DateUtils.parseDateToStr("yyyy-MM-dd 00:00:00", query.getStartDate()))); + } + if (query.getEndDate() != null) { + query.setEndDate(DateUtils.parseDate(DateUtils.parseDateToStr("yyyy-MM-dd 23:59:59", query.getEndDate()))); + } + return residentServiceApplyMapper.getRecord(query); + } } diff --git a/xinelu-familydoctor/src/main/resources/mapper/sign/ResidentServiceApplyMapper.xml b/xinelu-familydoctor/src/main/resources/mapper/sign/ResidentServiceApplyMapper.xml index 9246de3..ed35592 100644 --- a/xinelu-familydoctor/src/main/resources/mapper/sign/ResidentServiceApplyMapper.xml +++ b/xinelu-familydoctor/src/main/resources/mapper/sign/ResidentServiceApplyMapper.xml @@ -32,6 +32,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,booking_no,patient_id, resident_name,identity,package_no, @@ -44,7 +94,7 @@ remark - + s.id,s.booking_no,s.patient_id, s.resident_name,s.identity,s.package_no, s.package_name,s.form_no,s.form_name, @@ -56,6 +106,16 @@ s.remark + + oei.id, oei.openid, oei.unionid, oei.order_no, oei.service_code, + oei.evaluate_content, oei.evaluate_channel, oei.evaluate_satisfaction, oei.composite_score, oei.order_source, + oei.create_by, oei.create_time, oei.update_by, oei.update_time + + + + oepi.id, oepi.order_evaluate_id, oepi.evaluate_picture_url, oepi.create_by, oepi.create_time, oepi.update_by, oepi.update_time + + booking_no,patient_id, resident_name,identity,package_no, @@ -190,7 +250,7 @@ + + + update resident_service_apply From 1869987d7b9f606fd75fd0a71182e3f08e22f4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= Date: Fri, 20 Oct 2023 16:22:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=AF=84=E4=BB=B7=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nursingorder/NursingOrderController.java | 4 ++-- .../service/nursingorder/INursingOrderService.java | 4 ++-- .../nursingorder/impl/NursingOrderServiceImpl.java | 13 +++++++++++-- .../applet/nursingorder/NusringOrderMapper.xml | 6 +++--- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java index 4354a3b..e610b29 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java @@ -46,7 +46,7 @@ public class NursingOrderController extends BaseController { * 根据护理人id以及订单状态查询订单信息 */ @MobileRequestAuthorization - @GetMapping("/goodsOrder") + @PostMapping("/goodsOrder") public TableDataInfo goodsOrder(@RequestBody AppletGoodsOrderVO goodsOrderVO) { startPage(); List goodsOrder = nursingOrderService.getGoodsOrder(goodsOrderVO); @@ -105,6 +105,6 @@ public class NursingOrderController extends BaseController { if (Objects.isNull(nurseOrder) || Objects.isNull(nurseOrder.getParentId()) || StringUtils.isBlank(nurseOrder.getCardNo()) || StringUtils.isBlank(nurseOrder.getOrderStatus())) { return getDataTable(new ArrayList<>()); } - return getDataTable(nursingOrderService.getAppletOrderList(nurseOrder)); + return nursingOrderService.getAppletOrderList(nurseOrder); } } \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java index 7347154..7a1b5a1 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java @@ -4,9 +4,9 @@ package com.xinelu.applet.service.nursingorder; import com.xinelu.applet.dto.nurseorder.NurseOrderDTO; import com.xinelu.applet.vo.nursingorder.AppletGoodsOrderVO; import com.xinelu.applet.vo.nursingorder.NursingOrderInfoVO; -import com.xinelu.applet.vo.nursingorder.PatientOrder; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.domain.entity.SysDictData; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.manage.domain.goodsOrder.GoodsOrder; import java.util.List; @@ -64,5 +64,5 @@ public interface INursingOrderService { * @param nurseOrder nurseOrder * @return AjaxResult */ - List getAppletOrderList(NurseOrderDTO nurseOrder); + TableDataInfo getAppletOrderList(NurseOrderDTO nurseOrder); } \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java index 5591be3..50d7bb3 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java @@ -2,6 +2,7 @@ package com.xinelu.applet.service.nursingorder.impl; import com.alibaba.fastjson2.JSON; +import com.github.pagehelper.PageInfo; import com.xinelu.applet.dto.nurseorder.NurseOrderDTO; import com.xinelu.applet.mapper.nursingorder.NursingOrderMapper; import com.xinelu.applet.service.nursingorder.INursingOrderService; @@ -10,13 +11,16 @@ import com.xinelu.applet.vo.nursingorder.NursingOrderInfoVO; import com.xinelu.applet.vo.nursingorder.PatientOrder; import com.xinelu.applet.vo.nursingorder.PatientOrderVO; import com.xinelu.applet.vo.specialdisease.AppointmentOrderDetailsInfoVO; +import com.xinelu.common.constant.HttpStatus; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.domain.entity.SysDictData; +import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.ConfirmRefundStatusEnum; import com.xinelu.common.enums.GooodsOrderStatusEnum; import com.xinelu.common.enums.OrderSourceEnum; import com.xinelu.common.enums.OrderStatusEnum; import com.xinelu.common.exception.ServiceException; +import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.http.HttpUtils; import com.xinelu.common.utils.spring.SpringUtils; import com.xinelu.manage.domain.goodsOrder.GoodsOrder; @@ -135,7 +139,7 @@ public class NursingOrderServiceImpl implements INursingOrderService { * @return AjaxResult */ @Override - public List getAppletOrderList(NurseOrderDTO nurseOrder) { + public TableDataInfo getAppletOrderList(NurseOrderDTO nurseOrder) { List patientOrders = new ArrayList<>(); List appletOrderList = new ArrayList<>(); List goodsOrderAndConsultationOrder = new ArrayList<>(); @@ -182,10 +186,15 @@ public class NursingOrderServiceImpl implements INursingOrderService { patientOrders.addAll(data); } } + TableDataInfo rspData = new TableDataInfo(); + rspData.setTotal(new PageInfo(patientOrders).getTotal()); if (CollectionUtils.isNotEmpty(patientOrders)) { Collections.sort(patientOrders, Comparator.comparing(PatientOrder::getCreateTime, (u1, u2) -> u2.compareTo(u1))); patientOrders = patientOrders.stream().skip((nurseOrder.getPageNum() - 1) * nurseOrder.getPageSize()).limit(nurseOrder.getPageSize()).collect(Collectors.toList()); } - return patientOrders; + rspData.setRows(patientOrders); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + return rspData; } } \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml index fbea41b..5dac6e9 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml @@ -155,8 +155,8 @@ and gr.order_type = #{orderType} - - gr.order_typ in + + and gr.order_type in #{orderTypeList} @@ -384,7 +384,7 @@ LEFT JOIN hospital_person_info hpi ON hpi.id = gor.hospital_person_id LEFT JOIN order_evaluate_info nei ON nei.order_no = gor.order_no where - + gor.order_status in #{orderStatusList} From dea1bd6bc353668d5f566a05bbd6be12e718840d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= Date: Fri, 20 Oct 2023 16:24:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=AF=84=E4=BB=B7=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consultationInfo/ConsultationInfoController.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java index 2ea91d9..54ca07c 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/consultationInfo/ConsultationInfoController.java @@ -36,7 +36,6 @@ public class ConsultationInfoController extends BaseController { /** * 查询在线问诊-问诊信息列表 */ - //@PreAuthorize("@ss.hasPermi('system:info:list')") @GetMapping("/list") public TableDataInfo list(ConsultationInfoDTO consultationInfoDTO) { startPage(); @@ -44,11 +43,9 @@ public class ConsultationInfoController extends BaseController { return getDataTable(list); } - /** * 获取在线问诊-问诊信息详细信息 */ - //@PreAuthorize("@ss.hasPermi('system:info:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(consultationInfoService.selectConsultationInfoById(id)); @@ -57,7 +54,6 @@ public class ConsultationInfoController extends BaseController { /** * 新增在线问诊-问诊信息 */ - // @PreAuthorize("@ss.hasPermi('system:info:add')") @Log(title = "在线问诊-问诊信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@Validated(Insert.class) @RequestBody ConsultationInfoDTO consultationInfoDTO) { @@ -67,14 +63,12 @@ public class ConsultationInfoController extends BaseController { /** * 修改在线问诊-问诊信息(修改问诊状态) */ - // @PreAuthorize("@ss.hasPermi('system:info:edit')") @Log(title = "在线问诊-问诊信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ConsultationInfo consultationInfo) { return toAjax(consultationInfoService.updateConsultationInfo(consultationInfo)); } - /** * 问诊资料上传接口 */ @@ -88,5 +82,4 @@ public class ConsultationInfoController extends BaseController { } return consultationInfoService.uploadConsultationFile(multipartFile); } - } From fdd2b195d13a00b27bd25bc1cd5944d1f6bb2131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=81=92?= Date: Fri, 20 Oct 2023 16:30:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=AF=84=E4=BB=B7=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/nursingorder/impl/NursingOrderServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java index 50d7bb3..c6b7eb2 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java @@ -20,7 +20,6 @@ import com.xinelu.common.enums.GooodsOrderStatusEnum; import com.xinelu.common.enums.OrderSourceEnum; import com.xinelu.common.enums.OrderStatusEnum; import com.xinelu.common.exception.ServiceException; -import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.http.HttpUtils; import com.xinelu.common.utils.spring.SpringUtils; import com.xinelu.manage.domain.goodsOrder.GoodsOrder; @@ -164,7 +163,7 @@ public class NursingOrderServiceImpl implements INursingOrderService { } String result = HttpUtils.sendGet(SpringUtils.getFdUrl(nurseOrder.getRegion()) + "/performance/recordV2/" + nurseOrder.getCardNo()); if (StringUtils.isBlank(result)) { - throw new ServiceException("获取微信小程序用户信息失败", 201); + throw new ServiceException("获取家医小程序用户订单信息失败", 201); } PatientOrderVO resultHttp = JSON.parseObject(result, PatientOrderVO.class); if (Objects.nonNull(resultHttp) && CollectionUtils.isNotEmpty(resultHttp.getData()) && Objects.nonNull(resultHttp.getData().get(0).getOrderNo())) { From 0aeb082eff688300e21ccf49eca1d2d294389896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=97=AD?= <17615834396@163.com> Date: Mon, 23 Oct 2023 14:07:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=9B=E6=9F=A5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/nurseapplogin/PatientAndDiseaseVO.java | 1 + .../nurseapplogin/NurseAppLoginMapper.xml | 2 + .../EvaluateResultController.java | 36 +++++++++++++++ .../evaluateresult/EvaluateResultMapper.java | 18 ++++++++ .../evaluateresult/EvaluateResultService.java | 17 +++++++ .../impl/EvaluateResultServiceimpl.java | 44 +++++++++++++++++++ .../vo/evaluateresult/EvaluateResultVo.java | 16 +++++++ .../evaluateresult/EvaluaterSultMapper.xml | 26 +++++++++++ 8 files changed, 160 insertions(+) create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/evaluateresult/EvaluateResultController.java create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/evaluateresult/EvaluateResultMapper.java create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/EvaluateResultService.java create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/impl/EvaluateResultServiceimpl.java create mode 100644 xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/evaluateresult/EvaluateResultVo.java create mode 100644 xinelu-nurse-manage/src/main/resources/mapper/manage/evaluateresult/EvaluaterSultMapper.xml diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java index faa5201..13c1dcd 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/PatientAndDiseaseVO.java @@ -160,6 +160,7 @@ public class PatientAndDiseaseVO implements Serializable { private String disease; + private String signNo; /** * 基础疾病信息 */ diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml index ea7b893..3b6c73d 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nurseapplogin/NurseAppLoginMapper.xml @@ -25,6 +25,7 @@ + @@ -83,6 +84,7 @@ pi.disabling_reason, pi.patient_code, pi.disease, + pi.sign_no, pdi.id patientDiseaseId, pdi.disease_id, pdi.disease_name, diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/evaluateresult/EvaluateResultController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/evaluateresult/EvaluateResultController.java new file mode 100644 index 0000000..5cd1200 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/evaluateresult/EvaluateResultController.java @@ -0,0 +1,36 @@ +package com.xinelu.manage.controller.evaluateresult; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.manage.service.evaluateresult.EvaluateResultService; +import com.xinelu.manage.vo.evaluateresult.EvaluateResultVo; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +/** + * 筛查结果统计 + */ +@RestController +@RequestMapping("/system/evaluateResult") +public class EvaluateResultController extends BaseController { + + @Resource + private EvaluateResultService evaluateResultService; + + /** + * 根据年龄端性别统计筛查结果 + * @param ageA + * @param ageB + * @param sex + * @return + */ + @GetMapping("/list/{ageA}/{ageB}/{sex}") + public TableDataInfo list(@PathVariable("ageA") String ageA, @PathVariable("ageB") String ageB,@PathVariable("sex")String sex) { + startPage(); + List list = evaluateResultService.list(ageA,ageB,sex); + return getDataTable(list); + } +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/evaluateresult/EvaluateResultMapper.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/evaluateresult/EvaluateResultMapper.java new file mode 100644 index 0000000..ba5f2f3 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/evaluateresult/EvaluateResultMapper.java @@ -0,0 +1,18 @@ +package com.xinelu.manage.mapper.evaluateresult; + +import com.xinelu.manage.vo.evaluateresult.EvaluateResultVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface EvaluateResultMapper { + + /** + * 根据年龄端性别统计筛查结果 + * @param startTime + * @param endTime + * @param sex + */ + List list(@Param("startTime") String startTime, @Param("endTime")String endTime, @Param("sex") String sex); +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/EvaluateResultService.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/EvaluateResultService.java new file mode 100644 index 0000000..e83cd22 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/EvaluateResultService.java @@ -0,0 +1,17 @@ +package com.xinelu.manage.service.evaluateresult; + +import com.xinelu.manage.vo.evaluateresult.EvaluateResultVo; + +import java.util.List; +import java.util.Map; + +public interface EvaluateResultService { + /** + * 根据年龄端性别统计筛查结果 + * @param ageA + * @param ageB + * @param sex + * @return + */ + List list(String ageA, String ageB, String sex); +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/impl/EvaluateResultServiceimpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/impl/EvaluateResultServiceimpl.java new file mode 100644 index 0000000..29b1239 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/impl/EvaluateResultServiceimpl.java @@ -0,0 +1,44 @@ +package com.xinelu.manage.service.evaluateresult.impl; +import com.xinelu.manage.mapper.evaluateresult.EvaluateResultMapper; +import com.xinelu.manage.service.evaluateresult.EvaluateResultService; +import com.xinelu.manage.vo.evaluateresult.EvaluateResultVo; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +public class EvaluateResultServiceimpl implements EvaluateResultService { + + @Resource + private EvaluateResultMapper evaluateResultMapper; + + /** + * 根据年龄端性别统计筛查结果 + * @param ageA + * @param ageB + * @param sex + * @return + */ + @Override + public List list(String ageA, String ageB, String sex) { + String timeMinus = "-01"+"-01"; + //开始时间 + String startTime = calculateBirthYear(Integer.parseInt(ageB))+timeMinus; + //结束时间 + String endTime = calculateBirthYear(Integer.parseInt(ageA))+timeMinus; + return evaluateResultMapper.list(startTime, endTime, sex); + } + + /** + * 年龄转日期 + * @param age + * @return + */ + public static int calculateBirthYear(int age) { + int currentYear = java.time.Year.now().getValue(); + int birthYear = currentYear - age; + return birthYear; + } +} diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/evaluateresult/EvaluateResultVo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/evaluateresult/EvaluateResultVo.java new file mode 100644 index 0000000..602ca65 --- /dev/null +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/evaluateresult/EvaluateResultVo.java @@ -0,0 +1,16 @@ +package com.xinelu.manage.vo.evaluateresult; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class EvaluateResultVo implements Serializable { + /**数量*/ + + private Integer count; + /**结果*/ + + private String evaluateResult; + +} diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/evaluateresult/EvaluaterSultMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/evaluateresult/EvaluaterSultMapper.xml new file mode 100644 index 0000000..359d7a6 --- /dev/null +++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/evaluateresult/EvaluaterSultMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + +