20210203分享会议记录

tcm/src/main/java/com/ccsens/tcm/api/ConferenceRecordsController.java

@@ -48,13 +48,23 @@ public class ConferenceRecordsController {
     }
 
 
-//    @MustLogin
-//    @ApiOperation(value = "添加会议记录", notes = "zy:")
-//    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-//    public JsonResponse<ConRecVo.SelConRecVo> saveConference(@ApiParam @Validated @RequestBody QueryDto<ConRecDto.SaveConference> params) {
-//        log.info("统计每个医院的完成情况：{}",params);
-//        ConRecVo.SelConRecVo saveConference = patientService.saveConference(params.getParam());
-//        log.info("查找每个医院的病例完成情况");
-//        return JsonResponse.newInstance().ok(saveConference);
-//    }
+    @MustLogin
+    @ApiOperation(value = "添加会议记录", notes = "zy:")
+    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ConRecVo.SelConRecVo> saveConference(@ApiParam @Validated @RequestBody QueryDto<ConRecDto.SaveConference> params) {
+        log.info("统计每个医院的完成情况：{}",params);
+        ConRecVo.SelConRecVo saveConference = conferenceService.saveConference(params.getParam());
+        log.info("查找每个医院的病例完成情况");
+        return JsonResponse.newInstance().ok(saveConference);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "分享会议记录", notes = "zy:")
+    @RequestMapping(value = "/share", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ConRecVo.ShareConRecVo> shareConference(@ApiParam @Validated @RequestBody QueryDto params) throws Exception {
+        log.info("统计每个医院的完成情况：{}",params);
+        ConRecVo.ShareConRecVo shareConference = conferenceService.shareConference(params.getParam());
+        log.info("查找每个医院的病例完成情况");
+        return JsonResponse.newInstance().ok(shareConference);
+    }
 }

tcm/src/main/java/com/ccsens/tcm/bean/vo/ConRecVo.java

@@ -34,4 +34,11 @@ public class ConRecVo {
         @ApiModelProperty("会议纪要")
         private String meetingMinutes;
     }
+
+    @Data
+    @ApiModel("查询会议记录搜索条件")
+    public static class ShareConRecVo {
+        @ApiModelProperty("二维码路径")
+        private String path;
+    }
 }

tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java

