clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
牛子源 2025-05-27 10:49:30 +08:00
parent 5e99c0394e
commit b0dbcc8d1c
32 changed files with 399 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/syjiaer/clinic/server/common/constants/Constants.java
View File

@ -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 = "医保";
}

211
src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java
View File

@ -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<Object> save() {
ChargeSaveDto dto = parmsUtil.getObject("data", ChargeSaveDto.class);
ChargeOrder chargeOrder = chargeService.save(dto);
return success(chargeOrder.getCode());
}
/*
查询list 带详情
*/
@RequestMapping("/listDetail")
public Result<Page<ChargeDetailVo>> listDetail() {
ChargeQuery chargeQuery = parmsUtil.getObject("query", ChargeQuery.class);
return success(chargeService.pageDetailList(chargeQuery));
}
/**
* 查询list 只有订单信息
* @return
*/
@RequestMapping("/list")
public Result<Page<ChargeOrder>> list() {
ChargeQuery chargeQuery = parmsUtil.getObject("query", ChargeQuery.class);
return success(chargeService.pageList(chargeQuery));
}
/**
* 完成订单
* @return
*/
@RecordCommonLog(operation = "完成订单")
@RequestMapping("/completeOrder")
public Result<Object> completeOrder() {
Integer id = parmsUtil.getInteger("id");
Integer payType = parmsUtil.getInteger("payType");
chargeService.completeOrder(id,payType);
return success();
}
/**
* 根据诊断code和状态获取诊断信息
*/
@RequestMapping("/getOrderByDiagnosisCode")
public Result<ChargeOrder> getOrderByDiagnosisCode() {
String diagnosisCode = parmsUtil.getString("diagnosisCode","诊断code不能为空");
ChargeOrder chargeOrder = chargeService.getOrderByDiagnosisCode(diagnosisCode);
return success(chargeOrder);
}
/**
* 根据code查询订单详情
* @return
*/
@RequestMapping("/getByCode")
public Result<ChargeDetailVo> getByCode() {
String code = parmsUtil.getString("code");
return success(chargeService.getDetail(code));
}
/**
* 医保上传支付明细
* @return
*/
@RecordCommonLog(operation = "上传医保费用明细")
@RequestMapping("/uploadCostDetails")
public Result<Object> uploadCostDetails() {
String changeOrderCode = parmsUtil.getString("changeOrderCode");
chargeService.uploadCostDetails(changeOrderCode);
return success();
}
/**
* 医保预支付
* @return
*/
@RequestMapping("/socialPrePay")
public Result<OM2206A> 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<OM2207A> 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<Object> refund() {
String changeOrderCode = parmsUtil.getString("changeOrderCode","订单号为空");
chargeService.refund(changeOrderCode);
return success();
}
/**
* 每日收费报表
*/
@RequestMapping("/dailyChargingReport")
public Result<List<RetailOrderDailyChargingReportVo>> 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<List<ChargeOrder>> getListByPatientId() {
Integer patientId = parmsUtil.getInteger("patientId");
return success(chargeService.getListByPatientId(patientId));
}
/**
* 收费记录
* @return
*/
@RequestMapping("/getChargeRecord")
public Result<Page<ChargeLog>> getChargeRecord() {
return success(chargeService.getChargeRecordPageList());
}
/**
* 获取收退费记录
*/
@RequestMapping("listChargeLog")
public Result<List<ChargeLog>> 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<ChargeLog> chargeLogs = chargeService.listChargeLog(beginTime,endTime,userId);
return success(chargeLogs);
}
/**
* 根据订单号获取订单详情 小票打印用
*/
@RequestMapping("getPrintInfoByCode")
public Result<ChargeOrderPrintVo> getDetailByCode() {
String code = parmsUtil.getString("code", "订单号不能为空");
return success(chargeService.getPrintInfoByCode(code));
}
}

78
src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeLogController.java Normal file
View File

