deb

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

@@ -108,4 +108,5 @@ public class ChargeController extends BaseController {
     }
 
 
+
 }

src/main/java/com/syjiaer/clinic/server/controller/diagnosis/MedicalRecordController.java

@@ -5,6 +5,7 @@ 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.vo.ChargeQueueVo;
 import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalRecordVo;
 import com.syjiaer.clinic.server.entity.patient.vo.SeeDoctorInfoVo;
 import com.syjiaer.clinic.server.service.diagnosis.MedicalRecordService;
@@ -55,7 +56,7 @@ public class MedicalRecordController extends BaseController {
      * 获取收费队列
      */
     @RequestMapping("/getChargeQueue")
-    public Result<Page<MedicalRecordVo>> getChargeQueue() {
+    public Result<Page<ChargeQueueVo>> getChargeQueue() {
         ChargeQueueQuery query = parmsUtil.getObject("query", ChargeQueueQuery.class);
 
         return success( medicalRecordService.getChargeQueue(query));
@@ -70,5 +71,11 @@ public class MedicalRecordController extends BaseController {
         return success( medicalRecordService.getSeeDockerInfo(regisId));
     }
 
+    @RequestMapping("/getByDiagnosisCode")
+    public Result<MedicalRecordVo> getByDiagnosisCode() {
+        String diagnosisCode = parmsUtil.getString("diagnosisCode", "诊断code不能为空");
+        return success( medicalRecordService.getByDiagnosisCode(diagnosisCode));
+    }
+
 
 }

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

@@ -0,0 +1,33 @@
+package com.syjiaer.clinic.server.entity.diagnosis.vo;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+@Data
+public class ChargeQueueVo {
+
+    @ApiModelProperty("自增id")
+    private Integer id;
+
+    @ApiModelProperty("患者id")
+    private Integer patientId;
+
+    @ApiModelProperty("诊断code")
+    private String code;
+
+    @ApiModelProperty("挂单id")
+    private Integer registrationId;
+    @ApiModelProperty("状态")
+    private Integer status;
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("患者名称")
+    private String patientName;
+    @ApiModelProperty("患者性别")
+    private Integer patientGender;
+}

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

@@ -15,6 +15,7 @@ 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;
+import com.syjiaer.clinic.server.entity.diagnosis.vo.ChargeQueueVo;
 import com.syjiaer.clinic.server.entity.goods.Goods;
 import com.syjiaer.clinic.server.entity.item.Item;
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
@@ -79,6 +80,7 @@ public class MedicalRecordService extends BaseService {
     private DiagnosisMapper diagnosisMapper;
     @Autowired
     private PatientInfoMapper patientInfoMapper;
+
     /*
      * 保存
      * @param saveDto 病历信息
@@ -169,6 +171,7 @@ public class MedicalRecordService extends BaseService {
 
     /**
      * 根据患者的id查询病历
+     *
      * @param patientId
      * @return
      */
@@ -200,6 +203,7 @@ public class MedicalRecordService extends BaseService {
 
     /**
      * 根据挂单号回显病历信息
+     *
      * @param regisId
      * @return
      */
@@ -282,24 +286,27 @@ public class MedicalRecordService extends BaseService {
 
 
     }
-    /*
+
-    获取收费队列
+
-     */
+    public Page<ChargeQueueVo> getChargeQueue(ChargeQueueQuery query) {
-    public Page<MedicalRecordVo> getChargeQueue(ChargeQueueQuery query) {
         QueryWrapper<Diagnosis> queryWrapper = new QueryWrapper<>();
         if (query.getStatus() != null) {
             queryWrapper.eq("status", query.getStatus());
         }
         Page<Diagnosis> diagnosisList = pageHelper(query.getPageNum(), query.getPageSize(), queryWrapper, diagnosisMapper, "create_time", false);
 
-        List<MedicalRecordVo> list = new ArrayList<>();
+        List<ChargeQueueVo> list = new ArrayList<>();
         for (Diagnosis diagnosis : diagnosisList.getList()) {
-            MedicalRecordVo vo = new MedicalRecordVo();
+            ChargeQueueVo vo = new ChargeQueueVo();
-            vo = getDetailByRegisId(diagnosis.getRegistrationId());
+            BeanUtils.copyProperties(diagnosis, vo);
+            PatientRegistration registration = patientRegistrationMapper.selectById(diagnosis.getRegistrationId());
+            vo.setPatientId(registration.getPatientInfoId());
+            vo.setPatientName(registration.getName());
+            vo.setPatientGender(registration.getGender());
             list.add(vo);
         }
 
-        Page<MedicalRecordVo> page = new Page<>();
+        Page<ChargeQueueVo> page = new Page<>();
         page.setList(list);
         page.setTotal_page(diagnosisList.getTotal_page());
         page.setTotal_count(diagnosisList.getTotal_count());
@@ -333,4 +340,9 @@ public class MedicalRecordService extends BaseService {
         vo.setSocialBalance(BigDecimal.ZERO);
         return vo;
     }
+
+    public MedicalRecordVo getByDiagnosisCode(String diagnosisCode) {
+        Diagnosis diagnosis = diagnosisMapper.selectByCode(diagnosisCode);
+        return getDetailByRegisId(diagnosis.getRegistrationId());
+    }
 }