Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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

@@ -37,15 +37,15 @@ public class ConferenceRecordsController {
     private IConferenceService conferenceService;
 
 
-    @MustLogin
-    @ApiOperation(value = "查询会议记录", notes = "w:根据会议记录查询条件查询会议记录")
-    @RequestMapping(value = "/selConRec", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<PageInfo<ConRecVo.SelConRecVo>> selConRec(@ApiParam @Validated @RequestBody QueryDto<ConRecDto.SelConRecDto> params) {
-        log.info("查询会议记录相关信息：{}",params);
-        PageInfo<ConRecVo.SelConRecVo> selConRecVoPageInfo=  patientService.selConRec(params.getParam(),params.getUserId());
-        log.info("查询会议记录基本信息成功");
-        return JsonResponse.newInstance().ok(selConRecVoPageInfo);
-    }
+//    @MustLogin
+//    @ApiOperation(value = "查询会议记录", notes = "w:根据会议记录查询条件查询会议记录")
+//    @RequestMapping(value = "/selConRec", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+//    public JsonResponse<PageInfo<ConRecVo.SelConRecVo>> selConRec(@ApiParam @Validated @RequestBody QueryDto<ConRecDto.SelConRecDto> params) {
+//        log.info("查询会议记录相关信息：{}",params);
+//        PageInfo<ConRecVo.SelConRecVo> selConRecVoPageInfo=  patientService.selConRec(params.getParam(),params.getUserId());
+//        log.info("查询会议记录基本信息成功");
+//        return JsonResponse.newInstance().ok(selConRecVoPageInfo);
+//    }
 
 
     @MustLogin

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

@@ -1,8 +1,8 @@
 package com.ccsens.tcm.api;
 
 import com.ccsens.cloudutil.annotation.MustLogin;
-import com.ccsens.tcm.bean.dto.BiologicalSamplesDto;
-import com.ccsens.tcm.bean.vo.HospatilVo;
+import com.ccsens.tcm.bean.dto.PatientDto;
+import com.ccsens.tcm.bean.vo.HospitalVo;
 import com.ccsens.tcm.service.IPatientService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
@@ -11,10 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -29,13 +26,24 @@ import java.util.List;
 public class HospatilController {
     @Resource
     private IPatientService patientService;
+
     @MustLogin
     @ApiOperation(value = "查询医院列表", notes = "w:医院列表查询")
     @RequestMapping(value = "/selHospatil", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<List<HospatilVo.SelHospatilVo>> selHospatil() {
-        //log.info("添加生物样本：{}",params);
-        List<HospatilVo.SelHospatilVo> selHospatilVos= patientService.selHospatil();
+    public JsonResponse<List<HospitalVo.SelHospitalVo>> selHospatil() {
+
+        List<HospitalVo.SelHospitalVo> selHospitalVos = patientService.selHospatil();
         log.info("查询医院列表完成");
-        return JsonResponse.newInstance().ok(selHospatilVos);
+        return JsonResponse.newInstance().ok(selHospitalVos);
+    }
+
+
+    @ApiOperation(value = "根据项目id查询医院信息", notes = "w:医院列表查询")
+    @RequestMapping(value = "/selHospatil", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<HospitalVo.SelHospitalVo> getHospitalByProjectId(@ApiParam @RequestParam Long projectId) {
+        log.info("根据项目id查询医院信息:{}",projectId);
+        HospitalVo.SelHospitalVo hospitalVo = patientService.getHospitalByProjectId(projectId);
+        log.info("根据项目id查询医院信息:{}",hospitalVo);
+        return JsonResponse.newInstance().ok(hospitalVo);
     }
 }

tcm/src/main/java/com/ccsens/tcm/bean/po/Hospital.java

@@ -16,6 +16,8 @@ public class Hospital implements Serializable {
 
     private Byte recStatus;
 
+    private Long projectId;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -66,6 +68,14 @@ public class Hospital implements Serializable {
         this.recStatus = recStatus;
     }
 
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -78,6 +88,7 @@ public class Hospital implements Serializable {
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
+        sb.append(", projectId=").append(projectId);
         sb.append("]");
         return sb.toString();
     }

tcm/src/main/java/com/ccsens/tcm/bean/po/HospitalExample.java

@@ -474,6 +474,66 @@ public class HospitalExample {
             addCriterion("rec_status not between", value1, value2, "recStatus");
             return (Criteria) this;
         }
+
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdEqualTo(Long value) {
+            addCriterion("project_id =", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotEqualTo(Long value) {
+            addCriterion("project_id <>", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThan(Long value) {
+            addCriterion("project_id >", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("project_id >=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThan(Long value) {
+            addCriterion("project_id <", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThanOrEqualTo(Long value) {
+            addCriterion("project_id <=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIn(List<Long> values) {
+            addCriterion("project_id in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotIn(List<Long> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(Long value1, Long value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(Long value1, Long value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

tcm/src/main/java/com/ccsens/tcm/bean/vo/HospatilVo.java → tcm/src/main/java/com/ccsens/tcm/bean/vo/HospitalVo.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class HospatilVo {
+public class HospitalVo {
     @Data
     @ApiModel("查询医院列表")
-    public static class SelHospatilVo {
+    public static class SelHospitalVo {
         @ApiModelProperty("医院id")
         private Long id;
         @ApiModelProperty("医院名称")

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

@@ -52,5 +52,12 @@ public interface IPatientService {
 
     PageInfo<BiologicalSamplesVo.selBiolog> selBiologicalSamples(BiologicalSamplesDto.SelBiolog param, Long userId);
 
-    List<HospatilVo.SelHospatilVo> selHospatil();
+    List<HospitalVo.SelHospitalVo> selHospatil();
+
+    /**
+     * 根据项目id查询医院信息
+     * @param projectId 项目id
+     * @return 返回医院信息
+     */
+    HospitalVo.SelHospitalVo getHospitalByProjectId(Long projectId);
 }

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

@@ -27,7 +27,6 @@ import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -326,17 +325,33 @@ public class PatientService implements IPatientService {
     }
 
     @Override
-    public List<HospatilVo.SelHospatilVo> selHospatil() {
-        List<HospatilVo.SelHospatilVo> selHospatilVos=new ArrayList<HospatilVo.SelHospatilVo>();
+    public List<HospitalVo.SelHospitalVo> selHospatil() {
+        List<HospitalVo.SelHospitalVo> selHospitalVos =new ArrayList<HospitalVo.SelHospitalVo>();
         HospitalExample hospitalExample=new HospitalExample();
         hospitalExample.createCriteria().andRecStatusEqualTo((byte)0);
         List<Hospital> hospitals = hospitalMapper.selectByExample(hospitalExample);
         hospitals.forEach(hospital -> {
-            HospatilVo.SelHospatilVo selHospatilVo=new HospatilVo.SelHospatilVo();
-            selHospatilVo.setId(hospital.getId());
-            selHospatilVo.setName(hospital.getName());
-            selHospatilVos.add(selHospatilVo);
+            HospitalVo.SelHospitalVo selHospitalVo =new HospitalVo.SelHospitalVo();
+            selHospitalVo.setId(hospital.getId());
+            selHospitalVo.setName(hospital.getName());
+            selHospitalVos.add(selHospitalVo);
         });
-        return selHospatilVos;
+        return selHospitalVos;
+    }
+
+    @Override
+    public HospitalVo.SelHospitalVo getHospitalByProjectId(Long projectId) {
+        HospitalVo.SelHospitalVo selHospitalVo = new HospitalVo.SelHospitalVo();
+
+        HospitalExample hospitalExample=new HospitalExample();
+        hospitalExample.createCriteria().andProjectIdEqualTo(projectId);
+        List<Hospital> hospitals = hospitalMapper.selectByExample(hospitalExample);
+        if(CollectionUtil.isNotEmpty(hospitals)){
+            selHospitalVo.setId(hospitals.get(0).getId());
+            selHospitalVo.setName(hospitals.get(0).getName());
+        }else {
+            throw new BaseException(CodeEnum.NOT_HOSPITAL);
+        }
+        return selHospitalVo;
     }
 }

tcm/src/main/resources/mapper_raw/HospitalMapper.xml

@@ -8,6 +8,7 @@
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="project_id" jdbcType="BIGINT" property="projectId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -68,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, operator, created_at, updated_at, rec_status
+    id, name, operator, created_at, updated_at, rec_status, project_id
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tcm.bean.po.HospitalExample" resultMap="BaseResultMap">
     select
@@ -101,20 +102,19 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.ccsens.tcm.bean.po.Hospital">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into t_hospital (name, operator, created_at, 
-      updated_at, rec_status)
-    values (#{name,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+    insert into t_hospital (id, name, operator, 
+      created_at, updated_at, rec_status, 
+      project_id)
+    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, 
+      #{projectId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tcm.bean.po.Hospital">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into t_hospital
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
       <if test="name != null">
         name,
       </if>
@@ -130,8 +130,14 @@
       <if test="recStatus != null">
         rec_status,
       </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
@@ -147,6 +153,9 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.tcm.bean.po.HospitalExample" resultType="java.lang.Long">
@@ -176,6 +185,9 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -188,7 +200,8 @@
       operator = #{record.operator,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{record.recStatus,jdbcType=TINYINT}
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      project_id = #{record.projectId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -211,6 +224,9 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -220,7 +236,8 @@
       operator = #{operator,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{recStatus,jdbcType=TINYINT}
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      project_id = #{projectId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -182,6 +182,7 @@ public enum CodeEnum {
     ALREADY_UPLOAD_FORM(151,"请勿重复提交信息",true),
     MESSAGEISNULL(152,"数据为空",true),
     QUANTITYERROR(153,"住院号和患者id不对应",true),
+    NOT_HOSPITAL(154,"未找到医院信息",true),
     ;