From b0dbcc8d1cd55ac1f1dd29fddd5b55d55be2f56a Mon Sep 17 00:00:00 2001 From: NiuZiYuan Date: Tue, 27 May 2025 10:49:30 +0800 Subject: [PATCH] dev --- .../server/common/constants/Constants.java | 5 - .../controller/charge/ChargeController.java | 211 ------------------ .../charge/ChargeLogController.java | 78 +++++++ .../charge/ChargeOrderController.java | 113 ++++++++++ .../controller/charge/SocialController.java | 59 +++++ .../common/CommonConfigController.java | 17 +- .../common/CommonLogController.java | 4 +- .../controller/common/FileController.java | 2 +- .../common/ManagerUserController.java | 2 +- .../controller/common/SignController.java | 2 +- .../diagnosis/DiagnosisController.java | 27 ++- .../controller/goods/GoodsCateController.java | 7 +- .../controller/goods/GoodsController.java | 6 +- .../inventory/InventoryApplyController.java | 4 +- .../inventory/InventoryCheckController.java | 4 +- .../inventory/InventoryController.java | 24 +- .../InventoryPurchaseController.java | 16 +- .../controller/item/ItemController.java | 41 +++- .../controller/item/ItemGroupController.java | 54 ----- .../OrganizationMemberController.java | 6 +- .../OrganizationSectionController.java | 4 +- .../controller/patient/PatientController.java | 2 +- .../PatientIntegralController.java} | 6 +- .../PatientLevelConfigController.java} | 6 +- .../patient/RegistrationController.java | 18 +- .../SocialReconciliationController.java | 24 +- .../social/SocialUploadController.java | 28 +-- .../statistics/StatisticsController.java | 30 ++- .../server/controller/vip/VipController.java | 76 ------- ...alRecordSaveDto.java => DiagnosisDto.java} | 2 +- .../service/diagnosis/DiagnosisService.java | 4 +- .../social/SocialReconciliationService.java | 6 +- 32 files changed, 399 insertions(+), 489 deletions(-) delete mode 100644 src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java create mode 100644 src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeLogController.java create mode 100644 src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeOrderController.java create mode 100644 src/main/java/com/syjiaer/clinic/server/controller/charge/SocialController.java delete mode 100644 src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java rename src/main/java/com/syjiaer/clinic/server/controller/{vip/VipIntegralController.java => patient/PatientIntegralController.java} (90%) rename src/main/java/com/syjiaer/clinic/server/controller/{vip/VipLevelConfigController.java => patient/PatientLevelConfigController.java} (93%) delete mode 100644 src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java rename src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/{MedicalRecordSaveDto.java => DiagnosisDto.java} (95%) diff --git a/src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java b/src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java index bca9c2d..5af21ba 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java +++ b/src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java @@ -2,13 +2,8 @@ package com.syjiaer.clinic.server.common.constants; public class Constants { public static final String IPurchaseCodePrefix = "IP"; - public static final String IInitCodePrefix = "II"; - public static final String RetailFeedetlSn = "FFLS"; public static final Integer DetailPageSize = 100; - public static final String InitInventory = "初始化库存"; public static final String PurchaseInventory = "采购入库"; - public static final String Sold = "售出"; public static final String Apply = "领用"; - public static final String Social = "医保"; } 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 deleted file mode 100644 index 47b80d8..0000000 --- a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.syjiaer.clinic.server.controller.charge; - -import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; -import com.syjiaer.clinic.server.common.api.output.OM2206A; -import com.syjiaer.clinic.server.common.api.output.OM2207A; -import com.syjiaer.clinic.server.common.util.DateUtil; -import com.syjiaer.clinic.server.common.vo.Page; -import com.syjiaer.clinic.server.common.vo.Result; -import com.syjiaer.clinic.server.controller.BaseController; -import com.syjiaer.clinic.server.entity.charge.ChargeLog; -import com.syjiaer.clinic.server.entity.charge.ChargeOrder; -import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery; -import com.syjiaer.clinic.server.entity.charge.dto.ChargeSaveDto; -import com.syjiaer.clinic.server.entity.charge.vo.ChargeDetailVo; -import com.syjiaer.clinic.server.entity.charge.vo.ChargeOrderPrintVo; -import com.syjiaer.clinic.server.service.charge.ChargeService; -import com.syjiaer.clinic.server.service.charge.vo.RetailOrderDailyChargingReportVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDateTime; -import java.util.List; - -@RestController -@RequestMapping("/charge") -public class ChargeController extends BaseController { - @Autowired - private ChargeService chargeService; - - /** - * 保存收费订单 - * @return - */ - @RecordCommonLog(operation = "生成订单") - @RequestMapping("/save") - public Result save() { - ChargeSaveDto dto = parmsUtil.getObject("data", ChargeSaveDto.class); - ChargeOrder chargeOrder = chargeService.save(dto); - return success(chargeOrder.getCode()); - } - /* - 查询list 带详情 - */ - @RequestMapping("/listDetail") - public Result> listDetail() { - ChargeQuery chargeQuery = parmsUtil.getObject("query", ChargeQuery.class); - return success(chargeService.pageDetailList(chargeQuery)); - } - - /** - * 查询list 只有订单信息 - * @return - */ - @RequestMapping("/list") - public Result> list() { - ChargeQuery chargeQuery = parmsUtil.getObject("query", ChargeQuery.class); - return success(chargeService.pageList(chargeQuery)); - } - - /** - * 完成订单 - * @return - */ - @RecordCommonLog(operation = "完成订单") - @RequestMapping("/completeOrder") - public Result completeOrder() { - Integer id = parmsUtil.getInteger("id"); - Integer payType = parmsUtil.getInteger("payType"); - chargeService.completeOrder(id,payType); - return success(); - } - /** - * 根据诊断code和状态获取诊断信息 - */ - @RequestMapping("/getOrderByDiagnosisCode") - public Result getOrderByDiagnosisCode() { - String diagnosisCode = parmsUtil.getString("diagnosisCode","诊断code不能为空"); - ChargeOrder chargeOrder = chargeService.getOrderByDiagnosisCode(diagnosisCode); - - return success(chargeOrder); - } - - /** - * 根据code查询订单详情 - * @return - */ - @RequestMapping("/getByCode") - public Result getByCode() { - String code = parmsUtil.getString("code"); - return success(chargeService.getDetail(code)); - } - - - /** - * 医保上传支付明细 - * @return - */ - @RecordCommonLog(operation = "上传医保费用明细") - @RequestMapping("/uploadCostDetails") - public Result uploadCostDetails() { - String changeOrderCode = parmsUtil.getString("changeOrderCode"); - chargeService.uploadCostDetails(changeOrderCode); - return success(); - } - - /** - * 医保预支付 - * @return - */ - @RequestMapping("/socialPrePay") - public Result socialPrePay(){ - String changeOrderCode = parmsUtil.getString("changeOrderCode"); - String mdtrtCertType = parmsUtil.getString("mdtrtCertType"); - String mdtrtCertNO = parmsUtil.getString("mdtrtCertNo"); - String insutype = parmsUtil.getString("insutype"); - return success(chargeService.socialPrePay(changeOrderCode,mdtrtCertType,mdtrtCertNO,insutype)); - } - - /** - * 医保真实支付 - * @return - */ - @RecordCommonLog(operation = "医保收费") - @RequestMapping("/socialRealPay") - public Result socialRealPay(){ - String changeOrderCode = parmsUtil.getString("changeOrderCode"); - String mdtrtCertType = parmsUtil.getString("mdtrtCertType"); - String mdtrtCertNO = parmsUtil.getString("mdtrtCertNo"); - String insutype = parmsUtil.getString("insutype"); - Integer payType = parmsUtil.getInteger("payType"); - String curBalc = parmsUtil.getString("curBalc"); - OM2207A om2207A = chargeService.socialRealPay(changeOrderCode,mdtrtCertType,mdtrtCertNO,insutype); - chargeService.recordSocialInfo(om2207A, chargeService.getByCode(changeOrderCode), payType,curBalc); - return success( ); - } - /** - * 订单退款 - */ - @RecordCommonLog(operation = "订单退款") - @RequestMapping("/refund") - public Result refund() { - String changeOrderCode = parmsUtil.getString("changeOrderCode","订单号为空"); - chargeService.refund(changeOrderCode); - return success(); - } - - - /** - * 每日收费报表 - */ - @RequestMapping("/dailyChargingReport") - public Result> dailyChargingReport() { - String startDateStr = parmsUtil.getString("startDate", "请选择开始时间"); - String endDateStr = parmsUtil.getString("endDate", "请选择结束时间"); - LocalDateTime startDateTime = DateUtil.getDateTime(startDateStr); - LocalDateTime endDateTime = DateUtil.getDateTime(endDateStr); - endDateTime = endDateTime.plusDays(1); - - return success(chargeService.dailyChargingReport(startDateTime, endDateTime)); - } - - - /** - * 病人付费记录 - * @return - */ - @RequestMapping("/getListByPatientId") - public Result> getListByPatientId() { - Integer patientId = parmsUtil.getInteger("patientId"); - return success(chargeService.getListByPatientId(patientId)); - } - - - /** - * 收费记录 - * @return - */ - @RequestMapping("/getChargeRecord") - public Result> getChargeRecord() { - return success(chargeService.getChargeRecordPageList()); - } - - - /** - * 获取收退费记录 - */ - @RequestMapping("listChargeLog") - public Result> getChargeList(){ - String begin = parmsUtil.getString("beginTime","开始时间为空"); - String end= parmsUtil.getString("endTime","结束时间为空"); - Integer userId = parmsUtil.getInteger("userId"); - LocalDateTime beginTime = DateUtil.getDateTime(begin); - LocalDateTime endTime = DateUtil.getDateTime(end); - List chargeLogs = chargeService.listChargeLog(beginTime,endTime,userId); - - - return success(chargeLogs); - } - - /** - * 根据订单号获取订单详情 小票打印用 - */ - @RequestMapping("getPrintInfoByCode") - public Result getDetailByCode() { - String code = parmsUtil.getString("code", "订单号不能为空"); - return success(chargeService.getPrintInfoByCode(code)); - } - - -} diff --git a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeLogController.java b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeLogController.java new file mode 100644 index 0000000..9492dd7 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeLogController.java @@ -0,0 +1,78 @@ +package com.syjiaer.clinic.server.controller.charge; + +import com.syjiaer.clinic.server.common.util.DateUtil; +import com.syjiaer.clinic.server.common.vo.Page; +import com.syjiaer.clinic.server.common.vo.Result; +import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.charge.ChargeLog; +import com.syjiaer.clinic.server.entity.charge.ChargeOrder; +import com.syjiaer.clinic.server.service.charge.ChargeService; +import com.syjiaer.clinic.server.service.charge.vo.RetailOrderDailyChargingReportVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalDateTime; +import java.util.List; + +@RestController +@RequestMapping("/charge/log") +public class ChargeLogController extends BaseController { + @Autowired + private ChargeService chargeService; + + /** + * 每日收费报表 + */ + @RequestMapping("/reportWithDays") + public Result> dailyChargingReport() { + String startDateStr = parmsUtil.getString("startDate", "请选择开始时间"); + String endDateStr = parmsUtil.getString("endDate", "请选择结束时间"); + LocalDateTime startDateTime = DateUtil.getDateTime(startDateStr); + LocalDateTime endDateTime = DateUtil.getDateTime(endDateStr); + endDateTime = endDateTime.plusDays(1); + + return success(chargeService.dailyChargingReport(startDateTime, endDateTime)); + } + + + /** + * 病人付费记录 + * @return + */ + @RequestMapping("/listByPatientId") + public Result> listByPatientId() { + Integer patientId = parmsUtil.getInteger("patientId"); + return success(chargeService.getListByPatientId(patientId)); + } + + + /** + * 收费记录 + * @return + */ + @ApiOperation("收费记录") + @RequestMapping("/list") + public Result> list() { + return success(chargeService.getChargeRecordPageList()); + } + + + /** + * 获取收退费记录 + */ + @RequestMapping("listByDatetime") + public Result> listByDatetime(){ + String begin = parmsUtil.getString("beginTime","开始时间为空"); + String end= parmsUtil.getString("endTime","结束时间为空"); + Integer userId = parmsUtil.getInteger("userId"); + LocalDateTime beginTime = DateUtil.getDateTime(begin); + LocalDateTime endTime = DateUtil.getDateTime(end); + List chargeLogs = chargeService.listChargeLog(beginTime,endTime,userId); + + + return success(chargeLogs); + } + +} diff --git a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeOrderController.java b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeOrderController.java new file mode 100644 index 0000000..1e7cb7c --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeOrderController.java @@ -0,0 +1,113 @@ +package com.syjiaer.clinic.server.controller.charge; + +import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; +import com.syjiaer.clinic.server.common.api.output.OM2206A; +import com.syjiaer.clinic.server.common.api.output.OM2207A; +import com.syjiaer.clinic.server.common.util.DateUtil; +import com.syjiaer.clinic.server.common.vo.Page; +import com.syjiaer.clinic.server.common.vo.Result; +import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.charge.ChargeLog; +import com.syjiaer.clinic.server.entity.charge.ChargeOrder; +import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery; +import com.syjiaer.clinic.server.entity.charge.dto.ChargeSaveDto; +import com.syjiaer.clinic.server.entity.charge.vo.ChargeDetailVo; +import com.syjiaer.clinic.server.entity.charge.vo.ChargeOrderPrintVo; +import com.syjiaer.clinic.server.service.charge.ChargeService; +import com.syjiaer.clinic.server.service.charge.vo.RetailOrderDailyChargingReportVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalDateTime; +import java.util.List; + +@RestController +@RequestMapping("/charge/order") +public class ChargeOrderController extends BaseController { + @Autowired + private ChargeService chargeService; + /** + * 保存收费订单 + * @return + */ + @RecordCommonLog(operation = "生成订单") + @RequestMapping("/save") + public Result save() { + ChargeSaveDto dto = parmsUtil.getObject("data", ChargeSaveDto.class); + ChargeOrder chargeOrder = chargeService.save(dto); + return success(chargeOrder.getCode()); + } + /** + * 根据诊断code和状态获取诊断信息 + */ + @RequestMapping("/getByDiagnosisCode") + public Result getByDiagnosisCode() { + String diagnosisCode = parmsUtil.getString("diagnosisCode","诊断code不能为空"); + ChargeOrder chargeOrder = chargeService.getOrderByDiagnosisCode(diagnosisCode); + + return success(chargeOrder); + } + + /** + * 根据code查询订单详情 + * @return + */ + @RequestMapping("/getByCode") + public Result getByCode() { + String code = parmsUtil.getString("code"); + return success(chargeService.getDetail(code)); + } + + /** + * 根据订单号获取订单详情 小票打印用 + */ + @RequestMapping("getPrintInfoByCode") + public Result getPrintInfoByCode() { + String code = parmsUtil.getString("code", "订单号不能为空"); + return success(chargeService.getPrintInfoByCode(code)); + } + /** + * 查询list 只有订单信息 + * @return + */ + @RequestMapping("/list") + public Result> list() { + ChargeQuery chargeQuery = parmsUtil.getObject("query", ChargeQuery.class); + return success(chargeService.pageList(chargeQuery)); + } + + /* + 查询list 带详情 + */ + @RequestMapping("/listWithDetail") + public Result> listWithDetail() { + ChargeQuery chargeQuery = parmsUtil.getObject("query", ChargeQuery.class); + return success(chargeService.pageDetailList(chargeQuery)); + } + /** + * 完成订单 + * @return + */ + @RecordCommonLog(operation = "完成订单") + @RequestMapping("/complete") + public Result complete() { + Integer id = parmsUtil.getInteger("id"); + Integer payType = parmsUtil.getInteger("payType"); + chargeService.completeOrder(id,payType); + return success(); + } + + + + /** + * 订单退款 + */ + @RecordCommonLog(operation = "订单退款") + @RequestMapping("/refund") + public Result refund() { + String changeOrderCode = parmsUtil.getString("changeOrderCode","订单号为空"); + chargeService.refund(changeOrderCode); + return success(); + } +} diff --git a/src/main/java/com/syjiaer/clinic/server/controller/charge/SocialController.java b/src/main/java/com/syjiaer/clinic/server/controller/charge/SocialController.java new file mode 100644 index 0000000..e7d7f58 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/controller/charge/SocialController.java @@ -0,0 +1,59 @@ +package com.syjiaer.clinic.server.controller.charge; + +import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; +import com.syjiaer.clinic.server.common.api.output.OM2206A; +import com.syjiaer.clinic.server.common.api.output.OM2207A; +import com.syjiaer.clinic.server.common.vo.Result; +import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.service.charge.ChargeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController() +@RequestMapping("charge/social") +public class SocialController extends BaseController { + @Autowired + private ChargeService chargeService; + /** + * 医保预支付 + * @return + */ + @RequestMapping("/prePay") + public Result prePay(){ + String changeOrderCode = parmsUtil.getString("changeOrderCode"); + String mdtrtCertType = parmsUtil.getString("mdtrtCertType"); + String mdtrtCertNO = parmsUtil.getString("mdtrtCertNo"); + String insutype = parmsUtil.getString("insutype"); + return success(chargeService.socialPrePay(changeOrderCode,mdtrtCertType,mdtrtCertNO,insutype)); + } + + /** + * 医保真实支付 + * @return + */ + @RecordCommonLog(operation = "医保收费") + @RequestMapping("/realPay") + public Result realPay(){ + String changeOrderCode = parmsUtil.getString("changeOrderCode"); + String mdtrtCertType = parmsUtil.getString("mdtrtCertType"); + String mdtrtCertNO = parmsUtil.getString("mdtrtCertNo"); + String insutype = parmsUtil.getString("insutype"); + Integer payType = parmsUtil.getInteger("payType"); + String curBalc = parmsUtil.getString("curBalc"); + OM2207A om2207A = chargeService.socialRealPay(changeOrderCode,mdtrtCertType,mdtrtCertNO,insutype); + chargeService.recordSocialInfo(om2207A, chargeService.getByCode(changeOrderCode), payType,curBalc); + return success( ); + } + /** + * 医保上传支付明细 + * @return + */ + @RecordCommonLog(operation = "上传医保费用明细") + @RequestMapping("/upload") + public Result upload() { + String changeOrderCode = parmsUtil.getString("changeOrderCode"); + chargeService.uploadCostDetails(changeOrderCode); + return success(); + } +} diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java index efa7ddf..ed42fb7 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java @@ -30,16 +30,14 @@ public class CommonConfigController extends BaseController { private CommonConfigService commonConfigService; @Autowired private Config config; - @Autowired - private FileService fileService; @RequestMapping("list") public Result list() { return success(commonConfigService.list()); } - @RequestMapping("getall") - public Result getall() { + @RequestMapping("getAll") + public Result getAll() { List list = commonConfigService.list(); Map map = new HashMap<>(); for (CommonConfig commonConfig : list) { @@ -74,7 +72,7 @@ public class CommonConfigController extends BaseController { */ @RecordCommonLog(operation = "修改打印机配置") @RequestMapping("savePrinter") - public Result updatePrinter() { + public Result savePrinter() { Map map = parmsUtil.getMap("printConfig"); if (map == null) { return error("打印机配置不能为空"); @@ -94,14 +92,5 @@ public class CommonConfigController extends BaseController { map.put("pageType", config.get("print", "pageType")); return success(map); } - /** - * 上传诊所图片 - */ -// @RequestMapping("uploadClinicImage") -// public Result uploadClinicImage(@RequestParam("file") MultipartFile file) { -// return success(commonConfigService.uploadClinicImage(file)); -// } - - } diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java index 259efa3..e9ba4e5 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java @@ -17,8 +17,8 @@ public class CommonLogController extends BaseController { private CommonLogService commonLogService; - @RequestMapping("page") - public Result> page() { + @RequestMapping("list") + public Result> list() { CommonLogQuery query = parmsUtil.getObject("query", CommonLogQuery.class); return success(commonLogService.pageList(query)); } diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java index 323f00c..8bca740 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java @@ -30,7 +30,7 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("file") +@RequestMapping("common/file") public class FileController extends BaseController { @Autowired private FileService fileService; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java index e77ff18..cdbdd9f 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java @@ -22,7 +22,7 @@ import java.util.Map; * @since 2025-02-28 */ @RestController -@RequestMapping("/manager/user") +@RequestMapping("/common/ManagerUser") public class ManagerUserController extends BaseController { @Autowired private ManagerUserService managerUserService; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java index d30963d..65b9f54 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/sign") +@RequestMapping("/common/sign") public class SignController extends BaseController { @Autowired private SignService signService; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java index 74305b8..44d7ac4 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java @@ -5,7 +5,7 @@ import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.controller.BaseController; import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery; -import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordSaveDto; +import com.syjiaer.clinic.server.entity.diagnosis.dto.DiagnosisDto; import com.syjiaer.clinic.server.entity.diagnosis.vo.ChargeQueueVo; import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalHistoryVo; import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalRecordVo; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController -@RequestMapping("/medical/record") +@RequestMapping("/diagnosis/base") public class DiagnosisController extends BaseController { @Autowired @@ -32,13 +32,13 @@ public class DiagnosisController extends BaseController { @Autowired private CheckService checkService; /** - * 保存病历 + * 保存诊断 * @return */ - @RecordCommonLog(operation = "完成诊断，保存病历信息") + @RecordCommonLog(operation = "完成诊断。") @RequestMapping("/save") public Result save() { - MedicalRecordSaveDto saveDto = parmsUtil.getObject("data", MedicalRecordSaveDto.class); + DiagnosisDto saveDto = parmsUtil.getObject("data", DiagnosisDto.class); diagnosisService.save(saveDto); //调用事前检查 @@ -63,30 +63,33 @@ public class DiagnosisController extends BaseController { *根据挂单号回显病历详情 * @return */ - @RequestMapping("/getDetailByRegisId") - public Result getDetailByRegisId() { + @RequestMapping("/getByRegisId") + public Result getByRegisId() { Integer regisId = parmsUtil.getInteger("regisId", "挂单id不能为空"); return success(diagnosisService.getDetailByRegisId(regisId)); } /** * 获取收费队列 */ - @RequestMapping("/getChargeQueue") - public Result> getChargeQueue() { + @RequestMapping("/ChargeQueueList") + public Result> ChargeQueueList() { ChargeQueueQuery query = parmsUtil.getObject("query", ChargeQueueQuery.class); return success( diagnosisService.getChargeQueue(query)); } /** - * 获取就诊信息 + * 获取挂号信息 */ - @RequestMapping("/getSeeDockerInfo") - public Result getSeeDockerInfo() { + @RequestMapping("/getRegistrationDetail") + public Result getRegistrationDetail() { Integer regisId = parmsUtil.getInteger("regisId", "挂单id不能为空"); return success( diagnosisService.getSeeDockerInfo(regisId)); } + /** + * 获取诊断信息 + */ @RequestMapping("/getByDiagnosisCode") public Result getByDiagnosisCode() { String diagnosisCode = parmsUtil.getString("diagnosisCode", "诊断code不能为空"); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java index 0a99a96..b305d47 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java @@ -25,7 +25,6 @@ import java.util.Map; @RestController @RequestMapping("/goods/cate") public class GoodsCateController extends BaseController { - private static final Logger log = LoggerFactory.getLogger(GoodsCateController.class); @Autowired private GoodsCateService goodsCateService; @@ -35,7 +34,6 @@ public class GoodsCateController extends BaseController { */ @RequestMapping("list") public Result> list(){ - Map map=getParms(); int type= parmsUtil.getInteger("type","类型不能为空"); List list=goodsCateService.listByType(type); return success(list); @@ -53,10 +51,9 @@ public class GoodsCateController extends BaseController { * 删除二级分类 * 参数 id */ - @RecordCommonLog(operation = "删除商品二级分类") + @RecordCommonLog(operation = "删除分类") @RequestMapping("del") public Result del(){ - Map map=getParms(); Integer id= parmsUtil.getInteger("id","id不能为空"); goodsCateService.del(id); return success(); @@ -66,7 +63,7 @@ public class GoodsCateController extends BaseController { * 保存二级分类 * 参数 cateList */ - @RecordCommonLog(operation = "保存商品二级分类") + @RecordCommonLog(operation = "保存分类") @RequestMapping("save") public Result save(){ List cateList = parmsUtil.getList("cateList", GoodsCate.class); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java index b1a1bee..d458f12 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java @@ -28,7 +28,7 @@ import java.util.Map; * @since 2025-02-21 */ @RestController -@RequestMapping("/goods/goods") +@RequestMapping("/goods/base") public class GoodsController extends BaseController { @Autowired private GoodsService goodsService; @@ -90,8 +90,8 @@ public class GoodsController extends BaseController { /** * 商品搜索 goods页搜索 */ - @RequestMapping("searchDetail") - public Result> searchGoodeDetail() { + @RequestMapping("DetailWithSearch") + public Result> DetailWithSearch() { GoodsQuery goodsQuery = parmsUtil.getObject("query", GoodsQuery.class); Page result = goodsService.searchGoodeDetail(goodsQuery); return success(result); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java index 1020472..3ff25a9 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java @@ -50,8 +50,8 @@ public class InventoryApplyController extends BaseController { /** * 获取领用单详情 */ - @RequestMapping("/getApplyDetail") - public Result getCheckDetail(){ + @RequestMapping("/getDetail") + public Result getDetail(){ Integer applyId = parmsUtil.getInteger("id", "id不能为空"); return success(inventoryApplyService.getCheckDetail(applyId)); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java index 8f78869..8a17920 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java @@ -47,8 +47,8 @@ public class InventoryCheckController extends BaseController { /** * 获取盘点单详情 */ - @RequestMapping("/getCheckDetail") - public Result getCheckDetail(){ + @RequestMapping("/getDetail") + public Result getDetail(){ Integer checkId = parmsUtil.getInteger("id", "id不能为空"); return success(inventoryCheckService.getCheckDetail(checkId)); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java index 3fad992..b268ba2 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java @@ -78,8 +78,8 @@ public class InventoryController extends BaseController { /** * 根据goodsId 获取该goods的所有库存信息 */ - @RequestMapping("/getListByGoodsId") - public Result> getListByGoodsId() { + @RequestMapping("/listByGoodsId") + public Result> listByGoodsId() { int goodsId = parmsUtil.getInteger("goodsId", "请输入商品ID"); Goods goods = goodsService.getById(goodsId); if (goods == null) { @@ -92,8 +92,8 @@ public class InventoryController extends BaseController { /** * 根据id集合获取库存信息 */ - @RequestMapping("/getListByIds") - public Result> getListByIds() { + @RequestMapping("/listByIds") + public Result> listByIds() { List ids = parmsUtil.getIntList("idList"); if (ids == null || ids.isEmpty()) { return success(new ArrayList<>()); @@ -103,10 +103,10 @@ public class InventoryController extends BaseController { } /** - * 进销存统计 + * 库存统计 */ - @RequestMapping("/getInventoryStatistics") - public Result> getInventoryStatistics() { + @RequestMapping("/statistics") + public Result> statistics() { int goodsId = parmsUtil.getInteger("goodsId", "请选择商品id"); String startDateStr = parmsUtil.getString("startDate", "请选择开始时间"); String endDateStr = parmsUtil.getString("endDate", "请选择结束时间"); @@ -115,10 +115,12 @@ public class InventoryController extends BaseController { List inventoryStatistics = inventoryService.getInventoryStatistics(goodsId, startDateTime, endDateTime); return success(inventoryStatistics); } - + /* + * 库存日志 + */ //todo getInventoryLog - @RequestMapping("/getInventoryLog") - public Result>> getInventoryLog() { + @RequestMapping("/log") + public Result>> log() { int goodsId = parmsUtil.getInteger("goodsId", "请选择商品id"); String startDateStr = parmsUtil.getString("startDate", "请选择开始时间"); String endDateStr = parmsUtil.getString("endDate", "请选择结束时间"); @@ -129,7 +131,7 @@ public class InventoryController extends BaseController { } /** - * 采购单 采购项修改 + * 修改库存采购信息 * * @return */ diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java index 32f0c11..848ce30 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java @@ -90,8 +90,8 @@ public class InventoryPurchaseController extends BaseController { * @return */ @RecordCommonLog(operation = "已有的采购单中添加商品") - @RequestMapping("/addOneGoods") - public Result addOneGoods() { + @RequestMapping("/addGoods") + public Result addGoods() { Inventory inventory = parmsUtil.getObject("data", Inventory.class); if (inventory == null) { return error("库存商品为空"); @@ -109,8 +109,8 @@ public class InventoryPurchaseController extends BaseController { * @return */ @RecordCommonLog(operation = "采购单退货") - @RequestMapping("/returnable") - public Result returnable() { + @RequestMapping("/refund") + public Result refund() { List list = parmsUtil.getIntList("idList"); if (list == null || list.isEmpty()) { return error("请选择要退货的商品"); @@ -119,6 +119,10 @@ public class InventoryPurchaseController extends BaseController { return success(); } + /** + *转excel + * @return + */ @RequestMapping("/toExcel") public Result toExcel() { @@ -130,6 +134,10 @@ public class InventoryPurchaseController extends BaseController { cacheUtil.set(file_token, map, 60*10); return success(file_token); } + /** + *从excel导入 + * @return + */ @RequestMapping("/fromExcel") public Result fromExcel() { String file_token = parmsUtil.getString("token"); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java index 57f1786..8576c21 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java @@ -22,7 +22,9 @@ public class ItemController extends BaseController { @Autowired private ItemService itemService; - + /* + * 获取非组套列表 + */ @RequestMapping("/list") public Result> getAllItems() { int page = parmsUtil.getInteger("pageNum", "页码不能为空"); @@ -32,7 +34,9 @@ public class ItemController extends BaseController { return success(itemService.list(page, size, name, tel)); } - + /* + * 获取组套列表 + */ @RequestMapping("/groupList") public Result> groupList() { int page = parmsUtil.getInteger("page", "页码不能为空"); @@ -41,15 +45,20 @@ public class ItemController extends BaseController { return success(itemService.groupList(page, size)); } - - @RequestMapping("/getItemById") - public Result getItemById() { + /* + * 获取项目详情 + */ + @RequestMapping("/get") + public Result get() { Integer id = parmsUtil.getInteger("id"); if (id == null) { throw new MessageException("id参数为空"); } return success(itemService.get(id)); } + /* + * 添加项目 + */ @RecordCommonLog(operation = "保存服务项目") @RequestMapping("/add") public Result createItem() { @@ -57,6 +66,9 @@ public class ItemController extends BaseController { itemService.save(item); return success(); } + /* + * 修改项目 + */ @RecordCommonLog(operation = "编辑服务项目") @RequestMapping("/edit") public Result updateItem() { @@ -65,20 +77,27 @@ public class ItemController extends BaseController { return success(); } + /* + * 删除项目 + */ @RequestMapping("/delete") public Result deleteItem() { Integer id = parmsUtil.getInteger("id"); itemService.delete(id); return success(); } - + /* + * 搜索项目 + */ @RequestMapping("/search") public Result> search() { String keyword = parmsUtil.getString("keyword"); return success(itemService.search(keyword)); } - + /* + * 保存组套 + */ @RequestMapping("/saveGroup") public Result saveGroup() { List itemGroupList = parmsUtil.getList("list", ItemGroupList.class,"请求参数list不能为空"); @@ -89,13 +108,17 @@ public class ItemController extends BaseController { return success(); } - + /* + * 获取组套 + */ @RequestMapping("/getGroup") public Result getGroup() { Integer itemId = parmsUtil.getInteger("id","item_id为空"); return success(itemService.getGroup(itemId)); } - + /* + * 删除组套 + */ @RequestMapping("/deleteGroup") public Result deleteGroup() { Integer itemId = parmsUtil.getInteger("id","item_id为空"); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java b/src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java deleted file mode 100644 index 98da331..0000000 --- a/src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.syjiaer.clinic.server.controller.item; - -import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; -import com.syjiaer.clinic.server.common.exception.MessageException; -import com.syjiaer.clinic.server.common.vo.Page; -import com.syjiaer.clinic.server.common.vo.Result; -import com.syjiaer.clinic.server.controller.BaseController; -import com.syjiaer.clinic.server.entity.item.ItemGroup; -import com.syjiaer.clinic.server.entity.item.param.ItemGroupParam; -import com.syjiaer.clinic.server.service.item.ItemGroupService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/item/group") -public class ItemGroupController extends BaseController { - @Autowired - private ItemGroupService itemGroupService; - - @RequestMapping("/list") - public Result> list() { - Integer page = parmsUtil.getInteger("page", "页码不能为空"); - Integer size = parmsUtil.getInteger("size", "页容量不能为空"); - String name = parmsUtil.getString("name"); - Page pageResult = itemGroupService.list(page, size, name); - return success(pageResult); - } - - @RequestMapping("/getItemGroupById") - public Result getItemGroupById() { - Integer id = parmsUtil.getInteger("id", "id不能为空"); - ItemGroup itemGroup = itemGroupService.get(id); - return success(itemGroup); - } - - @RecordCommonLog(operation = "保存服务项目组套") - @RequestMapping("/save") - public Result save() { - ItemGroupParam itemGroupParam = parmsUtil.getObject("data", ItemGroupParam.class); - if (itemGroupParam == null){ - throw new MessageException("请求参数不能为空"); - } - itemGroupService.save(itemGroupParam); - return success(); - } - @RecordCommonLog(operation = "删除服务项目组套") - @RequestMapping("/delete") - public Result delete() { - Integer id = parmsUtil.getInteger("id", "id不能为空"); - itemGroupService.delete(id); - return success(); - } -} diff --git a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java index 3a8ba0c..b6b3703 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java @@ -48,14 +48,14 @@ public class OrganizationMemberController extends BaseController { organizationMemberService.delete(id); return success(); } - @RequestMapping("/getById") - public Result getById() { + @RequestMapping("/get") + public Result get() { Integer id = parmsUtil.getInteger("id","id不能为空"); return success(organizationMemberService.get(id)); } @RequestMapping("/search") - public Result> allDoctorList() { + public Result> search() { DockerSearchQuery dockerSearchQuery = parmsUtil.getObject("query", DockerSearchQuery.class); return success(organizationMemberService.doctorList(dockerSearchQuery)); } diff --git a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java index a371529..e47f2f9 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java @@ -61,8 +61,8 @@ public class OrganizationSectionController extends BaseController { organizationSectionService.delete(id); return success("删除成功"); } - @RequestMapping("/getById") - public Result getById() { + @RequestMapping("/get") + public Result get() { Integer id = parmsUtil.getInteger("id"); if(id == null){ throw new MessageException("id参数为空"); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java b/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java index da38575..5daf454 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java @@ -21,7 +21,7 @@ import java.util.List; * @since 2025-02-21 */ @RestController -@RequestMapping("/vip/vip") +@RequestMapping("/patient/base") public class PatientController extends BaseController { @Autowired diff --git a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java b/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientIntegralController.java similarity index 90% rename from src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java rename to src/main/java/com/syjiaer/clinic/server/controller/patient/PatientIntegralController.java index 30a7118..bc72c24 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientIntegralController.java @@ -1,4 +1,4 @@ -package com.syjiaer.clinic.server.controller.vip; +package com.syjiaer.clinic.server.controller.patient; import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; import com.syjiaer.clinic.server.common.vo.Page; @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/vip/integral") -public class VipIntegralController extends BaseController { +@RequestMapping("/patient/integral") +public class PatientIntegralController extends BaseController { @Autowired private VipIntegralLogService vipIntegralLogService; @Autowired diff --git a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java b/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientLevelConfigController.java similarity index 93% rename from src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java rename to src/main/java/com/syjiaer/clinic/server/controller/patient/PatientLevelConfigController.java index 133c74f..ab3a13d 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/patient/PatientLevelConfigController.java @@ -1,4 +1,4 @@ -package com.syjiaer.clinic.server.controller.vip; +package com.syjiaer.clinic.server.controller.patient; import com.syjiaer.clinic.server.common.annotations.RecordCommonLog; import com.syjiaer.clinic.server.common.vo.Result; @@ -20,8 +20,8 @@ import java.util.List; * @since 2025-02-21 */ @RestController -@RequestMapping("/vip/vipLevel") -public class VipLevelConfigController extends BaseController { +@RequestMapping("/patient/levelConfig") +public class PatientLevelConfigController extends BaseController { @Autowired private VipLevelConfigService vipLevelConfigService; @RecordCommonLog(operation = "创建会员等级配置") diff --git a/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java b/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java index 2aff29a..602198c 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController -@RequestMapping("/registration") +@RequestMapping("/patient/registration") public class RegistrationController extends BaseController { @Autowired private PatientRegistrationService patientRegistrationService; @@ -32,7 +32,7 @@ public class RegistrationController extends BaseController { */ @RecordCommonLog(operation = "挂号") @RequestMapping("/add") - public Result registration() { + public Result add() { RegistrationSaveDto registrationParam = parmsUtil.getObjectWithCheck("data", RegistrationSaveDto.class); String mdtrtCertNo = parmsUtil.getString("mdtrtCertNo"); @@ -101,8 +101,8 @@ public class RegistrationController extends BaseController { * 获取挂号信息 * @return */ - @RequestMapping("/getById") - public Result getById() { + @RequestMapping("/get") + public Result get() { Integer id = parmsUtil.getInteger("id"); if (id == null) { throw new MessageException("id参数为空"); @@ -121,18 +121,18 @@ public class RegistrationController extends BaseController { * 挂号信息分页搜索 * @return */ - @RequestMapping("/getListByType") - public Result> getListByType() { + @RequestMapping("/listByType") + public Result> listByType() { RegistrationQuery query = parmsUtil.getObject("query", RegistrationQuery.class); return success(patientRegistrationService.getListByType(query)); } /** - * 根据id返回挂号详细信息 + * 根据id返回挂号详细信息 包含患者信息 * @return */ - @RequestMapping("/getDetailById") - public Result getDetailById(){ + @RequestMapping("/getWithPatient") + public Result getWithPatient(){ Integer regisId= parmsUtil.getInteger("id","挂号单不能为空"); return success(patientRegistrationService.getDetailById(regisId)); } diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java index ad26144..68fad81 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java @@ -33,8 +33,8 @@ public class SocialReconciliationController extends BaseController { * 医保-对账列表 * @return */ - @RequestMapping("/getList") - public Result> getList(){ + @RequestMapping("/list") + public Result> list(){ String begin = parmsUtil.getString("beginTime","开始时间为空"); String end= parmsUtil.getString("endTime","结束时间为空"); LocalDateTime beginTime = DateUtil.getDateTime(begin); @@ -46,8 +46,8 @@ public class SocialReconciliationController extends BaseController { /** * 对账历史记录 */ - @RequestMapping("/pageHistory") - public Result> pageHistory(){ + @RequestMapping("/historyList") + public Result> historyList(){ ReconciliationLogQuery query = parmsUtil.getObject("query", ReconciliationLogQuery.class); return success(socialReconciliationService.pageLogs(query)); } @@ -55,8 +55,8 @@ public class SocialReconciliationController extends BaseController { * 对总账 */ @RecordCommonLog(operation = "对总账") - @RequestMapping("/totalDo") - public Result totalDo(){ + @RequestMapping("/doTotal") + public Result doTotal(){ ReconciliationItemDto dto = parmsUtil.getObject("data", ReconciliationItemDto.class); return success( socialReconciliationService.totalDo(dto,false)); } @@ -64,22 +64,14 @@ public class SocialReconciliationController extends BaseController { * 明细对账 */ @RecordCommonLog(operation = "明细对账") - @RequestMapping("/detailDo") - public Result> detailDo(){ + @RequestMapping("/doDetail") + public Result> doDetail(){ ReconciliationItemDto dto = parmsUtil.getObject("data", ReconciliationItemDto.class); return success(socialReconciliationService.detailDo(dto)); } - /** - * 明细对账测试接口 - */ - @RequestMapping("/testDetailDo") - public Result> testDetailDo(){ - return success(socialReconciliationService.testDetailDo()); - } - /** * 冲正 */ diff --git a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java index 4787e71..1a92f83 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java @@ -67,33 +67,7 @@ public class SocialUploadController extends BaseController { return success(page); } - - /** - * 单独上报3501 - */ - - @RequestMapping("upload3501Data") - public Result upload3501Data() { - return success(socialInventoryUploadService.upload3501()); - } - - /** - * 单独上报3502 - */ - @RequestMapping("upload3502Data") - public Result upload3502Data() { - return success(socialInventoryUploadService.upload3502()); - } - - /** - * 单独上报3503 - */ - @RequestMapping("upload3503Data") - public Result upload3503Data() { - return success(socialInventoryUploadService.upload3503()); - } - - /** + /* * 获取进销存 3501-3506 未上报数量 */ @RequestMapping("getNotDoNumber") 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 index 9406fc8..c738fd2 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java @@ -27,7 +27,9 @@ public class StatisticsController extends BaseController { private InventoryService inventoryService; @Autowired private GoodsService goodsService; - + /** + * 营收概况 + */ @RequestMapping("getRevenueOverview") public Result getRevenueOverview() { String begin = parmsUtil.getString("beginTime", "开始时间为空"); @@ -39,7 +41,9 @@ public class StatisticsController extends BaseController { return success(revenueOverview); } - + /** + * 库存预警 + */ @RequestMapping("numberEarlyWarning") public Result> numberEarlyWarning() { Integer pageNum = parmsUtil.getInteger("pageNum", "pageNum为空"); @@ -48,7 +52,9 @@ public class StatisticsController extends BaseController { Page page = goodsService.page( pageNum, pageSize); return success(page); } - + /* + * 有效期预警 + */ @RequestMapping("expiryDateWarning") public Result>> expiryDateWarning() { Integer pageNum = parmsUtil.getInteger("pageNum", "pageNum为空"); @@ -56,9 +62,12 @@ public class StatisticsController extends BaseController { Page> maps = inventoryService.expiryDateWarning(pageSize,pageNum); return success(maps); } + /* + * 经营概况 + */ - @RequestMapping("getPersonPayOverview") - public Result getPersonPayOverview() { + @RequestMapping("getPayOverview") + public Result getPayOverview() { String begin = parmsUtil.getString("beginTime", "开始时间为空"); String end = parmsUtil.getString("endTime", "结束时间为空"); LocalDateTime beginTime = DateUtil.getDateTime(begin); @@ -67,6 +76,9 @@ public class StatisticsController extends BaseController { return success(personPayOverviewVo); } + /** + * 销售人次趋势 + */ @RequestMapping("getSalesVolumeOverview") public Result getSalesVolumeOverview() { String begin = parmsUtil.getString("beginTime", "开始时间为空"); @@ -77,7 +89,9 @@ public class StatisticsController extends BaseController { return success(salesVolumeOverviewVo); } - + /** + * 销售人员统计 + */ @RequestMapping("/salePerson") public Result> salePerson() { return success( statisticsService.salePersonReport()); @@ -86,8 +100,8 @@ public class StatisticsController extends BaseController { /** * 获取收费队列 就诊队列数量 */ - @RequestMapping("/getTipCount") - public Result getTipCount() { + @RequestMapping("/getQueueCount") + public Result getQueueCount() { String begin = parmsUtil.getString("beginTime", "开始时间为空"); String end = parmsUtil.getString("endTime", "结束时间为空"); LocalDateTime beginTime = DateUtil.getDateTime(begin); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java b/src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java deleted file mode 100644 index 0f62324..0000000 --- a/src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.syjiaer.clinic.server.controller.vip; - -///** -// *

-// * 商品 前端控制器 -// *

-// * -// * @author NiuZiYuan -// * @since 2025-02-21 -// */ -//@RestController -//@RequestMapping("/vip/vip") -//public class VipController extends BaseController { -// -// @Autowired -// private VipService vipService; -// @Autowired -// private VipLevelConfigService vipLevelConfigService; -// -// @RequestMapping("/create") -// public Result create() { -// Vip vip = parmsUtil.getObject("vipInfo", Vip.class); -// vipService.create(vip); -// -// return success(); -// } -// -// @RequestMapping("/update") -// public Result update() { -// Vip vip = parmsUtil.getObject("vipInfo", Vip.class); -// -// vipService.update(vip); -// -// return success(); -// } -// -// @RequestMapping("/delete") -// public Result delete() { -// int vipId = parmsUtil.getInteger("id", "ID不能为空"); -// return success(vipService.removeById(vipId)); -// } -// -// @RequestMapping("/list") -// public Result> selectList() { -// String keyword = parmsUtil.getString("keyword"); -// int page = parmsUtil.getInteger("page", "请输入页码"); -// int pageSize = parmsUtil.getInteger("pageSize", "请输入每页条数"); -// Page list = vipService.pageList(keyword, page, pageSize); -// return success(list); -// } -// -// @RequestMapping("/get") -// public Result get() { -// int id = parmsUtil.getInteger("id", "ID不能为空"); -// Vip vip = vipService.getById(id); -// return success(vip); -// } -// -// @RequestMapping("/search") -// public Result> search() { -// String keyword = parmsUtil.getString("keyword", "关键字不能为空"); -// List list = vipService.search(keyword); -// return success(list); -// } -// -// @RequestMapping("/changeLevel") -// public Result changeLevel() { -// int vipId = parmsUtil.getInteger("vipId", "会员ID不能为空"); -// int levelId = parmsUtil.getInteger("levelId", "等级id不能为空"); -// vipService.changeLevel(vipId, levelId); -// -// return success(); -// } -// -// -//} 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/DiagnosisDto.java similarity index 95% rename from src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java rename to src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/DiagnosisDto.java index d8b9223..ff27daf 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/DiagnosisDto.java @@ -9,7 +9,7 @@ import java.util.List; @Getter @Setter -public class MedicalRecordSaveDto { +public class DiagnosisDto { @ApiModelProperty("自增id") private Integer id; diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java index c2b9b10..c248a4a 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java @@ -21,7 +21,7 @@ import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery; import com.syjiaer.clinic.server.entity.diagnosis.dto.GoodsRetailDto; import com.syjiaer.clinic.server.entity.diagnosis.dto.ItemRetailDto; -import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordSaveDto; +import com.syjiaer.clinic.server.entity.diagnosis.dto.DiagnosisDto; import com.syjiaer.clinic.server.entity.diagnosis.vo.ChargeQueueVo; import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalHistoryVo; import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalRecordVo; @@ -101,7 +101,7 @@ public class DiagnosisService extends BaseService { @Transactional(rollbackFor = Exception.class) - public void save(MedicalRecordSaveDto saveDto) { + public void save(DiagnosisDto saveDto) { int regisId =saveDto.getRegistrationId(); QueryWrapper queryWrapperRegis = new QueryWrapper<>(); diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java index 431ed93..70e89fe 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java @@ -367,7 +367,11 @@ public class SocialReconciliationService extends BaseService { try { totalDo(dto,true); }catch (Exception e){ - log.error("对账失败",e); + String isDev = System.getenv("IsDev"); + if (isDev != null &&isDev.equals("true")) { + log.error("对账失败",e); + } + } // }