diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2204.java b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2204.java new file mode 100644 index 0000000..13d6653 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/common/api/input/IM2204.java @@ -0,0 +1,88 @@ +package com.syjiaer.clinic.server.common.api.input; + +import com.syjiaer.clinic.server.common.api.annotations.IMField; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class IM2204 extends BaseInputModel{ + @IMField(key = "feedetail", name = "费用明细列表", required = true) + private List feedetail; + public static class Feedetail { + @IMField(key = "feedetl_sn", name = "费用明细流水号", required = true) + private String feedetl_sn; + @IMField(key = "mdtrt_id", name = "就诊ID", required = true) + private String mdtrt_id; + @IMField(key = "psn_no", name = "人员编号", required = true) + private String psn_no; + @IMField(key = "chrg_bchno", name = "收费批次号", required = true) + private String chrg_bchno; + @IMField(key = "dise_codg", name = "病种编码") + private String dise_codg; + @IMField(key = "rxno", name = "处方号") + private String rxno; + @IMField(key = "rx_circ_flag", name = "外购处方标志", required = true) + private String rx_circ_flag; + @IMField(key = "fee_ocur_time", name = "费用发生时间", required = true) + private LocalDateTime fee_ocur_time; + @IMField(key = "med_list_codg", name = "医疗目录编码", required = true) + private String med_list_codg; + @IMField(key = "medins_list_codg", name = "医药机构目录编码", required = true) + private String medins_list_codg; + @IMField(key = "det_item_fee_sumamt", name = "明细项目费用总额", required = true) + private BigDecimal det_item_fee_sumamt; + @IMField(key = "cnt", name = "数量", required = true) + private BigDecimal cnt; + @IMField(key = "pric", name = "单价", required = true) + private BigDecimal pric; + @IMField(key = "sin_dos_dscr", name = "单次剂量描述") + private String sin_dos_dscr; + @IMField(key = "used_frqu_dscr", name = "使用频次描述") + private String used_frqu_dscr; + @IMField(key = "prd_days", name = "周期天数") + private BigDecimal prd_days; + @IMField(key = "medc_way_dscr", name = "用药途径描述") + private String medc_way_dscr; + @IMField(key = "bilg_dept_codg", name = "开单科室编码", required = true) + private String bilg_dept_codg; + @IMField(key = "bilg_dept_name", name = "开单科室名称", required = true) + private String bilg_dept_name; + @IMField(key = "bilg_dr_codg", name = "开单医生编码", required = true) + private String bilg_dr_codg; + @IMField(key = "bilg_dr_name", name = "开单医师姓名", required = true) + private String bilg_dr_name; + @IMField(key = "acord_dept_codg", name = "受单科室编码") + private String acord_dept_codg; + @IMField(key = "acord_dept_name", name = "受单科室名称") + private String acord_dept_name; + @IMField(key = "orders_dr_code", name = "受单医生编码") + private String orders_dr_code; + @IMField(key = "orders_dr_name", name = "受单医生姓名") + private String orders_dr_name; + @IMField(key = "hosp_appr_flag", name = "医院审批标志", required = true) + private String hosp_appr_flag; + @IMField(key = "tcmdrug_used_way", name = "中药使用方式", required = true) + private String tcmdrug_used_way; + @IMField(key = "etip_flag", name = "外检标志", required = true) + private String etip_flag; + @IMField(key = "etip_hosp_code", name = "外检医院编码") + private String etip_hosp_code; + @IMField(key = "dscg_tkdrug_flag", name = "出院带药标志", required = true) + private String dscg_tkdrug_flag; + @IMField(key = "matn_fee_flag", name = "生育费用标志", required = true) + private String matn_fee_flag; + @IMField(key = "comb_no", name = "组套编号") + private String comb_no; + @IMField(key = "exp_content", name = "字段扩展") + private String exp_content; + } +} diff --git a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java index d700faa..c3f292a 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/charge/ChargeController.java @@ -3,8 +3,8 @@ package com.syjiaer.clinic.server.controller.charge; import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.controller.BaseController; import com.syjiaer.clinic.server.entity.charge.ChargeOrder; -import com.syjiaer.clinic.server.entity.charge.dto.ChargeOrderDto; import com.syjiaer.clinic.server.entity.charge.dto.ChargeQuery; +import com.syjiaer.clinic.server.entity.charge.dto.ChargeSaveDto; import com.syjiaer.clinic.server.service.charge.ChargeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,10 +17,9 @@ public class ChargeController extends BaseController { private ChargeService chargeService; @RequestMapping("/save") public Result save() { - ChargeOrderDto dto = parmsUtil.getObject("data", ChargeOrderDto.class); -// ChargeOrder chargeOrder = chargeService.updateOrCreate(dto); -// return success(chargeOrder.getId()); - return success(); + ChargeSaveDto dto = parmsUtil.getObject("data", ChargeSaveDto.class); + ChargeOrder chargeOrder = chargeService.save(dto); + return success(chargeOrder.getId()); } @RequestMapping("/list") diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java index 2b68e89..4b7ffb9 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/ChargeOrder.java @@ -14,18 +14,18 @@ import lombok.ToString; import lombok.experimental.Accessors; /** *

- * + * 收费主表 *

* * @author NiuZiYuan - * @since 2025-04-22 + * @since 2025-04-24 */ @Getter @Setter @ToString @Accessors(chain = true) @TableName("charge_order") -@ApiModel(value = "ChargeOrder对象", description = "") +@ApiModel(value = "ChargeOrder对象", description = "收费主表") public class ChargeOrder implements Serializable { private static final long serialVersionUID = 1L; @@ -64,12 +64,6 @@ public class ChargeOrder implements Serializable { @ApiModelProperty("医保用户id") private Integer socialUserId; - @ApiModelProperty("销售人id") - private Integer salePersonId; - - @ApiModelProperty("病例id") - private Integer medicalRecordId; - - @ApiModelProperty("患者姓名") - private String patientName; + @ApiModelProperty("诊断code") + private String diagnosisCode; } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeOrderDto.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeOrderDto.java deleted file mode 100644 index 8c46b80..0000000 --- a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeOrderDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.syjiaer.clinic.server.entity.charge.dto; - -import com.syjiaer.clinic.server.entity.charge.ChargeItemList; -import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; -import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; -import com.syjiaer.clinic.server.entity.patient.PatientInfo; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; -@Data -public class ChargeOrderDto { - - private Long id; - private String code; - private Long managerUserId; - private Double preTotalPrice; - private Double totalPrice; - private LocalDateTime createDatetime; - private Integer status; - private String payType; - private LocalDateTime payTime; - private Long socialUserId; - private Long salePersonId; - private Long medicalRecordId; - private PatientInfo patientInfo; - private DiagnosisMedicalRecord diagnosisMedicalRecord; - private List serviceDetail; - private List goodsDetail; - - - -} \ No newline at end of file diff --git a/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java new file mode 100644 index 0000000..c3b8795 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/charge/dto/ChargeSaveDto.java @@ -0,0 +1,41 @@ +package com.syjiaer.clinic.server.entity.charge.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; +import com.syjiaer.clinic.server.entity.patient.PatientInfo; +import com.syjiaer.clinic.server.entity.patient.PatientRegistration; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +public class ChargeSaveDto { + @ApiModelProperty("自增id") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("患者id") + private Integer patientId; + + @ApiModelProperty("诊断code") + private String code; + + @ApiModelProperty("挂单id") + private Integer registrationId; + @ApiModelProperty("挂单信息") + private PatientRegistration patientRegistration; + @ApiModelProperty("患者信息") + private PatientInfo patientInfo; + @ApiModelProperty("病例信息") + private DiagnosisMedicalRecord diagnosisMedicalRecord; + @ApiModelProperty("诊疗服务") + private List itemDetail; + @ApiModelProperty("药品耗材") + private List goodsDetail; +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java index 4b4d5fe..7ef3143 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java @@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.entity.diagnosis.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalGoodsList; import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList; import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord; @@ -22,8 +23,8 @@ public class MedicalRecordVo { @ApiModelProperty("患者id") private Integer patientId; - @ApiModelProperty("接诊医生id") - private Integer dockerId; + @ApiModelProperty("诊断code") + private String code; @ApiModelProperty("挂单id") private Integer registrationId; @@ -36,5 +37,5 @@ public class MedicalRecordVo { @ApiModelProperty("诊疗服务") private List itemDetail; @ApiModelProperty("药品耗材") - private List goodsDetail; + private List goodsDetail; } diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java index 8488d40..8915de7 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeGoodsListMapper.java @@ -22,5 +22,8 @@ public interface ChargeGoodsListMapper extends BaseMapper { "from charge_goods_list as cg LEFT JOIN goods ON cg.goods_id = goods.\"id\" WHERE cg.charge_order_code = #{code} ") List selectDetailByCode(@Param("code")String code); + @Select("select * from charge_goods_list WHERE charge_order_code = #{code} ") + List selectByCode(@Param("code")String code); + } diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java index dbfc59f..9039662 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeItemListMapper.java @@ -2,6 +2,9 @@ package com.syjiaer.clinic.server.mapper.charge; import com.syjiaer.clinic.server.entity.charge.ChargeItemList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** @@ -13,6 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2025-04-24 */ public interface ChargeItemListMapper extends BaseMapper { - + @Select("select * from charge_item_list WHERE charge_order_code = #{code}") + List selectByCode(String code); } diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java index 2413f83..f89ace6 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java @@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.mapper.charge; import com.syjiaer.clinic.server.entity.charge.ChargeOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; /** @@ -13,6 +14,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2025-04-22 */ public interface ChargeOrderMapper extends BaseMapper { + @Select("select * from charge_order where code = #{code}") + ChargeOrder selectByCode(String code); } diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java index d31f0ac..d1c321c 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalGoodsListMapper.java @@ -1,7 +1,9 @@ package com.syjiaer.clinic.server.mapper.diagnosis; +import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalGoodsList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -19,5 +21,9 @@ public interface DiagnosisMedicalGoodsListMapper extends BaseMapper listByDiagnosisCode(String code); + + @Select("select dmgl.unit as selected_unit ,dmgl.unit_price as selected_price,dmgl.\"number\" as selected_num,goods.* " + + "from diagnosis_medical_goods_list as dmgl LEFT JOIN goods ON dmgl.goods_id = goods.\"id\" WHERE dmgl.diagnosis_code = #{code} ") + List selectDetailByCode(@Param("code")String code); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index d57b5cb..1f473df 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -1,6 +1,7 @@ package com.syjiaer.clinic.server.service.charge; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.syjiaer.clinic.server.common.api.input.IM2204; import com.syjiaer.clinic.server.common.constants.Constants; import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum; import com.syjiaer.clinic.server.common.enums.InventoryTypeEnum; @@ -11,24 +12,29 @@ import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.charge.ChargeGoodsList; import com.syjiaer.clinic.server.entity.charge.ChargeItemList; import com.syjiaer.clinic.server.entity.charge.ChargeOrder; -import com.syjiaer.clinic.server.entity.charge.dto.ChargeOrderDto; 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.ChargeGoodsListVo; +import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; +import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList; import com.syjiaer.clinic.server.entity.goods.Goods; import com.syjiaer.clinic.server.entity.inventory.InventoryLog; import com.syjiaer.clinic.server.entity.manager.ManagerUser; import com.syjiaer.clinic.server.entity.organization.OrganizationMember; -import com.syjiaer.clinic.server.entity.patient.PatientInfo; +import com.syjiaer.clinic.server.entity.organization.OrganizationSection; import com.syjiaer.clinic.server.entity.patient.PatientRegistration; import com.syjiaer.clinic.server.mapper.charge.ChargeGoodsListMapper; import com.syjiaer.clinic.server.mapper.charge.ChargeItemListMapper; import com.syjiaer.clinic.server.mapper.charge.ChargeOrderMapper; +import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMapper; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; import com.syjiaer.clinic.server.mapper.inventory.InventoryLogMapper; import com.syjiaer.clinic.server.mapper.diagnosis.DiagnosisMedicalRecordMapper; import com.syjiaer.clinic.server.mapper.organization.OrganizationMemberMapper; +import com.syjiaer.clinic.server.mapper.organization.OrganizationSectionMapper; import com.syjiaer.clinic.server.mapper.patient.PatientInfoMapper; +import com.syjiaer.clinic.server.mapper.patient.PatientRegistrationMapper; import com.syjiaer.clinic.server.service.BaseService; import com.syjiaer.clinic.server.service.inventory.InventoryService; import com.syjiaer.clinic.server.service.patient.PatientRegistrationService; @@ -57,14 +63,13 @@ public class ChargeService extends BaseService { @Autowired private PatientInfoMapper patientInfoMapper; @Autowired - private DiagnosisMedicalRecordMapper diagnosisMedicalRecordMapper; + private DiagnosisMapper diagnosisMapper; + @Autowired + private PatientRegistrationMapper patientRegistrationMapper; @Autowired private OrganizationMemberMapper organizationMemberMapper; @Autowired - private PatientRegistrationService patientRegistrationService; - @Autowired - @Lazy - private ChargeService chargeService; + private OrganizationSectionMapper organizationSectionMapper; @Autowired private InventoryService inventoryService; @Autowired @@ -72,7 +77,7 @@ public class ChargeService extends BaseService { @Transactional(rollbackFor = Exception.class) - public ChargeOrder save(ChargeOrderDto dto){ + public ChargeOrder save(ChargeSaveDto dto){ ChargeOrder dbOrder = chargeOrderMapper.selectById(dto.getId()); if (dbOrder != null){ //清除已有的订单 @@ -88,7 +93,7 @@ public class ChargeService extends BaseService { BigDecimal preTotalPrice = BigDecimal.ZERO; BigDecimal totalPrice = BigDecimal.ZERO; List chargeServiceLists = new ArrayList<>(); - for (ChargeItemList service : dto.getServiceDetail()){ + for (DiagnosisMedicalItemList service : dto.getItemDetail()){ ChargeItemList itemList = new ChargeItemList(); String fsn = StringUtil.getCode("FSN"); itemList.setChargeOrderCode(code); @@ -147,8 +152,7 @@ public class ChargeService extends BaseService { chargeOrder.setCreateDatetime(nowLocalDateTime); chargeOrder.setStatus(RetailOrderStatusEnum.UNFINISHED.getCode()); chargeOrder.setPatientId(dto.getPatientInfo().getId()); - chargeOrder.setSalePersonId(user.getId()); - chargeOrder.setMedicalRecordId(dto.getDiagnosisMedicalRecord().getId()); + chargeOrder.setDiagnosisCode(dto.getCode()); chargeOrderMapper.insert(chargeOrder); return chargeOrder; @@ -171,7 +175,6 @@ public class ChargeService extends BaseService { for (ChargeOrder chargeOrder : orderPage.getList()){ ChargeDetailVo detailVo = new ChargeDetailVo(); BeanUtils.copyProperties(chargeOrder, detailVo); - detailVo.setDiagnosisMedicalRecord(diagnosisMedicalRecordMapper.selectById(chargeOrder.getMedicalRecordId())); detailVo.setPatientInfo(patientInfoMapper.selectById(chargeOrder.getPatientId())); detailVo.setServiceDetail(chargeItemListMapper.selectList(new QueryWrapper() .eq("charge_order_code", chargeOrder.getCode()))); @@ -234,7 +237,6 @@ public class ChargeService extends BaseService { } List logs = inventoryService.adjustNumberByGoodsId(goodsList.getId(), wholeNumber, fragmentNumber, "订单完成"); for (InventoryLog log : logs) { - log.setOperateName(order.getPatientName()); log.setOperateId(order.getPatientId()); log.setType(InventoryTypeEnum.GRANT_OUT.getType()); log.setSocialType(InventorySocialTypeEnum.INVENTORY_SURPLUS.getType()); @@ -243,5 +245,25 @@ public class ChargeService extends BaseService { } } + public void uploadCostDetails(String changeOrderCode) { + ChargeOrder order = chargeOrderMapper.selectByCode(changeOrderCode); + Diagnosis diagnosis = diagnosisMapper.selectByCode(order.getDiagnosisCode()); + + PatientRegistration registration = patientRegistrationMapper.selectById(diagnosis.getRegistrationId()); + + + OrganizationMember docker = organizationMemberMapper.selectById(registration.getOrganizationDoctorId()); + OrganizationSection section = organizationSectionMapper.selectById(registration.getOrganizationSectionId()); + + List goodsLists = chargeGoodsListMapper.selectByCode(changeOrderCode); + List itemLists = chargeItemListMapper.selectByCode(changeOrderCode); + + IM2204 im2204 = new IM2204(); + for (ChargeGoodsList goodsList : goodsLists){ + + } + + + } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java index 01a4a8f..3f19030 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java @@ -10,6 +10,7 @@ import com.syjiaer.clinic.server.common.enums.RegistrationStatusEnum; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.StringUtil; import com.syjiaer.clinic.server.common.vo.Page; +import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo; import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery; import com.syjiaer.clinic.server.entity.goods.Goods; @@ -180,7 +181,7 @@ public class MedicalRecordService extends BaseService { List serverDetail = diagnosisMedicalItemListMapper.listByDiagnosisCode(diaItem.getCode()); vo.setItemDetail(serverDetail); - List goodsDetail = diagnosisMedicalGoodsListMapper.listByDiagnosisCode(diaItem.getCode()); + List goodsDetail = diagnosisMedicalGoodsListMapper.selectDetailByCode(diaItem.getCode()); vo.setGoodsDetail(goodsDetail); mrvList.add(vo); } @@ -211,7 +212,7 @@ public class MedicalRecordService extends BaseService { List itemDetail = diagnosisMedicalItemListMapper.listByDiagnosisCode(diagnosis.getCode()); vo.setItemDetail(itemDetail); - List goodsDetail = diagnosisMedicalGoodsListMapper.listByDiagnosisCode(diagnosis.getCode()); + List goodsDetail = diagnosisMedicalGoodsListMapper.selectDetailByCode(diagnosis.getCode()); vo.setGoodsDetail(goodsDetail); return vo; }