@ -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<List<RetailOrderDailyChargingReportVo>> 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<List<ChargeOrder>> listByPatientId() {
Integer patientId = parmsUtil.getInteger("patientId");
return success(chargeService.getListByPatientId(patientId));
}
/**
* 收费记录
* @return
*/
@ApiOperation("收费记录")
@RequestMapping("/list")
public Result<Page<ChargeLog>> list() {
return success(chargeService.getChargeRecordPageList());
}
/**
* 获取收退费记录
*/
@RequestMapping("listByDatetime")
public Result<List<ChargeLog>> 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<ChargeLog> chargeLogs = chargeService.listChargeLog(beginTime,endTime,userId);
return success(chargeLogs);
}
}

113
src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeOrderController.java Normal file
View File

@ -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<Object> save() {
ChargeSaveDto dto = parmsUtil.getObject("data", ChargeSaveDto.class);
ChargeOrder chargeOrder = chargeService.save(dto);
return success(chargeOrder.getCode());
}
/**
* 根据诊断code和状态获取诊断信息
*/
@RequestMapping("/getByDiagnosisCode")
public Result<ChargeOrder> getByDiagnosisCode() {
String diagnosisCode = parmsUtil.getString("diagnosisCode","诊断code不能为空");
ChargeOrder chargeOrder = chargeService.getOrderByDiagnosisCode(diagnosisCode);
return success(chargeOrder);
}
/**
* 根据code查询订单详情
* @return
*/
@RequestMapping("/getByCode")
public Result<ChargeDetailVo> getByCode() {
String code = parmsUtil.getString("code");
return success(chargeService.getDetail(code));
}
/**
* 根据订单号获取订单详情 小票打印用
*/
@RequestMapping("getPrintInfoByCode")
public Result<ChargeOrderPrintVo> getPrintInfoByCode() {
String code = parmsUtil.getString("code", "订单号不能为空");
return success(chargeService.getPrintInfoByCode(code));
}
/**
* 查询list 只有订单信息
* @return
*/
@RequestMapping("/list")
public Result<Page<ChargeOrder>> list() {
ChargeQuery chargeQuery = parmsUtil.getObject("query", ChargeQuery.class);
return success(chargeService.pageList(chargeQuery));
}
/*
查询list 带详情
*/
@RequestMapping("/listWithDetail")
public Result<Page<ChargeDetailVo>> listWithDetail() {
ChargeQuery chargeQuery = parmsUtil.getObject("query", ChargeQuery.class);
return success(chargeService.pageDetailList(chargeQuery));
}
/**
* 完成订单
* @return
*/
@RecordCommonLog(operation = "完成订单")
@RequestMapping("/complete")
public Result<Object> complete() {
Integer id = parmsUtil.getInteger("id");
Integer payType = parmsUtil.getInteger("payType");
chargeService.completeOrder(id,payType);
return success();
}
/**
* 订单退款
*/
@RecordCommonLog(operation = "订单退款")
@RequestMapping("/refund")
public Result<Object> refund() {
String changeOrderCode = parmsUtil.getString("changeOrderCode","订单号为空");
chargeService.refund(changeOrderCode);
return success();
}
}

59
src/main/java/com/syjiaer/clinic/server/controller/charge/SocialController.java Normal file
View File

@ -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<OM2206A> 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<OM2207A> 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<Object> upload() {
String changeOrderCode = parmsUtil.getString("changeOrderCode");
chargeService.uploadCostDetails(changeOrderCode);
return success();
}
}

17
src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java
View File

