修改对医生的判断

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

@@ -74,7 +74,7 @@ public class FirstAidService implements IFirstAidService{
             List<String> roles = basic.getRoles();
             if (Constant.Position.isYiSheng(roles)) {
                 // 医生可以接诊和打开急救时间轴
-                patients.setRole(Constant.Position.YI_SHENG);
+                patients.setRole("YiSheng");
             } else {
                 // 其他角色（护士）只能看列表，不能打开时间轴
                 patients.setRole(Constant.Position.HU_SHI);

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

@@ -198,7 +198,8 @@ public class OcrService implements IOcrService {
     @Override
     public Map<String,Set<QuestionOcrVo.CodeAndAnswer>> discernWords(OcrDto.GeneralBasic param, Long userId) throws IOException, ParseException {
 //        FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(firstAidId);
-        FirstAid firstAidInfo = firstAidDao.queryByProjectId(param.getProjectId());
+//        FirstAid firstAidInfo = firstAidDao.queryByProjectId(param.getProjectId());
+        FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(param.getProjectId());
         if (ObjectUtil.isNull(firstAidInfo)) {
             throw new BaseException("急救信息错误");
         }

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

@@ -297,8 +297,10 @@ public class Constant {
     public static final class Position {
         /**护士*/
         public static final String HU_SHI = "HuShi";
-        /**医生*/
-        public static final String YI_SHENG = "YiSheng";
+        /**神内医生*/
+        public static final String NEI_YI_SHENG = "ShenNeiYiSheng";
+        /* 神外医生 */
+        public static final String WAI_YI_SHENG = "ShenWaiYiSheng";
         /**秘书*/
         public static final String MI_SHU = "MiShu";
         /**质控员*/
@@ -313,7 +315,7 @@ public class Constant {
         public static final String CU_ZHONG_ZHONG_XIN_BAN_GONG_SHI_ZHU_REN = "CuZhongZhongXinBanGongShiZhuRen";
 
         public static boolean isYiSheng(List<String> codes) {
-            if (codes.contains(YI_SHENG) || codes.contains(ZHI_KONG)
+            if (codes.contains(NEI_YI_SHENG) || codes.contains(ZHI_KONG) || codes.contains(WAI_YI_SHENG)
                     || codes.contains(KE_ZHU_REN) || codes.contains(FU_ZHU_REN)) {
                 return true;
             }
@@ -322,7 +324,8 @@ public class Constant {
 
         public static boolean isYiSheng(String code){
             switch (code) {
-                case YI_SHENG:
+                case NEI_YI_SHENG:
+                case WAI_YI_SHENG:
                 case ZHI_KONG:
                 case KE_ZHU_REN:
                 case FU_ZHU_REN:
@@ -333,7 +336,8 @@ public class Constant {
 
         public static boolean isZhiKong(String code){
             switch (code) {
-                case YI_SHENG:
+                case NEI_YI_SHENG:
+                case WAI_YI_SHENG:
                 case ZHI_KONG:
                 case KE_ZHU_REN:
                 case FU_ZHU_REN:

src/main/resources/mapper_dao/OrganizationDepartmentDao.xml

@@ -27,7 +27,7 @@
         FROM
             t_organization_department_template
         WHERE
-            rec_status = 0;
+            rec_status = 0
         <choose>
             <when test="departmentCode == 'NeiKe'.toString()">
                 AND code != 'ShenNei'