From 4237959387b0a2ca4cff01d99a4f79b2a6039d25 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Thu, 24 Apr 2025 10:13:36 +0800 Subject: [PATCH] dev --- .../controller/charge/ChargeController.java | 5 +- .../MedicalRecordController.java | 8 +- .../social/SocialDiagnoseController.java | 25 ++++ .../social/SocialDirectoryController.java | 7 +- .../statistics/StatisticsController.java | 119 ++++++++++++++++ ...geServiceList.java => ChargeItemList.java} | 10 +- .../entity/charge/dto/ChargeOrderDto.java | 8 +- .../entity/charge/vo/ChargeDetailVo.java | 10 +- .../server/entity/diagnosis/Diagnosis.java | 44 ++++++ .../DiagnosisMedicalGoodsList.java} | 16 +-- .../DiagnosisMedicalItemList.java} | 16 +-- .../DiagnosisMedicalRecord.java} | 25 ++-- .../dto/GoodsRetailDto.java | 2 +- .../diagnosis/dto/MedicalRecordSaveDto.java | 33 +++++ .../dto/MedicalRecordVo.java | 10 +- .../medical/dto/MedicalRecordSaveDto.java | 63 --------- .../entity/statistics/GoodsTypeRevenue.java | 12 ++ .../entity/statistics/PayTypeRevenue.java | 12 ++ .../statistics/PersonPayOverviewVo.java | 14 ++ .../entity/statistics/RevenueOverviewVo.java | 29 ++++ .../mapper/charge/ChargeItemListMapper.java | 18 +++ .../charge/ChargeServiceListMapper.java | 18 --- .../mapper/diagnosis/DiagnosisMapper.java | 20 +++ .../DiagnosisMedicalGoodsListMapper.java | 23 ++++ .../DiagnosisMedicalItemListMapper.java | 22 +++ .../DiagnosisMedicalRecordMapper.java | 20 +++ .../medical/MedicalGoodsListMapper.java | 24 ---- .../mapper/medical/MedicalItemListMapper.java | 22 --- .../mapper/medical/MedicalRecordMapper.java | 18 --- .../server/service/charge/ChargeService.java | 76 +++++------ .../MedicalRecordService.java | 127 ++++++++++-------- .../server/service/goods/GoodsService.java | 6 + .../service/social/SocialDiagnoseService.java | 16 +++ .../social/SocialDirectoryService.java | 17 +-- .../service/statistics/StatisticsService.java | 19 +++ ...istMapper.xml => ChargeItemListMapper.xml} | 2 +- ...alRecordMapper.xml => DiagnosisMapper.xml} | 2 +- .../xml/DiagnosisMedicalGoodsListMapper.xml | 5 + ...xml => DiagnosisMedicalItemListMapper.xml} | 2 +- ...r.xml => DiagnosisMedicalRecordMapper.xml} | 2 +- .../clinic/server/ServerApplicationTests.java | 7 +- 41 files changed, 600 insertions(+), 334 deletions(-) rename src/main/java/com/syjiaer/clinic/server/controller/{medical => diagnosis}/MedicalRecordController.java (84%) create mode 100644 src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java create mode 100644 src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java rename src/main/java/com/syjiaer/clinic/server/entity/charge/{ChargeServiceList.java => ChargeItemList.java} (88%) create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java rename src/main/java/com/syjiaer/clinic/server/entity/{medical/MedicalGoodsList.java => diagnosis/DiagnosisMedicalGoodsList.java} (74%) rename src/main/java/com/syjiaer/clinic/server/entity/{medical/MedicalItemList.java => diagnosis/DiagnosisMedicalItemList.java} (75%) rename src/main/java/com/syjiaer/clinic/server/entity/{medical/MedicalRecord.java => diagnosis/DiagnosisMedicalRecord.java} (73%) rename src/main/java/com/syjiaer/clinic/server/entity/{medical => diagnosis}/dto/GoodsRetailDto.java (98%) create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java rename src/main/java/com/syjiaer/clinic/server/entity/{medical => diagnosis}/dto/MedicalRecordVo.java (81%) delete mode 100644 src/main/java/com/syjiaer/clinic/server/entity/medical/dto/MedicalRecordSaveDto.java create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/statistics/GoodsTypeRevenue.java create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/statistics/PayTypeRevenue.java create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/statistics/PersonPayOverviewVo.java create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/statistics/RevenueOverviewVo.java create mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java delete mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeServiceListMapper.java create mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java create mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java create mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java create mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalRecordMapper.java delete mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalGoodsListMapper.java delete mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalItemListMapper.java delete mode 100644 src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalRecordMapper.java rename src/main/java/com/syjiaer/clinic/server/service/{medical => diagnosis}/MedicalRecordService.java (59%) create mode 100644 src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java rename src/main/resources/xml/{ChargeServiceListMapper.xml => ChargeItemListMapper.xml} (91%) rename src/main/resources/xml/{MedicalRecordMapper.xml => DiagnosisMapper.xml} (65%) create mode 100644 src/main/resources/xml/DiagnosisMedicalGoodsListMapper.xml rename src/main/resources/xml/{MedicalGoodsListMapper.xml => DiagnosisMedicalItemListMapper.xml} (62%) rename src/main/resources/xml/{MedicalItemListMapper.xml => DiagnosisMedicalRecordMapper.xml} (62%) diff --git a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java index bf0eb8a..d700faa 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java @@ -18,8 +18,9 @@ public class ChargeController extends BaseController { @RequestMapping("/save") public Result save() { ChargeOrderDto dto = parmsUtil.getObject("data", ChargeOrderDto.class); - ChargeOrder chargeOrder = chargeService.updateOrCreate(dto); - return success(chargeOrder.getId()); +// ChargeOrder chargeOrder = chargeService.updateOrCreate(dto); +// return success(chargeOrder.getId()); + return success(); } @RequestMapping("/list") diff --git a/src/main/java/com/syjiaer/clinic/server/controller/medical/MedicalRecordController.java b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/MedicalRecordController.java similarity index 84% rename from src/main/java/com/syjiaer/clinic/server/controller/medical/MedicalRecordController.java rename to src/main/java/com/syjiaer/clinic/server/controller/diagnosis/MedicalRecordController.java index de2c3a4..3184bca 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/medical/MedicalRecordController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/MedicalRecordController.java @@ -1,10 +1,10 @@ -package com.syjiaer.clinic.server.controller.medical; +package com.syjiaer.clinic.server.controller.diagnosis; import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.controller.BaseController; -import com.syjiaer.clinic.server.entity.medical.dto.MedicalRecordSaveDto; -import com.syjiaer.clinic.server.entity.medical.dto.MedicalRecordVo; -import com.syjiaer.clinic.server.service.medical.MedicalRecordService; +import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordSaveDto; +import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordVo; +import com.syjiaer.clinic.server.service.diagnosis.MedicalRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java new file mode 100644 index 0000000..7ec8961 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java @@ -0,0 +1,25 @@ +package com.syjiaer.clinic.server.controller.social; + +import com.syjiaer.clinic.server.common.vo.Result; +import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.social.SocialDiagnose; +import com.syjiaer.clinic.server.entity.social.SocialDirectory; +import com.syjiaer.clinic.server.service.social.SocialDiagnoseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/social/diagnose") +public class SocialDiagnoseController extends BaseController { + @Autowired + private SocialDiagnoseService socialDiagnoseService; + @RequestMapping("search") + public Result> getDiagnosis() { + String keyword = parmsUtil.getString("keyword"); + List diagnosis = socialDiagnoseService.getDiagnosis(keyword); + return success(diagnosis); + } +} diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java index a70126f..c23fdd7 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialDirectoryController.java @@ -81,12 +81,7 @@ public class SocialDirectoryController extends BaseController { } - @RequestMapping("getDiagnosis") - public Result> getDiagnosis() { - String keyword = parmsUtil.getString("keyword"); - List diagnosis = socialDirectoryService.getDiagnosis(keyword); - return success(diagnosis); - } + } diff --git a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java new file mode 100644 index 0000000..fac5eea --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java @@ -0,0 +1,119 @@ +package com.syjiaer.clinic.server.controller.statistics; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.common.util.DateUtil; +import com.syjiaer.clinic.server.common.vo.Result; +import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.goods.Goods; +import com.syjiaer.clinic.server.entity.statistics.PersonPayOverviewVo; +import com.syjiaer.clinic.server.entity.statistics.RevenueOverviewVo; +import com.syjiaer.clinic.server.service.goods.GoodsService; +import com.syjiaer.clinic.server.service.inventory.InventoryService; +import com.syjiaer.clinic.server.service.statistics.StatisticsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RequestMapping("/statistics") +@RestController +public class StatisticsController extends BaseController { + + @Autowired + private StatisticsService statisticsService; + @Autowired + private InventoryService inventoryService; + @Autowired + private GoodsService goodsService; + + @RequestMapping("getRevenueOverview") + public Result getRevenueOverview() { + String begin = parmsUtil.getString("beginTime", "开始时间为空"); + String end = parmsUtil.getString("endTime", "结束时间为空"); + LocalDateTime beginTime = DateUtil.getDateTime(begin); + LocalDateTime endTime = DateUtil.getDateTime(end); + +// RevenueOverviewVo revenueOverview = statisticsService.getRevenueOverview(beginTime, endTime); +// return success(revenueOverview); + return success(); + } + + + @RequestMapping("numberEarlyWarning") + public Result> numberEarlyWarning() { +// QueryWrapper inventoryQuery = new QueryWrapper<>(); +// inventoryQuery.select("good_id,name,packaging_unit,min_packaging_unit,sum(whole_number) as whole_number,sum(fragment_number) as fragment_number"); +// inventoryQuery.groupBy("good_id,name,packaging_unit,min_packaging_unit"); +// inventoryQuery.having(" sum(whole_number)<"+ Constants.numberWarningLimit); +// inventoryQuery.orderByAsc("whole_number"); +// List> maps = iInventoryService.listMaps(inventoryQuery); + QueryWrapper goodsQuery = new QueryWrapper<>(); + goodsQuery.apply("inventory_whole_number <= inventory_warn_number"); + List list = goodsService.list(goodsQuery); + return success(list); + } + + @RequestMapping("expiryDateWarning") + public Result>> expiryDateWarning0() { +// QueryWrapper inventoryQuery = new QueryWrapper<>(); +// inventoryQuery.select("*,EXTRACT(EPOCH FROM AGE(expiry_date,CURRENT_DATE))/" + Constants.OneDaySecond + " as remaining_days"); +// inventoryQuery.apply("CURRENT_DATE + INTERVAL '1 day' * expiry_warn_days >= expiry_date"); +// inventoryQuery.orderByAsc("expiry_date"); +// +// List> maps = iInventoryGoodsViewService.listMaps(inventoryQuery); +// return success(maps); + return success(); + } + + @RequestMapping("getPersonPayOverview") + public Result getPersonPayOverview() { +// String begin = parmsUtil.getString("beginTime", "开始时间为空"); +// String end = parmsUtil.getString("endTime", "结束时间为空"); +// LocalDateTime beginTime = DateUtil.getDateTime(begin); +// LocalDateTime endTime = DateUtil.getDateTime(end); +// QueryWrapper vipQuery = new QueryWrapper<>(); +// vipQuery.select("create_date,sum(total_price)"); +// vipQuery.ge("pay_time", beginTime); +// vipQuery.le("pay_time", endTime); +// +// vipQuery.groupBy("create_date"); +// vipQuery.orderByAsc("create_date"); +// vipQuery.isNotNull("vip_id"); +// List> vipMaps = retailOrderService.listMaps(vipQuery); +// QueryWrapper commonQuery = new QueryWrapper<>(); +// commonQuery.select("create_date,sum(total_price)"); +// commonQuery.ge("pay_time", beginTime); +// commonQuery.le("pay_time", endTime); +// +// commonQuery.groupBy("create_date"); +// commonQuery.orderByAsc("create_date"); +// commonQuery.isNull("vip_id"); +// List> commonMaps = retailOrderService.listMaps(commonQuery); +// List dateList = DateUtil.getDatesBetween(beginTime, endTime); +// Map tempMap = new HashMap<>(); +// for (LocalDate date : dateList) { +// tempMap.put(date.toString(), BigDecimal.ZERO); +// } +// for (Map map : vipMaps) { +// tempMap.put(map.get("create_date").toString(), (BigDecimal) map.get("sum")); +// } +// PersonPayOverviewVo personPayOverview = new PersonPayOverviewVo(); +// personPayOverview.setDateList(dateList.stream().map(LocalDate::toString).toList()); +// personPayOverview.setVipPrice(new ArrayList<>(tempMap.values())); +// for (Map map : commonMaps) { +// tempMap.put(map.get("create_date").toString(), (BigDecimal) map.get("sum")); +// } +// personPayOverview.setCommonPrice(new ArrayList<>(tempMap.values())); + + return success(); + } + + +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeServiceList.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeItemList.java similarity index 88% rename from src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeServiceList.java rename to src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeItemList.java index a6562fb..ed0ca6e 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeServiceList.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeItemList.java @@ -15,19 +15,19 @@ import lombok.ToString; import lombok.experimental.Accessors; /** *

- * + * 收费服务详情 *

* * @author NiuZiYuan - * @since 2025-04-22 + * @since 2025-04-24 */ @Getter @Setter @ToString @Accessors(chain = true) -@TableName("charge_service_list") -@ApiModel(value = "ChargeServiceList对象", description = "") -public class ChargeServiceList implements Serializable { +@TableName("charge_item_list") +@ApiModel(value = "ChargeItemList对象", description = "收费服务详情") +public class ChargeItemList implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeOrderDto.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeOrderDto.java index 0b20fbf..8c46b80 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeOrderDto.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeOrderDto.java @@ -1,8 +1,8 @@ package com.syjiaer.clinic.server.entity.charge.dto; -import com.syjiaer.clinic.server.entity.charge.ChargeServiceList; +import com.syjiaer.clinic.server.entity.charge.ChargeItemList; import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; -import com.syjiaer.clinic.server.entity.medical.MedicalRecord; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; import com.syjiaer.clinic.server.entity.patient.PatientInfo; import lombok.Data; @@ -24,8 +24,8 @@ public class ChargeOrderDto { private Long salePersonId; private Long medicalRecordId; private PatientInfo patientInfo; - private MedicalRecord medicalRecord; - private List serviceDetail; + private DiagnosisMedicalRecord diagnosisMedicalRecord; + private List serviceDetail; private List goodsDetail; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeDetailVo.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeDetailVo.java index f6fb8d0..60f0ac6 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeDetailVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeDetailVo.java @@ -1,9 +1,7 @@ package com.syjiaer.clinic.server.entity.charge.vo; -import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList; -import com.syjiaer.clinic.server.entity.charge.ChargeServiceList; -import com.syjiaer.clinic.server.entity.medical.MedicalRecord; -import com.syjiaer.clinic.server.entity.medical.dto.MedicalRecordVo; +import com.syjiaer.clinic.server.entity.charge.ChargeItemList; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; import com.syjiaer.clinic.server.entity.patient.PatientInfo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -55,12 +53,12 @@ public class ChargeDetailVo { @ApiModelProperty("患者姓名") private String patientName; @ApiModelProperty - private MedicalRecord medicalRecord; + private DiagnosisMedicalRecord diagnosisMedicalRecord; @ApiModelProperty("患者信息") private PatientInfo patientInfo; @ApiModelProperty("诊疗服务") - private List serviceDetail; + private List serviceDetail; @ApiModelProperty("药品耗材") private List goodsDetail; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java new file mode 100644 index 0000000..38a5134 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/Diagnosis.java @@ -0,0 +1,44 @@ +package com.syjiaer.clinic.server.entity.diagnosis; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; +/** + *

+ * + *

+ * + * @author NiuZiYuan + * @since 2025-04-24 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@ApiModel(value = "Diagnosis对象", description = "") +public class Diagnosis implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键id") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("患者id") + private Integer patientId; + + @ApiModelProperty("挂单id") + private Integer registrationId; + + @ApiModelProperty("病例流水号") + private String code; + + @ApiModelProperty("医生id") + private Integer dockerId; +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalGoodsList.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalGoodsList.java similarity index 74% rename from src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalGoodsList.java rename to src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalGoodsList.java index 2e9cbea..dd201a7 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalGoodsList.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalGoodsList.java @@ -1,4 +1,4 @@ -package com.syjiaer.clinic.server.entity.medical; +package com.syjiaer.clinic.server.entity.diagnosis; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,19 +13,19 @@ import lombok.ToString; import lombok.experimental.Accessors; /** *

- * + * 病例商品详情 *

* * @author NiuZiYuan - * @since 2025-04-23 + * @since 2025-04-24 */ @Getter @Setter @ToString @Accessors(chain = true) -@TableName("medical_goods_list") -@ApiModel(value = "MedicalGoodsList对象", description = "") -public class MedicalGoodsList implements Serializable { +@TableName("diagnosis_medical_goods_list") +@ApiModel(value = "DiagnosisMedicalGoodsList对象", description = "病例商品详情") +public class DiagnosisMedicalGoodsList implements Serializable { private static final long serialVersionUID = 1L; @@ -48,8 +48,8 @@ public class MedicalGoodsList implements Serializable { @ApiModelProperty("商品单价") private BigDecimal unitPrice; - @ApiModelProperty("病例id") - private Integer medicalRecordId; + @ApiModelProperty("诊断code") + private String diagnosisCode; @ApiModelProperty("药品数量") private Integer number; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalItemList.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalItemList.java similarity index 75% rename from src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalItemList.java rename to src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalItemList.java index 6db5520..ab037c7 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalItemList.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalItemList.java @@ -1,4 +1,4 @@ -package com.syjiaer.clinic.server.entity.medical; +package com.syjiaer.clinic.server.entity.diagnosis; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,19 +13,19 @@ import lombok.ToString; import lombok.experimental.Accessors; /** *

- * + * 病例服务详情 *

* * @author NiuZiYuan - * @since 2025-04-23 + * @since 2025-04-24 */ @Getter @Setter @ToString @Accessors(chain = true) -@TableName("medical_item_list") -@ApiModel(value = "MedicalItemList对象", description = "") -public class MedicalItemList implements Serializable { +@TableName("diagnosis_medical_item_list") +@ApiModel(value = "DiagnosisMedicalItemList对象", description = "病例服务详情") +public class DiagnosisMedicalItemList implements Serializable { private static final long serialVersionUID = 1L; @@ -48,8 +48,8 @@ public class MedicalItemList implements Serializable { @ApiModelProperty("服务单价") private BigDecimal unitPrice; - @ApiModelProperty("病例id") - private Integer medicalRecordId; + @ApiModelProperty("诊断code") + private String diagnosisCode; @ApiModelProperty("药品数量") private Integer number; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalRecord.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalRecord.java similarity index 73% rename from src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalRecord.java rename to src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalRecord.java index feeeab7..929b15d 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/medical/MedicalRecord.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/DiagnosisMedicalRecord.java @@ -1,4 +1,4 @@ -package com.syjiaer.clinic.server.entity.medical; +package com.syjiaer.clinic.server.entity.diagnosis; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -17,15 +17,15 @@ import lombok.experimental.Accessors; *

* * @author NiuZiYuan - * @since 2025-04-23 + * @since 2025-04-24 */ @Getter @Setter @ToString @Accessors(chain = true) -@TableName("medical_record") -@ApiModel(value = "MedicalRecord对象", description = "病例") -public class MedicalRecord implements Serializable { +@TableName("diagnosis_medical_record") +@ApiModel(value = "DiagnosisMedicalRecord对象", description = "病例") +public class DiagnosisMedicalRecord implements Serializable { private static final long serialVersionUID = 1L; @@ -33,9 +33,6 @@ public class MedicalRecord implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; - @ApiModelProperty("患者id") - private Integer patientId; - @ApiModelProperty("主诉") private String mainAppeal; @@ -54,12 +51,6 @@ public class MedicalRecord implements Serializable { @ApiModelProperty("非通用字段") private String json; - @ApiModelProperty("接诊医生id") - private Integer dockerId; - - @ApiModelProperty("接诊医生姓名") - private String dockerName; - @ApiModelProperty("诊断详细数据") private String diagnosisDetail; @@ -69,9 +60,9 @@ public class MedicalRecord implements Serializable { @ApiModelProperty("创建日期") private LocalDateTime createDatetime; - @ApiModelProperty("挂单id") - private Integer registrationId; - @ApiModelProperty("诊断类别") private String diagType; + + @ApiModelProperty("诊断code") + private String diagnosisCode; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/medical/dto/GoodsRetailDto.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java similarity index 98% rename from src/main/java/com/syjiaer/clinic/server/entity/medical/dto/GoodsRetailDto.java rename to src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java index 5a235ed..ec63a40 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/medical/dto/GoodsRetailDto.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/GoodsRetailDto.java @@ -1,4 +1,4 @@ -package com.syjiaer.clinic.server.entity.medical.dto; +package com.syjiaer.clinic.server.entity.diagnosis.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java new file mode 100644 index 0000000..cf803e6 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java @@ -0,0 +1,33 @@ +package com.syjiaer.clinic.server.entity.diagnosis.dto; + +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; +import com.syjiaer.clinic.server.entity.item.Item; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +public class MedicalRecordSaveDto { + @ApiModelProperty("自增id") + private Integer id; + + @ApiModelProperty("患者id") + private Integer patientId; + + @ApiModelProperty("接诊医生id") + private Integer dockerId; + + @ApiModelProperty("挂单id") + private Integer registrationId; + + @ApiModelProperty + private DiagnosisMedicalRecord diagnosisMedicalRecord; + @ApiModelProperty("服务项目列表") + private List itemList; + @ApiModelProperty("药品耗材列表") + private List goodsList; +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/medical/dto/MedicalRecordVo.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordVo.java similarity index 81% rename from src/main/java/com/syjiaer/clinic/server/entity/medical/dto/MedicalRecordVo.java rename to src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordVo.java index c474389..0fb3198 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/medical/dto/MedicalRecordVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordVo.java @@ -1,9 +1,9 @@ -package com.syjiaer.clinic.server.entity.medical.dto; +package com.syjiaer.clinic.server.entity.diagnosis.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.syjiaer.clinic.server.entity.medical.MedicalGoodsList; -import com.syjiaer.clinic.server.entity.medical.MedicalItemList; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalGoodsList; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -56,7 +56,7 @@ public class MedicalRecordVo { @ApiModelProperty("挂单id") private Integer registrationId; @ApiModelProperty("诊疗服务") - private List serviceDetail; + private List serviceDetail; @ApiModelProperty("药品耗材") - private List goodsDetail; + private List goodsDetail; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/medical/dto/MedicalRecordSaveDto.java b/src/main/java/com/syjiaer/clinic/server/entity/medical/dto/MedicalRecordSaveDto.java deleted file mode 100644 index 0bff69a..0000000 --- a/src/main/java/com/syjiaer/clinic/server/entity/medical/dto/MedicalRecordSaveDto.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.syjiaer.clinic.server.entity.medical.dto; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.syjiaer.clinic.server.entity.item.Item; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import java.time.LocalDateTime; -import java.util.List; - -@Getter -@Setter -public class MedicalRecordSaveDto { - @ApiModelProperty("自增id") - private Integer id; - - @ApiModelProperty("患者id") - private Integer patientId; - - @ApiModelProperty("主诉") - private String mainAppeal; - - @ApiModelProperty("现病史") - private String nowMedicalHistory; - - @ApiModelProperty("往病史") - private String beforeMedicalHistory; - - @ApiModelProperty("过敏史") - private String allergyHistory; - - @ApiModelProperty("体检检查") - private String exam; - - @ApiModelProperty("非通用字段") - private String json; - - @ApiModelProperty("接诊医生id") - private Integer dockerId; - - @ApiModelProperty("接诊医生姓名") - private String dockerName; - - @ApiModelProperty("诊断详细数据") - private String diagnosisDetail; - - @ApiModelProperty("诊断概况") - private String diagnosisSummary; - - @ApiModelProperty("创建日期") - private LocalDateTime createDatetime; - - @ApiModelProperty("挂单id") - private Integer registrationId; - - - @ApiModelProperty("服务项目列表") - private List itemList; - @ApiModelProperty("药品耗材列表") - private List goodsList; -} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/statistics/GoodsTypeRevenue.java b/src/main/java/com/syjiaer/clinic/server/entity/statistics/GoodsTypeRevenue.java new file mode 100644 index 0000000..74185de --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/statistics/GoodsTypeRevenue.java @@ -0,0 +1,12 @@ +package com.syjiaer.clinic.server.entity.statistics; + +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; +@Getter +@Setter +public class GoodsTypeRevenue { + private String name; + private BigDecimal totalRevenue; +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/statistics/PayTypeRevenue.java b/src/main/java/com/syjiaer/clinic/server/entity/statistics/PayTypeRevenue.java new file mode 100644 index 0000000..8af47e1 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/statistics/PayTypeRevenue.java @@ -0,0 +1,12 @@ +package com.syjiaer.clinic.server.entity.statistics; + +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; +@Getter +@Setter +public class PayTypeRevenue { + private BigDecimal totalRevenue; + private String name; +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/statistics/PersonPayOverviewVo.java b/src/main/java/com/syjiaer/clinic/server/entity/statistics/PersonPayOverviewVo.java new file mode 100644 index 0000000..743e86e --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/statistics/PersonPayOverviewVo.java @@ -0,0 +1,14 @@ +package com.syjiaer.clinic.server.entity.statistics; + +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; +import java.util.List; +@Getter +@Setter +public class PersonPayOverviewVo { + private List dateList; + private List vipPrice; + private List commonPrice; +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/statistics/RevenueOverviewVo.java b/src/main/java/com/syjiaer/clinic/server/entity/statistics/RevenueOverviewVo.java new file mode 100644 index 0000000..c6837b1 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/statistics/RevenueOverviewVo.java @@ -0,0 +1,29 @@ +package com.syjiaer.clinic.server.entity.statistics; + +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 营收概况 + */ +@Getter +@Setter +public class RevenueOverviewVo { + //总营业额 + private BigDecimal totalRevenue; + //会员销售额 + private BigDecimal vipRevenue; + //总完成单数 + private Long totalOrderCount; + //会员单数 + private Long vipOrderCount; + + private List goodsTypeRevenue; + + private List payTypeRevenue; + + +} diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java new file mode 100644 index 0000000..dbfc59f --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java @@ -0,0 +1,18 @@ +package com.syjiaer.clinic.server.mapper.charge; + +import com.syjiaer.clinic.server.entity.charge.ChargeItemList; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + *

+ * 收费服务详情 Mapper 接口 + *

+ * + * @author NiuZiYuan + * @since 2025-04-24 + */ +public interface ChargeItemListMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeServiceListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeServiceListMapper.java deleted file mode 100644 index a585d21..0000000 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeServiceListMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.syjiaer.clinic.server.mapper.charge; - -import com.syjiaer.clinic.server.entity.charge.ChargeServiceList; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - - -/** - *

- * Mapper 接口 - *

- * - * @author NiuZiYuan - * @since 2025-04-22 - */ -public interface ChargeServiceListMapper extends BaseMapper { - -} - diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java new file mode 100644 index 0000000..a563d28 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java @@ -0,0 +1,20 @@ +package com.syjiaer.clinic.server.mapper.diagnosis; + +import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author NiuZiYuan + * @since 2025-04-24 + */ +public interface DiagnosisMapper extends BaseMapper { + @Select("select * from diagnosis where code = #{code}") + Diagnosis selectByCode(String code); +} + diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java new file mode 100644 index 0000000..d31f0ac --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java @@ -0,0 +1,23 @@ +package com.syjiaer.clinic.server.mapper.diagnosis; + +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalGoodsList; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author NiuZiYuan + * @since 2025-04-23 + */ +public interface DiagnosisMedicalGoodsListMapper extends BaseMapper { + + @Select("select * from diagnosis_medical_goods_list where diagnosis_code = #{code}") + List listByDiagnosisCode(String code); +} + diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java new file mode 100644 index 0000000..7c66247 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java @@ -0,0 +1,22 @@ +package com.syjiaer.clinic.server.mapper.diagnosis; + +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author NiuZiYuan + * @since 2025-04-23 + */ +public interface DiagnosisMedicalItemListMapper extends BaseMapper { + @Select("select * from diagnosis_medical_item_list where medical_record_id = #{medicalRecordId}") + List listByDiagnosisCode(String code); +} + diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalRecordMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalRecordMapper.java new file mode 100644 index 0000000..bcdbc7b --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalRecordMapper.java @@ -0,0 +1,20 @@ +package com.syjiaer.clinic.server.mapper.diagnosis; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; +import org.apache.ibatis.annotations.Select; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author NiuZiYuan + * @since 2025-04-17 + */ +public interface DiagnosisMedicalRecordMapper extends BaseMapper { + @Select("select * from diagnosis_medical_record where diagnosis_code = #{diagnosisCode}") + DiagnosisMedicalRecord selectByDiagnosisCode(String diagnosisCode); +} + diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalGoodsListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalGoodsListMapper.java deleted file mode 100644 index 3b799b3..0000000 --- a/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalGoodsListMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.syjiaer.clinic.server.mapper.medical; - -import com.syjiaer.clinic.server.entity.medical.MedicalGoodsList; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import lombok.Setter; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - - -/** - *

- * Mapper 接口 - *

- * - * @author NiuZiYuan - * @since 2025-04-23 - */ -public interface MedicalGoodsListMapper extends BaseMapper { - - @Select("select * from medical_goods_list where medical_record_id = #{medicalRecordId}") - List listByMedicalRecordId(Integer medicalRecordId); -} - diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalItemListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalItemListMapper.java deleted file mode 100644 index c2a3c25..0000000 --- a/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalItemListMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.syjiaer.clinic.server.mapper.medical; - -import com.syjiaer.clinic.server.entity.medical.MedicalItemList; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - - -/** - *

- * Mapper 接口 - *

- * - * @author NiuZiYuan - * @since 2025-04-23 - */ -public interface MedicalItemListMapper extends BaseMapper { - @Select("select * from medical_item_list where medical_record_id = #{medicalRecordId}") - List listByMedicalRecordId(Integer medicalRecordId); -} - diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalRecordMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalRecordMapper.java deleted file mode 100644 index ea56331..0000000 --- a/src/main/java/com/syjiaer/clinic/server/mapper/medical/MedicalRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.syjiaer.clinic.server.mapper.medical; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.syjiaer.clinic.server.entity.medical.MedicalRecord; - - -/** - *

- * Mapper 接口 - *

- * - * @author NiuZiYuan - * @since 2025-04-17 - */ -public interface MedicalRecordMapper extends BaseMapper { - -} - diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index 63e42c1..d57b5cb 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -9,34 +9,28 @@ import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.StringUtil; import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList; +import com.syjiaer.clinic.server.entity.charge.ChargeItemList; import com.syjiaer.clinic.server.entity.charge.ChargeOrder; -import com.syjiaer.clinic.server.entity.charge.ChargeServiceList; import com.syjiaer.clinic.server.entity.charge.dto.ChargeOrderDto; import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery; import com.syjiaer.clinic.server.entity.charge.vo.ChargeDetailVo; import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; import com.syjiaer.clinic.server.entity.goods.Goods; import com.syjiaer.clinic.server.entity.inventory.InventoryLog; -import com.syjiaer.clinic.server.entity.item.Item; import com.syjiaer.clinic.server.entity.manager.ManagerUser; -import com.syjiaer.clinic.server.entity.medical.MedicalRecord; -import com.syjiaer.clinic.server.entity.medical.dto.GoodsRetailDto; -import com.syjiaer.clinic.server.entity.medical.dto.MedicalRecordSaveDto; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; import com.syjiaer.clinic.server.entity.patient.PatientInfo; import com.syjiaer.clinic.server.entity.patient.PatientRegistration; import com.syjiaer.clinic.server.mapper.charge.ChargeGoodsListMapper; +import com.syjiaer.clinic.server.mapper.charge.ChargeItemListMapper; import com.syjiaer.clinic.server.mapper.charge.ChargeOrderMapper; -import com.syjiaer.clinic.server.mapper.charge.ChargeServiceListMapper; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; import com.syjiaer.clinic.server.mapper.inventory.InventoryLogMapper; -import com.syjiaer.clinic.server.mapper.medical.MedicalRecordMapper; +import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalRecordMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; -import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper; import com.syjiaer.clinic.server.mapper.patient.PatientInfoMapper; import com.syjiaer.clinic.server.service.BaseService; import com.syjiaer.clinic.server.service.inventory.InventoryService; -import com.syjiaer.clinic.server.service.patient.PatientInfoService; import com.syjiaer.clinic.server.service.patient.PatientRegistrationService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -50,14 +44,12 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import static com.syjiaer.clinic.server.common.enums.MedicalRecordDetailTypeEnum.goods; - @Service public class ChargeService extends BaseService { @Autowired private ChargeOrderMapper chargeOrderMapper; @Autowired - private ChargeServiceListMapper chargeServiceListMapper; + private ChargeItemListMapper chargeItemListMapper; @Autowired private ChargeGoodsListMapper chargeGoodsListMapper; @Autowired @@ -65,7 +57,7 @@ public class ChargeService extends BaseService { @Autowired private PatientInfoMapper patientInfoMapper; @Autowired - private MedicalRecordMapper medicalRecordMapper; + private DiagnosisMedicalRecordMapper diagnosisMedicalRecordMapper; @Autowired private OrganizationMemberMapper organizationMemberMapper; @Autowired @@ -84,7 +76,7 @@ public class ChargeService extends BaseService { ChargeOrder dbOrder = chargeOrderMapper.selectById(dto.getId()); if (dbOrder != null){ //清除已有的订单 - chargeServiceListMapper.delete(new QueryWrapper().eq("charge_order_code", dbOrder.getCode())); + chargeItemListMapper.delete(new QueryWrapper().eq("charge_order_code", dbOrder.getCode())); chargeGoodsListMapper.delete(new QueryWrapper().eq("charge_order_code", dbOrder.getCode())); chargeOrderMapper.deleteById(dbOrder.getId()); } @@ -95,9 +87,9 @@ public class ChargeService extends BaseService { LocalDateTime nowLocalDateTime = LocalDateTime.now(); BigDecimal preTotalPrice = BigDecimal.ZERO; BigDecimal totalPrice = BigDecimal.ZERO; - List chargeServiceLists = new ArrayList<>(); - for (ChargeServiceList service : dto.getServiceDetail()){ - ChargeServiceList itemList = new ChargeServiceList(); + List chargeServiceLists = new ArrayList<>(); + for (ChargeItemList service : dto.getServiceDetail()){ + ChargeItemList itemList = new ChargeItemList(); String fsn = StringUtil.getCode("FSN"); itemList.setChargeOrderCode(code); itemList.setServiceId(service.getId()); @@ -116,7 +108,7 @@ public class ChargeService extends BaseService { preTotalPrice = preTotalPrice.add(service.getUnitPrice()); totalPrice = totalPrice.add(service.getUnitPrice()); } - chargeServiceListMapper.insert(chargeServiceLists); + chargeItemListMapper.insert(chargeServiceLists); List chargeGoodsLists = new ArrayList<>(); for (ChargeGoodsListVo goods : dto.getGoodsDetail()){ @@ -156,7 +148,7 @@ public class ChargeService extends BaseService { chargeOrder.setStatus(RetailOrderStatusEnum.UNFINISHED.getCode()); chargeOrder.setPatientId(dto.getPatientInfo().getId()); chargeOrder.setSalePersonId(user.getId()); - chargeOrder.setMedicalRecordId(dto.getMedicalRecord().getId()); + chargeOrder.setMedicalRecordId(dto.getDiagnosisMedicalRecord().getId()); chargeOrderMapper.insert(chargeOrder); return chargeOrder; @@ -179,9 +171,9 @@ public class ChargeService extends BaseService { for (ChargeOrder chargeOrder : orderPage.getList()){ ChargeDetailVo detailVo = new ChargeDetailVo(); BeanUtils.copyProperties(chargeOrder, detailVo); - detailVo.setMedicalRecord(medicalRecordMapper.selectById(chargeOrder.getMedicalRecordId())); + detailVo.setDiagnosisMedicalRecord(diagnosisMedicalRecordMapper.selectById(chargeOrder.getMedicalRecordId())); detailVo.setPatientInfo(patientInfoMapper.selectById(chargeOrder.getPatientId())); - detailVo.setServiceDetail(chargeServiceListMapper.selectList(new QueryWrapper() + detailVo.setServiceDetail(chargeItemListMapper.selectList(new QueryWrapper() .eq("charge_order_code", chargeOrder.getCode()))); detailVo.setGoodsDetail(chargeGoodsListMapper.selectDetailByCode(chargeOrder.getCode())); @@ -194,27 +186,27 @@ public class ChargeService extends BaseService { return resultPage; } - @Transactional(rollbackFor = Exception.class) - public ChargeOrder updateOrCreate(ChargeOrderDto dto) { - //创建患者 - PatientInfo patientInfo = dto.getPatientInfo(); - if (patientInfo == null){ - throw new MessageException("患者信息不能为空"); - } - patientInfoMapper.insertOrUpdate(patientInfo); - if (dto.getMedicalRecord().getDockerId() == null || dto.getMedicalRecord().getDiagnosisDetail() == null){ - throw new MessageException("诊断信息和医生不能为空"); - } - //添加挂号信息 - OrganizationMember docker = organizationMemberMapper.selectById(dto.getMedicalRecord().getDockerId()); - PatientRegistration registration = patientRegistrationService.regisByDockerAndPatient(docker,patientInfo, (short) 1,1); - //todo 添加病例 - medicalRecordMapper.insertOrUpdate(dto.getMedicalRecord()); - - //添加订单 - return chargeService.save(dto); - - } +// @Transactional(rollbackFor = Exception.class) +// public ChargeOrder updateOrCreate(ChargeOrderDto dto) { +// //创建患者 +// PatientInfo patientInfo = dto.getPatientInfo(); +// if (patientInfo == null){ +// throw new MessageException("患者信息不能为空"); +// } +// patientInfoMapper.insertOrUpdate(patientInfo); +// if (dto.getDiagnosisMedicalRecord().getDockerId() == null || dto.getDiagnosisMedicalRecord().getDiagnosisDetail() == null){ +// throw new MessageException("诊断信息和医生不能为空"); +// } +// //添加挂号信息 +// OrganizationMember docker = organizationMemberMapper.selectById(dto.getDiagnosisMedicalRecord().getDockerId()); +// PatientRegistration registration = patientRegistrationService.regisByDockerAndPatient(docker,patientInfo, (short) 1,1); +// //todo 添加病例 +// diagnosisMedicalRecordMapper.insertOrUpdate(dto.getDiagnosisMedicalRecord()); +// +// //添加订单 +// return chargeService.save(dto); +// +// } public void completeOrder (Integer id,Integer payType){ ChargeOrder order = chargeOrderMapper.selectById(id); diff --git a/src/main/java/com/syjiaer/clinic/server/service/medical/MedicalRecordService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java similarity index 59% rename from src/main/java/com/syjiaer/clinic/server/service/medical/MedicalRecordService.java rename to src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java index a7a7ae2..dd9c4e9 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/medical/MedicalRecordService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java @@ -1,32 +1,33 @@ -package com.syjiaer.clinic.server.service.medical; +package com.syjiaer.clinic.server.service.diagnosis; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.syjiaer.clinic.server.common.api.input.IM2201; import com.syjiaer.clinic.server.common.api.input.IM2203A; import com.syjiaer.clinic.server.common.api.request.SocialRequest; import com.syjiaer.clinic.server.common.config.Config; -import com.syjiaer.clinic.server.common.enums.MedicalRecordDetailTypeEnum; import com.syjiaer.clinic.server.common.enums.RegistrationStatusEnum; import com.syjiaer.clinic.server.common.exception.MessageException; +import com.syjiaer.clinic.server.common.util.StringUtil; +import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; import com.syjiaer.clinic.server.entity.goods.Goods; import com.syjiaer.clinic.server.entity.item.Item; import com.syjiaer.clinic.server.entity.manager.ManagerUser; -import com.syjiaer.clinic.server.entity.medical.MedicalGoodsList; -import com.syjiaer.clinic.server.entity.medical.MedicalItemList; -import com.syjiaer.clinic.server.entity.medical.MedicalRecord; -import com.syjiaer.clinic.server.entity.medical.dto.GoodsRetailDto; -import com.syjiaer.clinic.server.entity.medical.dto.MedicalRecordSaveDto; -import com.syjiaer.clinic.server.entity.medical.dto.MedicalRecordVo; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalGoodsList; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; +import com.syjiaer.clinic.server.entity.diagnosis.dto.GoodsRetailDto; +import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordSaveDto; +import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordVo; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; import com.syjiaer.clinic.server.entity.organization.OrganizationSection; import com.syjiaer.clinic.server.entity.patient.PatientRegistration; +import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMapper; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; import com.syjiaer.clinic.server.mapper.item.ItemMapper; -import com.syjiaer.clinic.server.mapper.medical.MedicalGoodsListMapper; -import com.syjiaer.clinic.server.mapper.medical.MedicalItemListMapper; -import com.syjiaer.clinic.server.mapper.medical.MedicalRecordMapper; +import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalGoodsListMapper; +import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalItemListMapper; +import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalRecordMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper; import com.syjiaer.clinic.server.mapper.patient.PatientRegistrationMapper; @@ -45,11 +46,11 @@ import java.util.List; @Service public class MedicalRecordService extends BaseService { @Autowired - private MedicalRecordMapper medicalRecordMapper; + private DiagnosisMedicalRecordMapper diagnosisMedicalRecordMapper; @Autowired - private MedicalGoodsListMapper medicalGoodsListMapper; + private DiagnosisMedicalGoodsListMapper diagnosisMedicalGoodsListMapper; @Autowired - private MedicalItemListMapper medicalItemListMapper; + private DiagnosisMedicalItemListMapper diagnosisMedicalItemListMapper; @Autowired private OrganizationMemberMapper organizationMemberMapper; @Autowired @@ -66,7 +67,8 @@ public class MedicalRecordService extends BaseService { private Config config; @Autowired private SocialRequest socialRequest; - + @Autowired + private DiagnosisMapper diagnosisMapper; /* * 保存 * @param saveDto 病历信息 @@ -83,47 +85,57 @@ public class MedicalRecordService extends BaseService { updateRegis.setId(dbRegis.getId()); updateRegis.setStatus(RegistrationStatusEnum.complete.getType()); patientRegistrationMapper.updateById(updateRegis); + //诊断主表 + Diagnosis diagnosis = new Diagnosis(); + String code = StringUtil.getCode("ZD"); + BeanUtils.copyProperties(saveDto, Diagnosis.class); + if (diagnosis.getId() == null){ + diagnosis.setCode(code); + }else { + code = diagnosis.getCode(); + } + diagnosisMapper.insertOrUpdate(diagnosis); - + //病例表 ManagerUser managerUser = getManagerUser(); - MedicalRecord medicalRecord = new MedicalRecord(); - BeanUtils.copyProperties(saveDto, medicalRecord); - medicalRecord.setDockerId(managerUser.getId()); - medicalRecord.setDockerName(managerUser.getName()); - medicalRecordMapper.insertOrUpdate(medicalRecord); - Integer medicalRecordId = medicalRecord.getId(); - List itemLists = new ArrayList<>(); + DiagnosisMedicalRecord diagnosisMedicalRecord = new DiagnosisMedicalRecord(); + BeanUtils.copyProperties(saveDto.getDiagnosisMedicalRecord(), diagnosisMedicalRecord); + diagnosisMedicalRecordMapper.insertOrUpdate(diagnosisMedicalRecord); + + //服务项目表 + Integer medicalRecordId = diagnosisMedicalRecord.getId(); + List itemLists = new ArrayList<>(); for (Item item : saveDto.getItemList()) { Item dbItem = itemMapper.selectById(item.getId()); - MedicalItemList itemDetail = new MedicalItemList(); + DiagnosisMedicalItemList itemDetail = new DiagnosisMedicalItemList(); + itemDetail.setDiagnosisCode(code); itemDetail.setItemId(item.getId()); itemDetail.setName(dbItem.getItemName()); itemDetail.setSocialCode(dbItem.getItemSocialCode()); itemDetail.setUnit(dbItem.getUnit()); itemDetail.setUnitPrice(dbItem.getUnitPrice()); - itemDetail.setMedicalRecordId(medicalRecordId); itemDetail.setNumber(1); itemLists.add(itemDetail); } - medicalItemListMapper.insert(itemLists); + diagnosisMedicalItemListMapper.insert(itemLists); - List goodsLists = new ArrayList<>(); + List goodsLists = new ArrayList<>(); for (GoodsRetailDto goodsRetailDto : saveDto.getGoodsList()) { Goods dbGoods = goodsMapper.selectById(goodsRetailDto.getId()); - MedicalGoodsList goodsDetail = new MedicalGoodsList(); + DiagnosisMedicalGoodsList goodsDetail = new DiagnosisMedicalGoodsList(); goodsDetail.setGoodsId(goodsRetailDto.getId()); + goodsDetail.setDiagnosisCode(code); goodsDetail.setName(dbGoods.getName()); goodsDetail.setSocialCode(dbGoods.getHilistCode()); goodsDetail.setUnit(goodsRetailDto.getSelectedUnit()); goodsDetail.setUnitPrice(goodsRetailDto.getSelectedPrice()); - goodsDetail.setMedicalRecordId(medicalRecordId); goodsDetail.setNumber(goodsRetailDto.getSelectNum()); goodsLists.add(goodsDetail); } - medicalGoodsListMapper.insert(goodsLists); + diagnosisMedicalGoodsListMapper.insert(goodsLists); //添加收费单 // saveDto.setId(medicalRecordId); @@ -142,22 +154,22 @@ public class MedicalRecordService extends BaseService { */ public List listByPatientId(Integer patientId) { - QueryWrapper query = new QueryWrapper<>(); + QueryWrapper query = new QueryWrapper<>(); query.eq("patient_id", patientId); query.orderByDesc("create_datetime"); query.last("limit 10"); - List mrList = medicalRecordMapper.selectList(query); + List mrList = diagnosisMedicalRecordMapper.selectList(query); List mrvList = new ArrayList<>(); - for (MedicalRecord medicalRecord : mrList) { - QueryWrapper severQuery = new QueryWrapper<>(); + for (DiagnosisMedicalRecord diagnosisMedicalRecord : mrList) { + QueryWrapper severQuery = new QueryWrapper<>(); MedicalRecordVo vo = new MedicalRecordVo(); - BeanUtils.copyProperties(medicalRecord, vo); - severQuery.eq("medical_record_id", medicalRecord.getId()); - List serverDetail = medicalItemListMapper.selectList(severQuery); + BeanUtils.copyProperties(diagnosisMedicalRecord, vo); + severQuery.eq("medical_record_id", diagnosisMedicalRecord.getId()); + List serverDetail = diagnosisMedicalItemListMapper.selectList(severQuery); vo.setServiceDetail(serverDetail); - QueryWrapper goodsQuery = new QueryWrapper<>(); - severQuery.eq("medical_record_id", medicalRecord.getId()); - List goodsDetail = medicalGoodsListMapper.selectList(goodsQuery); + QueryWrapper goodsQuery = new QueryWrapper<>(); + severQuery.eq("medical_record_id", diagnosisMedicalRecord.getId()); + List goodsDetail = diagnosisMedicalGoodsListMapper.selectList(goodsQuery); vo.setGoodsDetail(goodsDetail); mrvList.add(vo); } @@ -170,36 +182,41 @@ public class MedicalRecordService extends BaseService { * @return */ public MedicalRecordVo getDetailByRegisId(Integer regisId) { - QueryWrapper query = new QueryWrapper<>(); + QueryWrapper query = new QueryWrapper<>(); query.eq("registration_id", regisId); - MedicalRecord mr = medicalRecordMapper.selectOne(query); - QueryWrapper severQuery = new QueryWrapper<>(); + DiagnosisMedicalRecord mr = diagnosisMedicalRecordMapper.selectOne(query); + QueryWrapper severQuery = new QueryWrapper<>(); MedicalRecordVo vo = new MedicalRecordVo(); BeanUtils.copyProperties(mr, vo); severQuery.eq("medical_record_id", mr.getId()); - List serverDetail = medicalItemListMapper.selectList(severQuery); + List serverDetail = diagnosisMedicalItemListMapper.selectList(severQuery); vo.setServiceDetail(serverDetail); - QueryWrapper goodsQuery = new QueryWrapper<>(); + QueryWrapper goodsQuery = new QueryWrapper<>(); goodsQuery.eq("medical_record_id", mr.getId()); - List goodsDetail = medicalGoodsListMapper.selectList(goodsQuery); + List goodsDetail = diagnosisMedicalGoodsListMapper.selectList(goodsQuery); vo.setGoodsDetail(goodsDetail); return vo; } - public void uploadDiagnosis(Integer medicalRecordId){ - MedicalRecord medicalRecord = medicalRecordMapper.selectById(medicalRecordId); - if (medicalRecord == null){ + public void uploadDiagnosis(String diagnosisCode){ + Diagnosis diagnosis = diagnosisMapper.selectByCode(diagnosisCode); + if (diagnosis == null){ + throw new MessageException("诊断不存在"); + } + + DiagnosisMedicalRecord diagnosisMedicalRecord = diagnosisMedicalRecordMapper.selectByDiagnosisCode(diagnosisCode); + if (diagnosisMedicalRecord == null){ throw new MessageException("病历不存在"); } - PatientRegistration patientRegistration = patientRegistrationMapper.selectById(medicalRecord.getRegistrationId()); + PatientRegistration patientRegistration = patientRegistrationMapper.selectById(diagnosis.getRegistrationId()); if (patientRegistration == null){ throw new MessageException("挂号单不存在"); } OrganizationSection section = organizationSectionMapper.selectById(patientRegistration.getOrganizationSectionId()); OrganizationMember doctor = organizationMemberMapper.selectById(patientRegistration.getOrganizationDoctorId()); - List goodsLists = medicalGoodsListMapper.listByMedicalRecordId(medicalRecordId); - List itemLists = medicalItemListMapper.listByMedicalRecordId(medicalRecordId); + List goodsLists = diagnosisMedicalGoodsListMapper.listByDiagnosisCode(diagnosisCode); + List itemLists = diagnosisMedicalItemListMapper.listByDiagnosisCode(diagnosisCode); LocalDateTime curTime = LocalDateTime.now(); IM2203A im2203A = new IM2203A(); @@ -209,14 +226,14 @@ public class MedicalRecordService extends BaseService { mdtrtinfo.setMed_type(config.get("social","medType")); mdtrtinfo.setBegntime(curTime); im2203A.setMdtrtinfo(mdtrtinfo); - JSONArray jsonArray = JSONArray.parseArray(medicalRecord.getDiagnosisDetail()); + JSONArray jsonArray = JSONArray.parseArray(diagnosisMedicalRecord.getDiagnosisDetail()); int i =0; List diagList = new ArrayList<>(); for (Object object : jsonArray){ i++; JSONObject json = (JSONObject) object; IM2203A.Diseinfo diag = new IM2203A.Diseinfo(); - diag.setDiag_type(medicalRecord.getDiagType()); + diag.setDiag_type(diagnosisMedicalRecord.getDiagType()); diag.setDiag_srt_no(BigDecimal.valueOf(i)); diag.setDiag_code(json.getString("code")); diag.setDiag_name(json.getString("name")); diff --git a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java index 5d07f2f..8d197e0 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java @@ -358,4 +358,10 @@ public class GoodsService { } return goodsMapper.selectById(goodsId); } + + public List list(QueryWrapper goodsQuery) { + return goodsMapper.selectList(goodsQuery); + } + + } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java index ebb723c..3ae72e8 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDiagnoseService.java @@ -7,6 +7,7 @@ import com.syjiaer.clinic.server.common.util.DictoryUtil; import com.syjiaer.clinic.server.common.util.HttpUtil; import com.syjiaer.clinic.server.entity.social.SocialChronicDisease; import com.syjiaer.clinic.server.entity.social.SocialDiagnose; +import com.syjiaer.clinic.server.entity.social.SocialDirectory; import com.syjiaer.clinic.server.entity.social.SocialItem; import com.syjiaer.clinic.server.mapper.social.SocialDiagnoseMapper; import com.syjiaer.clinic.server.mapper.social.SocialItemMapper; @@ -56,4 +57,19 @@ public class SocialDiagnoseService { socialDirectoryVersionService.setSocialDirectoryVersion(type, version_name, list.get(0).getVersionName(), list.size()); return list.get(0).getVersionName(); } + + /** + * 搜索诊断列表 + * + * @param keyword + * @return + */ + public List getDiagnosis(String keyword) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (keyword != null && !keyword.isEmpty()) { + queryWrapper.and(wrapper -> wrapper.like("name", keyword).or().like("code", keyword)); + } + queryWrapper.last("limit 20"); + return socialDiagnoseMapper.selectList(queryWrapper); + } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java index b21c33e..4a37501 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialDirectoryService.java @@ -395,20 +395,5 @@ public class SocialDirectoryService extends BaseService { } - /** - * 搜索诊断列表 - * - * @param keyword - * @return - */ - public List getDiagnosis(String keyword) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("type", 1307); - if (keyword != null && !keyword.isEmpty()) { - queryWrapper.and(wrapper -> wrapper.like("name", keyword).or().like("code", keyword).or().like("keyword", keyword)); - } - queryWrapper.select("code", "name", "data"); - queryWrapper.last("limit 20"); - return socialDirectoryMapper.selectList(queryWrapper); - } + } diff --git a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java new file mode 100644 index 0000000..3137391 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java @@ -0,0 +1,19 @@ +package com.syjiaer.clinic.server.service.statistics; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.service.BaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +public class StatisticsService extends BaseService { + + + +} diff --git a/src/main/resources/xml/ChargeServiceListMapper.xml b/src/main/resources/xml/ChargeItemListMapper.xml similarity index 91% rename from src/main/resources/xml/ChargeServiceListMapper.xml rename to src/main/resources/xml/ChargeItemListMapper.xml index f328963..b6343a5 100644 --- a/src/main/resources/xml/ChargeServiceListMapper.xml +++ b/src/main/resources/xml/ChargeItemListMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/xml/MedicalRecordMapper.xml b/src/main/resources/xml/DiagnosisMapper.xml similarity index 65% rename from src/main/resources/xml/MedicalRecordMapper.xml rename to src/main/resources/xml/DiagnosisMapper.xml index a0afe1f..23ed75b 100644 --- a/src/main/resources/xml/MedicalRecordMapper.xml +++ b/src/main/resources/xml/DiagnosisMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/xml/DiagnosisMedicalGoodsListMapper.xml b/src/main/resources/xml/DiagnosisMedicalGoodsListMapper.xml new file mode 100644 index 0000000..74c75a6 --- /dev/null +++ b/src/main/resources/xml/DiagnosisMedicalGoodsListMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/resources/xml/MedicalGoodsListMapper.xml b/src/main/resources/xml/DiagnosisMedicalItemListMapper.xml similarity index 62% rename from src/main/resources/xml/MedicalGoodsListMapper.xml rename to src/main/resources/xml/DiagnosisMedicalItemListMapper.xml index 8a49a36..ae8067e 100644 --- a/src/main/resources/xml/MedicalGoodsListMapper.xml +++ b/src/main/resources/xml/DiagnosisMedicalItemListMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/xml/MedicalItemListMapper.xml b/src/main/resources/xml/DiagnosisMedicalRecordMapper.xml similarity index 62% rename from src/main/resources/xml/MedicalItemListMapper.xml rename to src/main/resources/xml/DiagnosisMedicalRecordMapper.xml index c434a38..b030315 100644 --- a/src/main/resources/xml/MedicalItemListMapper.xml +++ b/src/main/resources/xml/DiagnosisMedicalRecordMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java index 52af46d..c8fcfdc 100644 --- a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java +++ b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java @@ -1,16 +1,11 @@ package com.syjiaer.clinic.server; -import com.syjiaer.clinic.server.common.api.input.IM2203A; -import com.syjiaer.clinic.server.service.medical.MedicalRecordService; +import com.syjiaer.clinic.server.service.diagnosis.MedicalRecordService; import com.syjiaer.clinic.server.service.social.SocialDiagnoseService; -import com.syjiaer.clinic.server.service.social.SocialDirectoryService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import java.util.List; -import java.util.Map; - @SpringBootTest class ServerApplicationTests {