merge

fs-doctor-app/src/main/java/com/fs/app/controller/DiagnosisController.java

@@ -1,15 +1,14 @@
 package com.fs.app.controller;
 
 import com.fs.common.core.domain.R;
+import com.fs.his.param.FsDiagnosisFillDParam;
 import com.fs.his.param.FsDiagnosisListDParam;
 import com.fs.his.service.IFsFirstDiagnosisService;
 import com.fs.his.vo.FsDiagnosisListDVO;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -28,4 +27,10 @@ public class DiagnosisController extends AppBaseController{
         PageInfo<FsDiagnosisListDVO> pageInfo = new PageInfo<>(diagnosisList);
         return R.ok().put("data", pageInfo);
     }
+
+    @PutMapping("/fill")
+    public R fill(@RequestBody FsDiagnosisFillDParam param){
+        param.setDoctorId(Long.parseLong(getDoctorId()));
+        return diagnosisService.fill(param);
+    }
 }

fs-service/src/main/java/com/fs/his/mapper/FsFirstDiagnosisMapper.java

@@ -73,7 +73,7 @@ public interface FsFirstDiagnosisMapper extends BaseMapper<FsFirstDiagnosis>{
     FsFirstDiagnosis getByUserId(Long userId);
 
     @Select({"<script> " +
-            "SELECT id,doctor_id,patient_name,gender,age,phone,date_time FROM fs_first_diagnosis " +
+            "SELECT id,doctor_id,patient_name,gender,age,phone,date_time,physical_condition,doctor_status,user_status FROM fs_first_diagnosis " +
             "WHERE 1 = 1" +
             "<if test='maps.type == 0' > and  doctor_status = 0 and doctor_id is null</if>" +
             "<if test='maps.type == 1' > and  doctor_id = #{maps.doctorId}</if>" +

fs-service/src/main/java/com/fs/his/param/FsDiagnosisFillDParam.java

@@ -0,0 +1,17 @@
+package com.fs.his.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class FsDiagnosisFillDParam {
+    private Long id;
+    private String firstDiagnosis;
+    private String physicalCondition;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dateTime;
+    private Long doctorId;
+
+}

fs-service/src/main/java/com/fs/his/service/IFsFirstDiagnosisService.java

@@ -2,9 +2,11 @@ package com.fs.his.service;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.common.core.domain.R;
 import com.fs.course.param.FsFirstDiagnosisListUParam;
 import com.fs.course.vo.FsFirstDiagnosisListUVO;
 import com.fs.his.domain.FsFirstDiagnosis;
+import com.fs.his.param.FsDiagnosisFillDParam;
 import com.fs.his.param.FsDiagnosisListDParam;
 import com.fs.his.vo.FsDiagnosisListDVO;
 import org.apache.ibatis.annotations.Param;
@@ -74,6 +76,8 @@ public interface IFsFirstDiagnosisService extends IService<FsFirstDiagnosis>{
 
     List<FsDiagnosisListDVO> getDiagnosisList(FsDiagnosisListDParam param);
 
+    R fill(FsDiagnosisFillDParam param);
+
     List<FsFirstDiagnosisListUVO> selectFsFirstDiagnosisListUVO(FsFirstDiagnosisListUParam param);
 
     FsFirstDiagnosisListUVO getInfo(Long id);

fs-service/src/main/java/com/fs/his/service/impl/FsFirstDiagnosisServiceImpl.java

@@ -2,12 +2,17 @@ package com.fs.his.service.impl;
 
 import java.util.Collections;
 import java.util.List;
+
+import com.fs.common.core.domain.R;
+import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.course.param.FsFirstDiagnosisListUParam;
 import com.fs.course.vo.FsFirstDiagnosisListUVO;
+import com.fs.his.param.FsDiagnosisFillDParam;
 import com.fs.his.param.FsDiagnosisListDParam;
 import com.fs.his.vo.FsDiagnosisListDVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsFirstDiagnosisMapper;
@@ -124,4 +129,19 @@ public class FsFirstDiagnosisServiceImpl extends ServiceImpl<FsFirstDiagnosisMap
     public FsFirstDiagnosisListUVO getInfo(Long id) {
         return diagnosisMapper.getInfo(id);
     }
+
+    @Override
+    public R fill(FsDiagnosisFillDParam param) {
+        if (param.getId() == null) {
+            throw new CustomException("初诊单id不能为空");
+        }
+        FsFirstDiagnosis diagnosis = new FsFirstDiagnosis();
+        BeanUtils.copyProperties(param, diagnosis);
+        diagnosis.setDoctorStatus(1);
+        int i = diagnosisMapper.updateFsFirstDiagnosis(diagnosis);
+        if (i > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
 }

fs-service/src/main/java/com/fs/his/vo/FsDiagnosisListDVO.java

@@ -20,7 +20,14 @@ public class FsDiagnosisListDVO {
 
     private String firstDiagnosis;
 
+    private String age;
+
+    private String physicalCondition;
+
     /** 日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date dateTime;
+
+    private Integer doctorStatus;
+    private Integer userStatus;
 }