急救

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

@@ -112,12 +112,6 @@ public class AsyncService implements IAsyncService {
             position.setPositionId(param.getPositionId());
             position.setDepartmentId(department.getId());
             organizationMemberPositionMapper.insertSelective(position);
-            //TODO 质控医生职位
-            OrganizationMemberPosition position1 = new OrganizationMemberPosition();
-            position1.setId(snowflake.nextId());
-            position1.setPositionId(3L);
-            position1.setDepartmentId(department.getId());
-            organizationMemberPositionMapper.insertSelective(position1);
             //创建项目
             createProject(newOrganization.getId(),param,userId);
         }else {
@@ -143,12 +137,6 @@ public class AsyncService implements IAsyncService {
                 position.setPositionId(param.getPositionId());
                 position.setDepartmentId(department.getId());
                 organizationMemberPositionMapper.insertSelective(position);
-                //TODO 质控医生职位
-                OrganizationMemberPosition position1 = new OrganizationMemberPosition();
-                position1.setId(snowflake.nextId());
-                position1.setPositionId(3L);
-                position1.setDepartmentId(department.getId());
-                organizationMemberPositionMapper.insertSelective(position1);
                 //创建项目
                 createProject(organization.getId(),param,userId);
             }else {
@@ -164,12 +152,6 @@ public class AsyncService implements IAsyncService {
                 position.setPositionId(param.getPositionId());
                 position.setDepartmentId(department.getId());
                 organizationMemberPositionMapper.insertSelective(position);
-                //TODO 质控医生职位
-                OrganizationMemberPosition position1 = new OrganizationMemberPosition();
-                position1.setId(snowflake.nextId());
-                position1.setPositionId(3L);
-                position1.setDepartmentId(department.getId());
-                organizationMemberPositionMapper.insertSelective(position1);
                 //创建项目
                 createProject(organization.getId(),param,userId);
             }

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

@@ -81,7 +81,7 @@ public class FirstAidService implements IFirstAidService{
 
         if (CollectionUtil.isNotEmpty(basic.getRoles())) {
             List<String> roles = basic.getRoles();
-            if (roles.contains(Constant.Position.YI_SHENG)) {
+            if (Constant.Position.isYiSheng(roles)) {
                 // 医生可以接诊和打开急救时间轴
                 patients.setRole(Constant.Position.YI_SHENG);
             } else {
@@ -130,13 +130,13 @@ public class FirstAidService implements IFirstAidService{
         Long organizationId = null;
         for (OrganizationVo.Position p: memberPosition.getPositions()) {
             //是否是神内的医生
-            if(Constant.Department.SHEN_NEI.equalsIgnoreCase(p.getDepartmentCode()) && Constant.Position.YI_SHENG.equalsIgnoreCase(p.getPositionCode())){
+            if(Constant.DepartmentAndCode.isShenNei(p.getDepartmentCode()) && Constant.Position.isYiSheng(p.getPositionCode())){
                 position = 1;
                 organizationId = p.getOrganizationId();
                 break;
             }
             //是否是急诊的护士
-            if(Constant.Department.JI_ZHEN.equalsIgnoreCase(p.getDepartmentCode()) && Constant.Position.HU_SHI.equalsIgnoreCase(p.getPositionCode())){
+            if(Constant.DepartmentAndCode.isJiZhen(p.getDepartmentCode()) && Constant.Position.isHuShi(p.getPositionCode())){
                 position = 0;
                 organizationId = p.getOrganizationId();
                 break;
@@ -368,7 +368,7 @@ public class FirstAidService implements IFirstAidService{
         }
         boolean isMiShu = false;
         for (OrganizationVo.Position p: memberPosition.getPositions()) {
-            if(Constant.Position.MI_SHU.equalsIgnoreCase(p.getPositionCode())){
+            if(Constant.Position.isMiShu(p.getPositionCode())){
                 isMiShu = true;
             }
         }
@@ -418,8 +418,8 @@ public class FirstAidService implements IFirstAidService{
         //部门
         Byte position = null;
         for (OrganizationVo.Position p: memberPosition.getPositions()) {
-            if (Constant.Department.SHEN_NEI.equals(p.getDepartmentCode()) || Constant.Department.SHEN_WAI.equals(p.getDepartmentCode())) {
-                if (Constant.Position.YI_SHENG.equals(p.getPositionCode())) {
+            if (Constant.DepartmentAndCode.isShenNei(p.getDepartmentCode()) || Constant.DepartmentAndCode.isShenWai(p.getDepartmentCode())) {
+                if (Constant.Position.isYiSheng(p.getPositionCode())) {
                     position = 1;
                     break;
                 }
@@ -541,14 +541,14 @@ public class FirstAidService implements IFirstAidService{
         }
 
         for (OrganizationVo.Position p: memberPosition.getPositions()) {
-            if (Constant.Department.SHEN_NEI.equals(p.getDepartmentCode())) {
-                if (Constant.Position.YI_SHENG.equals(p.getPositionCode())) {
+            if (Constant.DepartmentAndCode.isShenNei(p.getDepartmentCode())) {
+                if (Constant.Position.isYiSheng(p.getPositionCode())) {
                     firstAidLog.setOperationRole((byte)1);
                     break;
                 }
             }
-            if (Constant.Department.SHEN_WAI.equals(p.getDepartmentCode())) {
-                if (Constant.Position.YI_SHENG.equals(p.getPositionCode())) {
+            if (Constant.DepartmentAndCode.isShenWai(p.getDepartmentCode())) {
+                if (Constant.Position.isYiSheng(p.getPositionCode())) {
                     firstAidLog.setOperationRole((byte)2);
                     break;
                 }
@@ -580,13 +580,13 @@ public class FirstAidService implements IFirstAidService{
         boolean isShenNei = false;
         boolean isShenWai = false;
         for (OrganizationVo.Position p: memberPosition.getPositions()) {
-            if (Constant.Position.ZHI_KONG.equals(p.getPositionCode())) {
+            if (Constant.Position.isZhiKong(p.getPositionCode())) {
                 isZhiKong = true;
             }
-            if (Constant.Department.SHEN_NEI.equals(p.getDepartmentCode())) {
+            if (Constant.DepartmentAndCode.isShenNei(p.getDepartmentCode())) {
                 isShenNei = true;
             }
-            if (!Constant.Department.SHEN_WAI.equals(p.getDepartmentCode())) {
+            if (!Constant.DepartmentAndCode.isShenWai(p.getDepartmentCode())) {
                 isShenWai = true;
             }
         }

src/main/java/com/ccsens/carbasics/util/Constant.java

@@ -2,6 +2,7 @@ package com.ccsens.carbasics.util;
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -109,21 +110,14 @@ public class Constant {
 
     }
 
-    /**科室相关*/
-    public static final class Department {
-        /**急诊*/
-        public static final String JI_ZHEN = "JiZhen";
-        /**神内*/
-        public static final String SHEN_NEI = "ShenNei";
-        /**神外*/
-        public static final String SHEN_WAI = "ShenWai";
-    }
-
     public enum  DepartmentAndCode {
         /**
          * 部门与code
          */
+
+        JI_ZHEN("急诊","JiZhen"),
         SHEN_NEI("神经内科","ShenNei"),
+        SHEN_WAI("神经外科","ShenWai"),
         NEI_KE("内科","NeiKe");
         public String name;
         public String code;
@@ -132,6 +126,26 @@ public class Constant {
             this.name = name;
             this.code = code;
         }
+
+
+        public static boolean isShenNei(String code) {
+            if (SHEN_NEI.code.equals(code) || NEI_KE.code.equals(code)) {
+                return true;
+            }
+            return false;
+        }
+        public static boolean isShenWai(String code) {
+            if (SHEN_WAI.code.equals(code)) {
+                return true;
+            }
+            return false;
+        }
+        public static boolean isJiZhen(String code) {
+            if (JI_ZHEN.code.equals(code)) {
+                return true;
+            }
+            return false;
+        }
     }
 
     /**职位相关*/
@@ -144,6 +158,54 @@ public class Constant {
         public static final String MI_SHU = "MiShu";
         /**质控员*/
         public static final String ZHI_KONG = "ZhiKong";
+        /**科主任*/
+        public static final String KE_ZHU_REN = "KeZhuRen";
+        /**副主任*/
+        public static final String FU_ZHU_REN = "FuZhuRen";
+
+        public static boolean isYiSheng(List<String> codes) {
+            if (codes.contains(YI_SHENG) || codes.contains(ZHI_KONG)
+                    || codes.contains(KE_ZHU_REN) || codes.contains(FU_ZHU_REN)) {
+                return true;
+            }
+            return false;
+        }
+
+        public static boolean isYiSheng(String code){
+            switch (code) {
+                case YI_SHENG:
+                case ZHI_KONG:
+                case KE_ZHU_REN:
+                case FU_ZHU_REN:
+                    return true;
+                default:return false;
+            }
+        }
+
+        public static boolean isZhiKong(String code){
+            switch (code) {
+                case YI_SHENG:
+                case ZHI_KONG:
+                case KE_ZHU_REN:
+                case FU_ZHU_REN:
+                    return true;
+                default:return false;
+            }
+        }
+
+        public static boolean isHuShi(String code) {
+            switch (code) {
+                case HU_SHI:return true;
+                default:return false;
+            }
+        }
+
+        public static boolean isMiShu(String code) {
+            switch (code) {
+                case MI_SHU:
+                default:return true;
+            }
+        }
     }
     public enum OrganizationType {
         /**

src/main/resources/mapper_dao/FirstAidDao.xml

@@ -103,7 +103,7 @@
         AND t2.question_code = 'JBXX-DYSJ'
         AND t2.rec_status = 0
         LEFT JOIN t_qcp_first_aid_log t3 ON t.firstAidId = t3.first_aid_id
-        AND t3.operation_type = 3
+        AND t3.operation_type = 5
         AND t3.rec_status = 0
         LEFT JOIN t_qcp_first_aid_record t4 ON t.firstAidId = t4.first_aid_id
         AND t4.question_code = 'CYQK-CYSJ'