@ -30,16 +30,14 @@ public class CommonConfigController extends BaseController {
private CommonConfigService commonConfigService;
@Autowired
private Config config;
@Autowired
private FileService fileService;
@RequestMapping("list")
public Result<Object> list() {
return success(commonConfigService.list());
}
@RequestMapping("getall")
public Result<Object> getall() {
@RequestMapping("getAll")
public Result<Object> getAll() {
List<CommonConfig> list = commonConfigService.list();
Map<String, String> map = new HashMap<>();
for (CommonConfig commonConfig : list) {
@ -74,7 +72,7 @@ public class CommonConfigController extends BaseController {
*/
@RecordCommonLog(operation = "修改打印机配置")
@RequestMapping("savePrinter")
public Result<Object> updatePrinter() {
public Result<Object> 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<Object> uploadClinicImage(@RequestParam("file") MultipartFile file) {
// return success(commonConfigService.uploadClinicImage(file));
// }
}

4
src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java
View File

@ -17,8 +17,8 @@ public class CommonLogController extends BaseController {
private CommonLogService commonLogService;
@RequestMapping("page")
public Result<Page<CommonLog>> page() {
@RequestMapping("list")
public Result<Page<CommonLog>> list() {
CommonLogQuery query = parmsUtil.getObject("query", CommonLogQuery.class);
return success(commonLogService.pageList(query));
}

2
src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java
View File

@ -30,7 +30,7 @@ import java.util.Map;
@Slf4j
@RestController
@RequestMapping("file")
@RequestMapping("common/file")
public class FileController extends BaseController {
@Autowired
private FileService fileService;

2
src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java
View File

@ -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;

2
src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java
View File

@ -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;

27
src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java
View File

@ -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<PatientRegistration> 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<MedicalRecordVo> getDetailByRegisId() {
@RequestMapping("/getByRegisId")
public Result<MedicalRecordVo> getByRegisId() {
Integer regisId = parmsUtil.getInteger("regisId", "挂单id不能为空");
return success(diagnosisService.getDetailByRegisId(regisId));
}
/**
* 获取收费队列
*/
@RequestMapping("/getChargeQueue")
public Result<Page<ChargeQueueVo>> getChargeQueue() {
@RequestMapping("/ChargeQueueList")
public Result<Page<ChargeQueueVo>> ChargeQueueList() {
ChargeQueueQuery query = parmsUtil.getObject("query", ChargeQueueQuery.class);
return success( diagnosisService.getChargeQueue(query));
}
/**
* 获取就诊信息
* 获取挂号信息
*/
@RequestMapping("/getSeeDockerInfo")
public Result<SeeDoctorInfoVo> getSeeDockerInfo() {
@RequestMapping("/getRegistrationDetail")
public Result<SeeDoctorInfoVo> getRegistrationDetail() {
Integer regisId = parmsUtil.getInteger("regisId", "挂单id不能为空");
return success( diagnosisService.getSeeDockerInfo(regisId));
}
/**
* 获取诊断信息
*/
@RequestMapping("/getByDiagnosisCode")
public Result<MedicalRecordVo> getByDiagnosisCode() {
String diagnosisCode = parmsUtil.getString("diagnosisCode", "诊断code不能为空");

7
src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java
View File

@ -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<GoodsCate>> list(){
Map<String,Object> map=getParms();
int type= parmsUtil.getInteger("type","类型不能为空");
List<GoodsCate> 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<String,Object> 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<GoodsCate> cateList = parmsUtil.getList("cateList", GoodsCate.class);

6
src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java
View File

@ -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<Page<GoodsDetailVo>> searchGoodeDetail() {
@RequestMapping("DetailWithSearch")
public Result<Page<GoodsDetailVo>> DetailWithSearch() {
GoodsQuery goodsQuery = parmsUtil.getObject("query", GoodsQuery.class);
Page<GoodsDetailVo> result = goodsService.searchGoodeDetail(goodsQuery);
return success(result);

4
src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java
View File

@ -50,8 +50,8 @@ public class InventoryApplyController extends BaseController {
/**
* 获取领用单详情
*/
@RequestMapping("/getApplyDetail")
public Result<String> getCheckDetail(){
@RequestMapping("/getDetail")
public Result<String> getDetail(){
Integer applyId = parmsUtil.getInteger("id", "id不能为空");
return success(inventoryApplyService.getCheckDetail(applyId));

4
src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java
View File

@ -47,8 +47,8 @@ public class InventoryCheckController extends BaseController {
/**
* 获取盘点单详情
*/
@RequestMapping("/getCheckDetail")
public Result<String> getCheckDetail(){
@RequestMapping("/getDetail")
public Result<String> getDetail(){
Integer checkId = parmsUtil.getInteger("id", "id不能为空");
return success(inventoryCheckService.getCheckDetail(checkId));

24
src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java
View File

@ -78,8 +78,8 @@ public class InventoryController extends BaseController {
/**
* 根据goodsId 获取该goods的所有库存信息
*/
@RequestMapping("/getListByGoodsId")
public Result<List<Inventory>> getListByGoodsId() {
@RequestMapping("/listByGoodsId")
public Result<List<Inventory>> 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<List<Inventory>> getListByIds() {
@RequestMapping("/listByIds")
public Result<List<Inventory>> listByIds() {
List<Integer> 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<List<InventoryService.LineModel>> getInventoryStatistics() {
@RequestMapping("/statistics")
public Result<List<InventoryService.LineModel>> 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<InventoryService.LineModel> inventoryStatistics = inventoryService.getInventoryStatistics(goodsId, startDateTime, endDateTime);
return success(inventoryStatistics);
}
/*
* 库存日志
*/
//todo getInventoryLog
@RequestMapping("/getInventoryLog")
public Result<List<Map<String, Object>>> getInventoryLog() {
@RequestMapping("/log")
public Result<List<Map<String, Object>>> 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
*/

16
src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java
View File

@ -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<Integer> 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");

41
src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java
View File

@ -22,7 +22,9 @@ public class ItemController extends BaseController {
@Autowired
private ItemService itemService;
/*
* 获取非组套列表
*/
@RequestMapping("/list")
public Result<Page<Item>> 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<Page<Item>> 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<Item> getItemById() {
/*
* 获取项目详情
*/
@RequestMapping("/get")
public Result<Item> 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<List<ItemSearchVo>> search() {
String keyword = parmsUtil.getString("keyword");
return success(itemService.search(keyword));
}
/*
* 保存组套
*/
@RequestMapping("/saveGroup")
public Result<?> saveGroup() {
List<ItemGroupList> 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为空");

54
src/main/java/com/syjiaer/clinic/server/controller/item/ItemGroupController.java
View File

@ -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<Page<ItemGroup>> list() {
Integer page = parmsUtil.getInteger("page", "页码不能为空");
Integer size = parmsUtil.getInteger("size", "页容量不能为空");
String name = parmsUtil.getString("name");
Page<ItemGroup> pageResult = itemGroupService.list(page, size, name);
return success(pageResult);
}
@RequestMapping("/getItemGroupById")
public Result<ItemGroup> 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();
}
}

6
src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java
View File

@ -48,14 +48,14 @@ public class OrganizationMemberController extends BaseController {
organizationMemberService.delete(id);
return success();
}
@RequestMapping("/getById")
public Result<OrganizationMemberSaveDto> getById() {
@RequestMapping("/get")
public Result<OrganizationMemberSaveDto> get() {
Integer id = parmsUtil.getInteger("id","id不能为空");
return success(organizationMemberService.get(id));
}
@RequestMapping("/search")
public Result<List<OrganizationMember>> allDoctorList() {
public Result<List<OrganizationMember>> search() {
DockerSearchQuery dockerSearchQuery = parmsUtil.getObject("query", DockerSearchQuery.class);
return success(organizationMemberService.doctorList(dockerSearchQuery));
}

4
src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java
View File

@ -61,8 +61,8 @@ public class OrganizationSectionController extends BaseController {
organizationSectionService.delete(id);
return success("删除成功");
}
@RequestMapping("/getById")
public Result<OrganizationSection> getById() {
@RequestMapping("/get")
public Result<OrganizationSection> get() {
Integer id = parmsUtil.getInteger("id");
if(id == null){
throw new MessageException("id参数为空");

2
src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java
View File

@ -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

6
src/main/java/com/syjiaer/clinic/server/controller/vip/VipIntegralController.java → src/main/java/com/syjiaer/clinic/server/controller/patient/PatientIntegralController.java
View File

@ -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

6
src/main/java/com/syjiaer/clinic/server/controller/vip/VipLevelConfigController.java → src/main/java/com/syjiaer/clinic/server/controller/patient/PatientLevelConfigController.java
View File

@ -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 = "创建会员等级配置")

18
src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java
View File

@ -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<PatientRegistrationVo> getById() {
@RequestMapping("/get")
public Result<PatientRegistrationVo> 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<Page<PatientRegistration>> getListByType() {
@RequestMapping("/listByType")
public Result<Page<PatientRegistration>> listByType() {
RegistrationQuery query = parmsUtil.getObject("query", RegistrationQuery.class);
return success(patientRegistrationService.getListByType(query));
}
/**
* 根据id返回挂号详细信息
* 根据id返回挂号详细信息 包含患者信息
* @return
*/
@RequestMapping("/getDetailById")
public Result<PatientAndRegistrationInfoVo> getDetailById(){
@RequestMapping("/getWithPatient")
public Result<PatientAndRegistrationInfoVo> getWithPatient(){
Integer regisId= parmsUtil.getInteger("id","挂号单不能为空");
return success(patientRegistrationService.getDetailById(regisId));
}

24
src/main/java/com/syjiaer/clinic/server/controller/social/SocialReconciliationController.java
View File

@ -33,8 +33,8 @@ public class SocialReconciliationController extends BaseController {
* 医保-对账列表
* @return
*/
@RequestMapping("/getList")
public Result<List<ReconciliationItemVo>> getList(){
@RequestMapping("/list")
public Result<List<ReconciliationItemVo>> 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<Page<SocialReconciliationLog>> pageHistory(){
@RequestMapping("/historyList")
public Result<Page<SocialReconciliationLog>> 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<OM3201> totalDo(){
@RequestMapping("/doTotal")
public Result<OM3201> 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<List<ReconciliationDetailVo>> detailDo(){
@RequestMapping("/doDetail")
public Result<List<ReconciliationDetailVo>> doDetail(){
ReconciliationItemDto dto = parmsUtil.getObject("data", ReconciliationItemDto.class);
return success(socialReconciliationService.detailDo(dto));
}
/**
* 明细对账测试接口
*/
@RequestMapping("/testDetailDo")
public Result<List<ReconciliationDetailVo>> testDetailDo(){
return success(socialReconciliationService.testDetailDo());
}
/**
* 冲正
*/

28
src/main/java/com/syjiaer/clinic/server/controller/social/SocialUploadController.java
View File

@ -67,33 +67,7 @@ public class SocialUploadController extends BaseController {
return success(page);
}
/**
* 单独上报3501
*/
@RequestMapping("upload3501Data")
public Result<Boolean> upload3501Data() {
return success(socialInventoryUploadService.upload3501());
}
/**
* 单独上报3502
*/
@RequestMapping("upload3502Data")
public Result<Boolean> upload3502Data() {
return success(socialInventoryUploadService.upload3502());
}
/**
* 单独上报3503
*/
@RequestMapping("upload3503Data")
public Result<Boolean> upload3503Data() {
return success(socialInventoryUploadService.upload3503());
}
/**
/*
* 获取进销存 3501-3506 未上报数量
*/
@RequestMapping("getNotDoNumber")

30
src/main/java/com/syjiaer/clinic/server/controller/statistics/StatisticsController.java
View File

@ -27,7 +27,9 @@ public class StatisticsController extends BaseController {
private InventoryService inventoryService;
@Autowired
private GoodsService goodsService;
/**
* 营收概况
*/
@RequestMapping("getRevenueOverview")
public Result<RevenueOverviewVo> getRevenueOverview() {
String begin = parmsUtil.getString("beginTime", "开始时间为空");
@ -39,7 +41,9 @@ public class StatisticsController extends BaseController {
return success(revenueOverview);
}
/**
* 库存预警
*/
@RequestMapping("numberEarlyWarning")
public Result<Page<Goods>> numberEarlyWarning() {
Integer pageNum = parmsUtil.getInteger("pageNum", "pageNum为空");
@ -48,7 +52,9 @@ public class StatisticsController extends BaseController {
Page<Goods> page = goodsService.page( pageNum, pageSize);
return success(page);
}
/*
* 有效期预警
*/
@RequestMapping("expiryDateWarning")
public Result<Page<Map<String, Object>>> expiryDateWarning() {
Integer pageNum = parmsUtil.getInteger("pageNum", "pageNum为空");
@ -56,9 +62,12 @@ public class StatisticsController extends BaseController {
Page<Map<String, Object>> maps = inventoryService.expiryDateWarning(pageSize,pageNum);
return success(maps);
}
/*
* 经营概况
*/
@RequestMapping("getPersonPayOverview")
public Result<PersonPayOverviewVo> getPersonPayOverview() {
@RequestMapping("getPayOverview")
public Result<PersonPayOverviewVo> 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<SalesVolumeOverviewVo> getSalesVolumeOverview() {
String begin = parmsUtil.getString("beginTime", "开始时间为空");
@ -77,7 +89,9 @@ public class StatisticsController extends BaseController {
return success(salesVolumeOverviewVo);
}
/**
* 销售人员统计
*/
@RequestMapping("/salePerson")
public Result<List<SalePersonReportVo>> salePerson() {
return success( statisticsService.salePersonReport());
@ -86,8 +100,8 @@ public class StatisticsController extends BaseController {
/**
* 获取收费队列 就诊队列数量
*/
@RequestMapping("/getTipCount")
public Result<TipCountVo> getTipCount() {
@RequestMapping("/getQueueCount")
public Result<TipCountVo> getQueueCount() {
String begin = parmsUtil.getString("beginTime", "开始时间为空");
String end = parmsUtil.getString("endTime", "结束时间为空");
LocalDateTime beginTime = DateUtil.getDateTime(begin);

76
src/main/java/com/syjiaer/clinic/server/controller/vip/VipController.java
View File

@ -1,76 +0,0 @@
package com.syjiaer.clinic.server.controller.vip;
///**
// * <p>
// * 商品 前端控制器
// * </p>
// *
// * @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<Object> create() {
// Vip vip = parmsUtil.getObject("vipInfo", Vip.class);
// vipService.create(vip);
//
// return success();
// }
//
// @RequestMapping("/update")
// public Result<Object> update() {
// Vip vip = parmsUtil.getObject("vipInfo", Vip.class);
//
// vipService.update(vip);
//
// return success();
// }
//
// @RequestMapping("/delete")
// public Result<Integer> delete() {
// int vipId = parmsUtil.getInteger("id", "ID不能为空");
// return success(vipService.removeById(vipId));
// }
//
// @RequestMapping("/list")
// public Result<Page<Vip>> selectList() {
// String keyword = parmsUtil.getString("keyword");
// int page = parmsUtil.getInteger("page", "请输入页码");
// int pageSize = parmsUtil.getInteger("pageSize", "请输入每页条数");
// Page<Vip> list = vipService.pageList(keyword, page, pageSize);
// return success(list);
// }
//
// @RequestMapping("/get")
// public Result<Vip> get() {
// int id = parmsUtil.getInteger("id", "ID不能为空");
// Vip vip = vipService.getById(id);
// return success(vip);
// }
//
// @RequestMapping("/search")
// public Result<List<Vip>> search() {
// String keyword = parmsUtil.getString("keyword", "关键字不能为空");
// List<Vip> 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();
// }
//
//
//}

2
src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/MedicalRecordSaveDto.java → src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/DiagnosisDto.java
View File

@ -9,7 +9,7 @@ import java.util.List;
@Getter
@Setter
public class MedicalRecordSaveDto {
public class DiagnosisDto {
@ApiModelProperty("自增id")
private Integer id;

4
src/main/java/com/syjiaer/clinic/server/service/diagnosis/DiagnosisService.java
View File

@ -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<Diagnosis> queryWrapperRegis = new QueryWrapper<>();

4
src/main/java/com/syjiaer/clinic/server/service/social/SocialReconciliationService.java
View File

@ -367,8 +367,12 @@ public class SocialReconciliationService extends BaseService {
try {
totalDo(dto,true);
}catch (Exception e){
String isDev = System.getenv("IsDev");
if (isDev != null &&isDev.equals("true")) {
log.error("对账失败",e);
}
}
//
}
}