@@ -10,71 +10,74 @@ import java.util.List;
  */
 public class QuestionVo {
     @Data
+    @ApiModel("类型信息")
     public static class ReportCodeVo {
-        //id
+        @ApiModelProperty("id")
         private Long id;
-        //code
+        @ApiModelProperty("code")
         private String code;
-        //名称
+        @ApiModelProperty("名称")
         private String name;
-        //上级code
+        @ApiModelProperty("上级code")
         private String parentCode;
-        //是否为必做
+        @ApiModelProperty("是否为必做 0否 1是")
         private Byte must;
-        //第几级code
+        @ApiModelProperty("第几级code")
         private Byte level;
-        //排序
+        @ApiModelProperty("排序")
         private Integer sort;
-        //备注
+        @ApiModelProperty("备注")
         private String remark;
-        //记录类型
+        @ApiModelProperty("记录类型")
         private Byte reportType;
-        //子类型
+        @ApiModelProperty("子类型")
         private List<ReportCodeVo> subReportCodes;
-        //题目信息
+        @ApiModelProperty("题目信息")
         private List<CodeQuestionVo> questionVos;
     }
 
     @Data
+    @ApiModel("题目")
     public static class CodeQuestionVo {
-        //id
+        @ApiModelProperty("id")
         private Long id;
-        //题目名称
+        @ApiModelProperty("题目名称")
         private String question;
-        //code
+        @ApiModelProperty("code")
         private String code;
-        //排序
+        @ApiModelProperty("排序")
         private Integer sort;
-        //单位例如 g/L
+        @ApiModelProperty("单位例如 g/L")
         private String units;
-        //类型 1单行文本,2多行文本,3单选,4多选,5下拉菜单,6日期,7图片(文件),8单选+其他，
-        // 9多选+其他，10下拉+其他，11多选+其他+说明，12单选+关联其他内容 13数字类型
+        @ApiModelProperty("类型 1单行文本,2多行文本,3单选,4多选,5下拉菜单,6日期,7图片(文件),8单选+其他" +
+                " 9多选+其他，10下拉+其他，11多选+其他+说明，12单选+关联其他内容 13数字类型")
         private Byte type;
-        //关联的选项id
+        @ApiModelProperty("关联的选项id")
         private Long relevanceOptionId;
-        //是否是搜索条件
+        @ApiModelProperty("是否是搜索条件")
         private Byte searchCriteria;
-        //备注
+        @ApiModelProperty("备注")
         private String remark;
-        //选项信息
+        @ApiModelProperty("选项信息")
         private List<QuestionOptionVo> optionVos;
     }
 
     @Data
+    @ApiModel("选项")
     public static class QuestionOptionVo {
-        //id
+        @ApiModelProperty("id")
         private Long id;
-        //题目id
+        @ApiModelProperty("题目id")
         private Long questionId;
-        //排序
+        @ApiModelProperty("排序")
         private Integer sort;
-        //显示值
+        @ApiModelProperty("显示值")
         private String showValue;
-        //提交值
+        @ApiModelProperty("提交值")
         private String submitValue;
-        //选择之后的操作 0无 1单行文本 2多行文本 3关联其他题目
+        @ApiModelProperty("选择之后的操作 0无 1单行文本 2多行文本 3关联其他题目")
         private Byte afterOperation;
-        //选择之后关联的题目
+        @ApiModelProperty("选择之后关联的题目")
         private List<CodeQuestionVo> questionVos;
     }
 

tcm/src/main/java/com/ccsens/tcm/service/ConferenceService.java

@@ -1,10 +1,22 @@
 package com.ccsens.tcm.service;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Snowflake;
+import com.ccsens.tcm.bean.dto.ConRecDto;
+import com.ccsens.tcm.bean.po.ConferenceRecords;
+import com.ccsens.tcm.bean.po.ConferenceRecordsExample;
+import com.ccsens.tcm.bean.vo.ConRecVo;
+import com.ccsens.tcm.config.BeanConfig;
+import com.ccsens.tcm.persist.mapper.ConferenceRecordsMapper;
+import com.ccsens.util.PropUtil;
+import com.ccsens.util.QrCodeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
+
 /**
  * @author 逗
  */
@@ -12,4 +24,34 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class ConferenceService implements IConferenceService{
+    @Resource
+    private Snowflake snowflake;
+    @Resource
+    private ConferenceRecordsMapper conferenceRecordsMapper;
+
+    @Override
+    public ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param) {
+        //新建会议记录对象
+        ConferenceRecords conferenceRecords = new ConferenceRecords();
+        conferenceRecords.setId(snowflake.nextId());
+        BeanUtil.copyProperties(param,conferenceRecords);
+        //加入数据库
+        conferenceRecordsMapper.insertSelective(conferenceRecords);
+        //返回
+        ConRecVo.SelConRecVo selConRecVo = new ConRecVo.SelConRecVo();
+        BeanUtil.copyProperties(conferenceRecords,selConRecVo);
+        return selConRecVo;
+    }
+
+    @Override
+    public ConRecVo.ShareConRecVo shareConference(Object param) throws Exception {
+        //TODO 获取会议记录的地址
+        String conferencePath = "www.baidu.com";
+        //生成二维码
+        String fileName = QrCodeUtil.getQrCodeWithUtf8(conferencePath, PropUtil.path);
+        //返回
+        ConRecVo.ShareConRecVo shareConRecVo = new ConRecVo.ShareConRecVo();
+        shareConRecVo.setPath(PropUtil.imgDomain + fileName);
+        return shareConRecVo;
+    }
 }

tcm/src/main/java/com/ccsens/tcm/service/IConferenceService.java

@@ -1,4 +1,20 @@
 package com.ccsens.tcm.service;
 
+import com.ccsens.tcm.bean.dto.ConRecDto;
+import com.ccsens.tcm.bean.vo.ConRecVo;
+
 public interface IConferenceService {
+    /**
+     * 添加会议记录
+     * @param param 会议内容
+     * @return 返回会议内容
+     */
+    ConRecVo.SelConRecVo saveConference(ConRecDto.SaveConference param);
+
+    /**
+     * 分享会议记录
+     * @param param
+     * @return 返回二维码路径
+     */
+    ConRecVo.ShareConRecVo shareConference(Object param) throws Exception;
 }

tcm/src/main/java/com/ccsens/tcm/service/PatientService.java

@@ -179,7 +179,7 @@ public class PatientService implements IPatientService {
     public List<QuestionVo.ReportCodeVo> selSearchCriteriaList() {
         List<QuestionVo.ReportCodeVo> reportCodeVos=null;
         List<Object> objects = redisUtil.lGet(Constant.Redis.CODE_QUESTION, 0, -1);
-        if (CollectionUtil.isEmpty(reportCodeVos)){
+        if (CollectionUtil.isEmpty(objects)){
             throw new BaseException(CodeEnum.MESSAGEISNULL);
         }
         reportCodeVos = (List<QuestionVo.ReportCodeVo>)objects.get(0);