20210901v1.5

src/main/java/com/ccsens/carbasics/bean/dto/PatientDto.java

@@ -112,6 +112,7 @@ public class PatientDto {
     @Data
     @ApiModel("添加病例")
     public static class SavePatient{
+        @NotNull(message = "请输入项目id")
         @ApiModelProperty("项目id")
         private Long projectId;
         @Length(max = 20,message = "名称过长")
@@ -127,6 +128,8 @@ public class PatientDto {
         private String idcard;
         @ApiModelProperty("疑似诊断信息")
         private String suspected;
+        @ApiModelProperty("是否是演示数据 0正式 1演示")
+        private byte valueType;
     }
 
 
@@ -141,6 +144,7 @@ public class PatientDto {
     @Data
     @ApiModel("修改急救信息")
     public static class UpdatePatient{
+        @NotNull(message = "请输入项目id")
         @ApiModelProperty("项目id")
         private Long projectId;
         @NotNull(message = "请输入急救id")

src/main/java/com/ccsens/carbasics/service/FirstAidService.java

@@ -101,6 +101,11 @@ public class FirstAidService implements IFirstAidService{
 
     @Override
     public void savePatient(PatientDto.SavePatient param, Long userId) {
+        // 判断有无权限添加
+        OrganizationVo.Basic basic = organizationDao.getOrganization(param.getProjectId(), userId);
+        if (basic == null) {
+            throw new BaseException(DefaultCodeError.NO_DATA_MODIFY_PRIVILEGE);
+        }
         //查找当前用户的职位和科室
         OrganizationVo.MemberPosition memberPosition = organizationMemberDao.getMemberPosition(userId);
         log.info("当前用户的科室职位信息：{}",memberPosition);
@@ -128,6 +133,9 @@ public class FirstAidService implements IFirstAidService{
         firstAid.setName(param.getName());
         firstAid.setGender(param.getGender());
         firstAid.setNation(param.getNation());
+        firstAid.setHospitalId(basic.getOrganizationId());
+        firstAid.setValueType(param.getValueType());
+        firstAid.setOperator(userId);
         if(StrUtil.isNotEmpty(param.getIdcard())){
             if(!IdcardUtil.isValidCard(param.getIdcard())){
                 throw new BaseException(DefaultCodeError.IDCARD_ERROR);
@@ -139,6 +147,7 @@ public class FirstAidService implements IFirstAidService{
         //添加急救成员
         FirstAidMember firstAidMember = new FirstAidMember();
         firstAidMember.setId(snowflake.nextId());
+        firstAidMember.setFirstAidId(firstAid.getId());
         firstAidMember.setCreateUserId(userId);
         if(position == 1){
             firstAidMember.setRecordUserId(userId);
@@ -172,6 +181,7 @@ public class FirstAidService implements IFirstAidService{
         firstAidRecord.setAnswer(param.getSuspected());
         firstAidRecord.setSubmitUserId(userId);
         firstAidRecord.setSubmitUserType((byte) 1);
+        firstAidRecord.setOperator(userId);
         firstAidRecordMapper.insertSelective(firstAidRecord);
         //加日志
         FirstAidRecordLog firstAidRecordLog = new FirstAidRecordLog();
@@ -223,7 +233,7 @@ public class FirstAidService implements IFirstAidService{
         firstAid.setNation(param.getNation());
         firstAid.setGender(param.getGender());
         if(StrUtil.isNotEmpty(param.getIdcard())){
-            if(IdcardUtil.isValidCard(param.getIdcard())){
+            if(!IdcardUtil.isValidCard(param.getIdcard())){
                 throw new BaseException(DefaultCodeError.IDCARD_ERROR);
             }
             firstAid.setIdcard(param.getIdcard());

src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: test.tall.wiki
+    host: dd.tall.wiki
     password: 111111
     port: 5672
     username: admin

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev