From ca077da6f8f559cd4a9988389dccd0262bbd2d94 Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Sat, 11 Sep 2021 18:39:31 +0800
Subject: [PATCH] bug

---
 .../carbasics/api/OrganizationController.java |  2 +-
 .../service/OrganizationService.java          | 42 ++++++++++---------
 src/main/resources/mapper_dao/FirstAidDao.xml |  3 +-
 .../mapper_dao/FirstAidRecordDao.xml          |  2 +-
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/api/OrganizationController.java b/src/main/java/com/ccsens/carbasics/api/OrganizationController.java
index 73ab522..a909078 100644
--- a/src/main/java/com/ccsens/carbasics/api/OrganizationController.java
+++ b/src/main/java/com/ccsens/carbasics/api/OrganizationController.java
@@ -74,7 +74,7 @@ public class OrganizationController {
         //转成file
         File file = new File(fullPath);
         if (!file.getParentFile().exists()) {
-            file.mkdirs();
+            file.getParentFile().mkdirs();
         }
 
         FileUtil.writeFromStream(f.getInputStream(), fullPath);
diff --git a/src/main/java/com/ccsens/carbasics/service/OrganizationService.java b/src/main/java/com/ccsens/carbasics/service/OrganizationService.java
index d2155ab..72590ce 100644
--- a/src/main/java/com/ccsens/carbasics/service/OrganizationService.java
+++ b/src/main/java/com/ccsens/carbasics/service/OrganizationService.java
@@ -116,27 +116,31 @@ public class OrganizationService implements IOrganizationService {
             if (row.length <= parentIndex || row[parentIndex] == null || StrUtil.isBlank((String)row[parentIndex])) {
                 return;
             }
-            String parentName = (String) row[parentIndex];
-            parentName = parentName.trim();
-            if (!nameMap.containsKey(parentName)) {
-                builder.append(name).append("的上级").append(parentName)
-                        .append("未找到，请检查机构排序是否存在或排序是否正确。");
-            } else {
-                OrganizationParent parent = new OrganizationParent();
-                if (oldOrganization != null) {
-                    // 删除原有的上下级关系
-                    OrganizationParentExample parentExample = new OrganizationParentExample();
-                    parentExample.createCriteria().andOrganizationIdEqualTo(oldOrganization.getId());
-                    OrganizationParent update = new OrganizationParent();
-                    update.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
-                    organizationParentMapper.updateByExampleSelective(update, parentExample);
+            String parentCell = (String) row[parentIndex];
+            String[] parentNames = parentCell.split(Constant.STRING_REGEX);
+            for (String parentName: parentNames) {
+                parentName = parentName.trim();
+                if (!nameMap.containsKey(parentName)) {
+                    builder.append(name).append("的上级").append(parentName)
+                            .append("未找到，请检查机构排序是否存在或排序是否正确。");
+                } else {
+                    OrganizationParent parent = new OrganizationParent();
+                    if (oldOrganization != null) {
+                        // 删除原有的上下级关系
+                        OrganizationParentExample parentExample = new OrganizationParentExample();
+                        parentExample.createCriteria().andOrganizationIdEqualTo(oldOrganization.getId());
+                        OrganizationParent update = new OrganizationParent();
+                        update.setRecStatus(WebConstant.REC_STATUS.Deleted.value);
+                        organizationParentMapper.updateByExampleSelective(update, parentExample);
+                    }
+                    parent.setId(snowflake.nextId());
+                    parent.setOrganizationId(newOrganization.getId());
+                    parent.setParentId(nameMap.get(parentName));
+                    parent.setOperator(userId);
+                    parents.add(parent);
                 }
-                parent.setId(snowflake.nextId());
-                parent.setOrganizationId(newOrganization.getId());
-                parent.setParentId(nameMap.get(parentName));
-                parent.setOperator(userId);
-                parents.add(parent);
             }
+
         });
         if (CollectionUtil.isNotEmpty(organizations)) {
             organizationDao.batchInsert(organizations);
diff --git a/src/main/resources/mapper_dao/FirstAidDao.xml b/src/main/resources/mapper_dao/FirstAidDao.xml
index 638ff11..051a3ad 100644
--- a/src/main/resources/mapper_dao/FirstAidDao.xml
+++ b/src/main/resources/mapper_dao/FirstAidDao.xml
@@ -79,7 +79,8 @@
             FROM
             t_qcp_first_aid
             WHERE
-            data_status = #{param.dataStatus}
+            1=1
+            <if test="param.dataStatus != null"> and data_status = #{param.dataStatus}</if>
             <if test="param.name!=null and param.name!=''">
                 AND `name` LIKE concat('%',#{param.name},'%')
             </if>
diff --git a/src/main/resources/mapper_dao/FirstAidRecordDao.xml b/src/main/resources/mapper_dao/FirstAidRecordDao.xml
index f2a4d3c..375cfec 100644
--- a/src/main/resources/mapper_dao/FirstAidRecordDao.xml
+++ b/src/main/resources/mapper_dao/FirstAidRecordDao.xml
@@ -35,7 +35,7 @@
         from t_qcp_first_aid a, t_qcp_first_aid_record r1 , t_qcp_first_aid_record r2
         where a.id = r1.first_aid_id and r1.question_code = 'JMRSSJ'
         and a.id = r2.first_aid_id and r2.question_code = 'JBXX-DYSJ'
-        and r1.answer + 0 &lt;= #{startTime} and r1.answer + 0 &gt;= #{endTime}
+        and r1.answer + 0 &lt;= #{endTime} and r1.answer + 0 &gt;= #{startTime}
         <foreach collection="hospitalIds" item="id" separator="," open="and a.hospital_id in (" close=")">
             #{id}
         </foreach>