deb

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

@@ -42,6 +42,14 @@ public class ChargeController extends BaseController {
         chargeService.completeOrder(id,payType);
         return success();
     }
+    @RequestMapping("/getByCode")
+    public Result<Object> getByCode() {
+        String code = parmsUtil.getString("code");
+        return success(chargeService.getByCode(code));
+    }
+
+
+
     @RequestMapping("/uploadCostDetails")
     public Result<Object> uploadCostDetails() {
         String changeOrderCode = parmsUtil.getString("changeOrderCode");

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

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.controller.common;
 
+import com.syjiaer.clinic.server.common.annotations.NoAuthCheck;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -28,11 +29,13 @@ public class FileController extends BaseController {
     private FileService fileService;
 
     @RequestMapping("/upload")
+    @NoAuthCheck
     public Result<?> handleFileUpload(@RequestParam("file") MultipartFile file) {
 
         return success(fileService.uploadFile(file));
     }
     @GetMapping("/getImage/{fileName}")
+    @NoAuthCheck
     public  ResponseEntity<Resource> getImage(@PathVariable String fileName) {
         return  fileService.getImage(fileName);
 

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

@@ -59,9 +59,11 @@ public class GoodsController extends BaseController {
         if (goods.getPricingModel().equals(GoodsPricingModelEnum.Fixed.getPricingModel()) && goods.getUnitPrice() == null) {
             return error("固定售价不能为空");
         }
+        if (goods.getPackagingUnit() == null){
+            return error("包装单位不能为空");
+        }
         if (goods.getIdCode() != null && goods.getIdCode().isEmpty()){
             goods.setIdCode(null);
-
         }
         Goods dbGoods = goodsService.createGoods(goods);
 

src/main/java/com/syjiaer/clinic/server/entity/charge/vo/ChargeItemListVo.java

@@ -0,0 +1,52 @@
+package com.syjiaer.clinic.server.entity.charge.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+@Data
+public class ChargeItemListVo {
+
+    @ApiModelProperty("自增主键")
+    private Integer id;
+
+    @ApiModelProperty("项目创建时间")
+    private LocalDateTime createDatetime;
+
+    @ApiModelProperty("项目创建人")
+    private String createBy;
+
+    @ApiModelProperty("项目修改时间")
+    private LocalDateTime updateDatetime;
+
+    @ApiModelProperty("项目修改人")
+    private String updateBy;
+
+    @ApiModelProperty("项目名称")
+    private String itemName;
+
+    @ApiModelProperty("项目医保目录编码")
+    private String itemSocialCode;
+
+    @ApiModelProperty("单位")
+    private String unit;
+
+    @ApiModelProperty("售价")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("进货价")
+    private BigDecimal purchaseUnitPrice;
+
+    @ApiModelProperty("逻辑删除")
+    private Integer delFlag;
+
+    @ApiModelProperty("选择的单价")
+    private BigDecimal selectedPrice;
+    @ApiModelProperty("选择的数量")
+    private Integer selectedNum;
+    @ApiModelProperty("选择的单位")
+    private String selectedUnit;
+}

src/main/java/com/syjiaer/clinic/server/entity/diagnosis/vo/MedicalRecordVo.java

@@ -3,6 +3,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.charge.vo.ChargeItemListVo;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalGoodsList;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalRecord;
@@ -28,6 +29,8 @@ public class MedicalRecordVo {
 
     @ApiModelProperty("挂单id")
     private Integer registrationId;
+    @ApiModelProperty("状态")
+    private Integer status;
     @ApiModelProperty("挂单信息")
     private PatientRegistration patientRegistration;
     @ApiModelProperty("患者信息")
@@ -35,7 +38,7 @@ public class MedicalRecordVo {
     @ApiModelProperty("病例信息")
     private DiagnosisMedicalRecord diagnosisMedicalRecord;
     @ApiModelProperty("诊疗服务")
-    private List<DiagnosisMedicalItemList> itemDetail;
+    private List<ChargeItemListVo> itemDetail;
     @ApiModelProperty("药品耗材")
     private List<ChargeGoodsListVo> goodsDetail;
 }

src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMedicalItemListMapper.java

@@ -1,7 +1,10 @@
 package com.syjiaer.clinic.server.mapper.diagnosis;
 
+import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
+import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo;
 import com.syjiaer.clinic.server.entity.diagnosis.DiagnosisMedicalItemList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -18,5 +21,13 @@ import java.util.List;
 public interface DiagnosisMedicalItemListMapper extends BaseMapper<DiagnosisMedicalItemList> {
     @Select("select * from diagnosis_medical_item_list where diagnosis_code = #{medicalRecordId}")
     List<DiagnosisMedicalItemList> listByDiagnosisCode(String code);
+    @Select("SELECT" +
+            "  dmil.unit AS selected_unit," +
+            "  dmil.unit_price AS selected_price," +
+            "  dmil.number AS selected_num," +
+            "  item.*" +
+            " FROM diagnosis_medical_item_list AS dmil LEFT JOIN item ON dmil.item_id = item.id" +
+            " WHERE dmil.diagnosis_code = #{code} ")
+    List<ChargeItemListVo> selectDetailByCode(String code);
 }
 

src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java

@@ -255,7 +255,7 @@ public class ChargeService extends BaseService {
         if (order == null) {
             throw new MessageException("订单不存在");
         }
-        Diagnosis diagnosis = diagnosisMapper.selectById(order.getDiagnosisCode());
+        Diagnosis diagnosis = diagnosisMapper.selectByCode(order.getDiagnosisCode());
         if (diagnosis == null) {
             throw new MessageException("诊断信息不存在");
         }
@@ -266,6 +266,7 @@ public class ChargeService extends BaseService {
         Diagnosis updateDiagnosis = new Diagnosis();
         updateDiagnosis.setId(diagnosis.getId());
         updateDiagnosis.setStatus(1);
+        diagnosisMapper.updateById(updateDiagnosis);
         //完成订单
         ChargeOrder updateOrder = new ChargeOrder();
         updateOrder.setId(id);
@@ -476,4 +477,10 @@ public class ChargeService extends BaseService {
         }
         return paymentMethodVo;
     }
+
+    public ChargeOrder getByCode(String code) {
+        QueryWrapper<ChargeOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("code", code);
+        return  chargeOrderMapper.selectOne(queryWrapper);
+    }
 }

src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java

@@ -10,7 +10,9 @@ 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.ChargeDetailVo;
 import com.syjiaer.clinic.server.entity.charge.vo.ChargeGoodsListVo;
+import com.syjiaer.clinic.server.entity.charge.vo.ChargeItemListVo;
 import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis;
 import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery;
 import com.syjiaer.clinic.server.entity.diagnosis.dto.ItemRetailDto;
@@ -185,7 +187,7 @@ public class MedicalRecordService extends BaseService {
             DiagnosisMedicalRecord diagnosisMedicalRecord = diagnosisMedicalRecordMapper.selectByDiagnosisCode(diaItem.getCode());
             vo.setDiagnosisMedicalRecord(diagnosisMedicalRecord);
 
-            List<DiagnosisMedicalItemList> serverDetail = diagnosisMedicalItemListMapper.listByDiagnosisCode(diaItem.getCode());
+            List<ChargeItemListVo> serverDetail = diagnosisMedicalItemListMapper.selectDetailByCode(diaItem.getCode());
             vo.setItemDetail(serverDetail);
 
             List<ChargeGoodsListVo> goodsDetail = diagnosisMedicalGoodsListMapper.selectDetailByCode(diaItem.getCode());
@@ -216,7 +218,7 @@ public class MedicalRecordService extends BaseService {
         DiagnosisMedicalRecord diagnosisMedicalRecord = diagnosisMedicalRecordMapper.selectByDiagnosisCode(diagnosis.getCode());
         vo.setDiagnosisMedicalRecord(diagnosisMedicalRecord);
 
-        List<DiagnosisMedicalItemList> itemDetail = diagnosisMedicalItemListMapper.listByDiagnosisCode(diagnosis.getCode());
+        List<ChargeItemListVo> itemDetail = diagnosisMedicalItemListMapper.selectDetailByCode(diagnosis.getCode());
         vo.setItemDetail(itemDetail);
 
         List<ChargeGoodsListVo> goodsDetail = diagnosisMedicalGoodsListMapper.selectDetailByCode(diagnosis.getCode());