医生端填写初诊单

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

@@ -33,4 +33,9 @@ public class DiagnosisController extends AppBaseController{
         param.setDoctorId(Long.parseLong(getDoctorId()));
         return diagnosisService.fill(param);
     }
+
+    @GetMapping("/{id}")
+    public R detail(@PathVariable("id") Long id){
+        return R.ok().put("data", diagnosisService.selectFsFirstDiagnosisById(id));
+    }
 }

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

@@ -77,6 +77,7 @@ public interface FsFirstDiagnosisMapper extends BaseMapper<FsFirstDiagnosis>{
             "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>" +
+            "<if test='maps.patientName != null'> and patient_name like concat('%',#{maps.patientName},'%')</if>" +
             "ORDER BY create_time desc" +
             "</script>"})
     List<FsDiagnosisListDVO> selectFsDiagnosisListDVO(@Param("maps") FsDiagnosisListDParam param);

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

@@ -10,4 +10,9 @@ public class FsDiagnosisListDParam extends BaseParam{
      * 0-全部 1-我的
      */
     private Integer type;
+
+    /**
+     * 患者姓名
+     */
+    private String patientName;
 }

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

@@ -174,7 +174,7 @@ public class FsFirstDiagnosisServiceImpl extends ServiceImpl<FsFirstDiagnosisMap
         if (param.getId() == null) {
             return R.error("初诊单id不能为空");
         }
-        FsFirstDiagnosis diagnosis = diagnosisMapper.selectById(param.getId());
+        FsFirstDiagnosis diagnosis = diagnosisMapper.selectFsFirstDiagnosisById(param.getId());
         FsFirstDiagnosis map = new FsFirstDiagnosis();
         if (diagnosis == null) {
             return R.error("初诊单不存在");
@@ -191,7 +191,8 @@ public class FsFirstDiagnosisServiceImpl extends ServiceImpl<FsFirstDiagnosisMap
         }
         map.setId(diagnosis.getId());
         map.setDoctorStatus(1);
-        int i = diagnosisMapper.updateFsFirstDiagnosis(diagnosis);
+        BeanUtils.copyProperties(param, map);
+        int i = diagnosisMapper.updateFsFirstDiagnosis(map);
         if (i > 0) {
             return R.ok();
         }