Merge remote-tracking branch 'origin/dev_3.1.0' into dev_3.1.0

virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java

@@ -1,10 +1,7 @@
 package com.supervision.manage.controller.medicalrec;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.supervision.manage.pojo.vo.MedicalAnswerVideoResVo;
-import com.supervision.manage.pojo.vo.MedicalRecInfoVO;
-import com.supervision.manage.pojo.vo.MedicalRecManageVO;
-import com.supervision.manage.pojo.vo.MedicalRecQaVO;
+import com.supervision.manage.pojo.vo.*;
 import com.supervision.manage.service.MedicalRecManageService;
 import com.supervision.model.Disease;
 import com.supervision.vo.manage.DiseaseAncillaryResVo;
@@ -132,13 +129,20 @@ public class MedicalRecManageController {
     }
 
 
-    @Operation(summary = "修改病历状态")
+    @Operation(summary = "修改病历状态 用来上线或下线病历")
     @GetMapping("/updateMedicalStatus")
     public Boolean updateMedicalStatus(@Parameter(name = "medicalRecId", description = "病例id") String medicalRecId,
-                                                    @Parameter(name = "status", description = "病历状态 1：未上线 2：上线") Integer status) {
+                                                    @Parameter(name = "status", description = "病历状态 0：未上线 1：上线") Integer status) {
 
         return medicalRecManageService.updateMedicalStatus(medicalRecId,status);
     }
 
+    @Operation(summary = "保存病历基本信息")
+    @PostMapping("saveMedicalRecBaseInfo")
+    public String saveMedicalRecBaseInfo(@RequestBody MedicalRecBaseInfoReqVo reqVO) {
+        return medicalRecManageService.saveMedicalRecBaseInfo(reqVO);
+    }
+
+
 
 }

virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecBaseInfoReqVo.java

@@ -0,0 +1,40 @@
+package com.supervision.manage.pojo.vo;
+
+import com.supervision.model.MedicalRec;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class MedicalRecBaseInfoReqVo {
+
+
+    @Schema(description = "疾病不能为空 初步诊断")
+    private String diseaseId;
+
+
+    @Schema(description = "姓名")
+    private String patientName;
+
+
+    @Schema(description = "性别  女 / 男")
+    private String patientGender;
+
+
+    @Schema(description = "年龄")
+    private Integer patientAge;
+
+
+    @Schema(description = "患者主诉")
+    private String patientSelfDesc;
+
+
+   public MedicalRec toMedicalRec(){
+        MedicalRec medicalRec = new MedicalRec();
+        medicalRec.setDiseaseId(diseaseId);
+        medicalRec.setPatientName(patientName);
+        medicalRec.setPatientGender(patientGender);
+        medicalRec.setPatientAge(patientAge);
+        medicalRec.setPatientSelfDesc(patientSelfDesc);
+        return medicalRec;
+    }
+}

virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java

@@ -1,10 +1,7 @@
 package com.supervision.manage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.supervision.manage.pojo.vo.MedicalAnswerVideoResVo;
-import com.supervision.manage.pojo.vo.MedicalRecInfoVO;
-import com.supervision.manage.pojo.vo.MedicalRecManageVO;
-import com.supervision.manage.pojo.vo.MedicalRecQaVO;
+import com.supervision.manage.pojo.vo.*;
 import com.supervision.model.Disease;
 import com.supervision.vo.manage.DiseaseAncillaryResVo;
 import com.supervision.vo.manage.DiseasePhysicalResVo;
@@ -50,4 +47,6 @@ public interface MedicalRecManageService {
     void downloadMedicalAnswerTemplate(HttpServletResponse response) throws Exception;
 
     Boolean updateMedicalStatus(String medicalRecId, Integer status);
+
+    String saveMedicalRecBaseInfo(MedicalRecBaseInfoReqVo reqVO);
 }

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java

@@ -8,10 +8,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.supervision.exception.BusinessException;
-import com.supervision.manage.pojo.vo.MedicalAnswerVideoResVo;
-import com.supervision.manage.pojo.vo.MedicalRecInfoVO;
-import com.supervision.manage.pojo.vo.MedicalRecManageVO;
-import com.supervision.manage.pojo.vo.MedicalRecQaVO;
+import com.supervision.manage.pojo.vo.*;
 import com.supervision.manage.service.*;
 import com.supervision.model.*;
 import com.supervision.model.Process;
@@ -413,5 +410,23 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
 
         return medicalRecService.lambdaUpdate().eq(MedicalRec::getId, medicalRecId).set(MedicalRec::getStatus, status).update();
 
+    }
+
+    @Override
+    public String saveMedicalRecBaseInfo(MedicalRecBaseInfoReqVo reqVO) {
+
+        Assert.notEmpty(reqVO.getPatientName(), "患者姓名不能为空");
+        Assert.notEmpty(reqVO.getPatientGender(), "患者性别不能为空");
+        Assert.notNull(reqVO.getPatientAge(), "患者年龄不能为空");
+        Assert.notEmpty(reqVO.getDiseaseId(), "疾病不能为空");
+        Assert.notEmpty(reqVO.getPatientSelfDesc(), "患者主诉不能为空");
+
+        MedicalRec medicalRec = reqVO.toMedicalRec();
+        medicalRec.setStatus(0);
+        medicalRec.insert();
+        return medicalRec.getId();
+
+
+
     }
 }