diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index 807b138c..e746401f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -489,7 +489,10 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         //查询表单
         ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
-        List<String> designEngineerList = termList.stream().map(ProcessProjectStandardTerm::getDesignEngineer).distinct().collect(Collectors.toList());
+        List<String> designEngineerList = termList.stream().map(ProcessProjectStandardTerm::getDesignEngineer)
+                .filter(Objects::nonNull)
+                .distinct()
+                .collect(Collectors.toList());
 
         // 完成任务
         ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
diff --git a/laws-modules/src/main/resources/bpmn/法规合规评估流程.bpmn b/laws-modules/src/main/resources/bpmn/法规合规评估流程.bpmn
index 9734e5db..efe111df 100644
--- a/laws-modules/src/main/resources/bpmn/法规合规评估流程.bpmn
+++ b/laws-modules/src/main/resources/bpmn/法规合规评估流程.bpmn
@@ -489,35 +489,31 @@
           <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${skip}</bpmn:conditionExpression>
         </bpmn:sequenceFlow>
       </bpmn:subProcess>
-      <bpmn:inclusiveGateway id="Gateway_1e8w7bw">
-        <bpmn:incoming>Flow_0rkq2tw</bpmn:incoming>
-        <bpmn:outgoing>Flow_0ljfd7s</bpmn:outgoing>
-        <bpmn:outgoing>Flow_0gac88y</bpmn:outgoing>
-      </bpmn:inclusiveGateway>
       <bpmn:sequenceFlow id="Flow_0rkq2tw" name="驳回" sourceRef="Gateway_1uodwb8" targetRef="Gateway_1e8w7bw">
         <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!pass}</bpmn:conditionExpression>
       </bpmn:sequenceFlow>
       <bpmn:sequenceFlow id="Flow_0ncu6j5" name="通过" sourceRef="Gateway_1uodwb8" targetRef="Event_1kdwhwn">
         <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${pass}</bpmn:conditionExpression>
       </bpmn:sequenceFlow>
-      <bpmn:sequenceFlow id="Flow_0ljfd7s" name="涉及工程师" sourceRef="Gateway_1e8w7bw" targetRef="Activity_1xsrtpj">
-        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize &gt; 0}</bpmn:conditionExpression>
-      </bpmn:sequenceFlow>
-      <bpmn:sequenceFlow id="Flow_0gac88y" name="不涉及工程师" sourceRef="Gateway_1e8w7bw" targetRef="Activity_1n4w1w7">
-        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${notInvolvedModuleOwnerListSize &gt; 0}</bpmn:conditionExpression>
-      </bpmn:sequenceFlow>
+      <bpmn:sequenceFlow id="Flow_0ljfd7s" name="涉及工程师" sourceRef="Gateway_1e8w7bw" targetRef="Activity_1xsrtpj" />
+      <bpmn:sequenceFlow id="Flow_0gac88y" name="不涉及工程师" sourceRef="Gateway_1e8w7bw" targetRef="Activity_1n4w1w7" />
       <bpmn:sequenceFlow id="Flow_117rgu5" sourceRef="bszgjldsp_2" targetRef="Gateway_1uodwb8" />
-      <bpmn:inclusiveGateway id="Gateway_1succ9k">
-        <bpmn:incoming>Flow_0zsh74h</bpmn:incoming>
-        <bpmn:incoming>Flow_0xkvov2</bpmn:incoming>
-        <bpmn:outgoing>Flow_0uhjeie</bpmn:outgoing>
-      </bpmn:inclusiveGateway>
       <bpmn:sequenceFlow id="Flow_0zsh74h" sourceRef="Activity_1xsrtpj" targetRef="Gateway_1succ9k" />
       <bpmn:sequenceFlow id="Flow_0xkvov2" sourceRef="Activity_1n4w1w7" targetRef="Gateway_1succ9k" />
       <bpmn:sequenceFlow id="Flow_0uhjeie" sourceRef="Gateway_1succ9k" targetRef="bszgjldsp_2" />
       <bpmn:startEvent id="Event_1d40kan">
         <bpmn:outgoing>Flow_0x6qt62</bpmn:outgoing>
       </bpmn:startEvent>
+      <bpmn:parallelGateway id="Gateway_1e8w7bw">
+        <bpmn:incoming>Flow_0rkq2tw</bpmn:incoming>
+        <bpmn:outgoing>Flow_0ljfd7s</bpmn:outgoing>
+        <bpmn:outgoing>Flow_0gac88y</bpmn:outgoing>
+      </bpmn:parallelGateway>
+      <bpmn:parallelGateway id="Gateway_1succ9k">
+        <bpmn:incoming>Flow_0zsh74h</bpmn:incoming>
+        <bpmn:incoming>Flow_0xkvov2</bpmn:incoming>
+        <bpmn:outgoing>Flow_0uhjeie</bpmn:outgoing>
+      </bpmn:parallelGateway>
     </bpmn:subProcess>
     <bpmn:sequenceFlow id="Flow_0mngw8y" name="驳回" sourceRef="Gateway_0mobyxv" targetRef="Gateway_04oc605">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!pass}</bpmn:conditionExpression>
@@ -560,16 +556,6 @@
       <bpmn:endEvent id="Event_06g8vvk">
         <bpmn:incoming>Flow_16ifeqw</bpmn:incoming>
       </bpmn:endEvent>
-      <bpmn:inclusiveGateway id="Gateway_04d5tro">
-        <bpmn:incoming>Flow_14m4664</bpmn:incoming>
-        <bpmn:outgoing>Flow_0epd47x</bpmn:outgoing>
-        <bpmn:outgoing>Flow_0gtzh06</bpmn:outgoing>
-      </bpmn:inclusiveGateway>
-      <bpmn:inclusiveGateway id="Gateway_199z3y7">
-        <bpmn:incoming>Flow_0elxtw0</bpmn:incoming>
-        <bpmn:incoming>Flow_184uarj</bpmn:incoming>
-        <bpmn:outgoing>Flow_0xbmrsd</bpmn:outgoing>
-      </bpmn:inclusiveGateway>
       <bpmn:subProcess id="Activity_09ag01n" name="模块责任人驳回子流程">
         <bpmn:incoming>Flow_0epd47x</bpmn:incoming>
         <bpmn:outgoing>Flow_0elxtw0</bpmn:outgoing>
@@ -728,12 +714,8 @@
       <bpmn:sequenceFlow id="Flow_16ifeqw" name="通过" sourceRef="Gateway_1gyluzc" targetRef="Event_06g8vvk">
         <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${pass}</bpmn:conditionExpression>
       </bpmn:sequenceFlow>
-      <bpmn:sequenceFlow id="Flow_0epd47x" name="涉及工程师" sourceRef="Gateway_04d5tro" targetRef="Activity_09ag01n">
-        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize &gt; 0}</bpmn:conditionExpression>
-      </bpmn:sequenceFlow>
-      <bpmn:sequenceFlow id="Flow_0gtzh06" name="不涉及工程师" sourceRef="Gateway_04d5tro" targetRef="Activity_1ybj2u2">
-        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${notInvolvedModuleOwnerListSize &gt; 0}</bpmn:conditionExpression>
-      </bpmn:sequenceFlow>
+      <bpmn:sequenceFlow id="Flow_0epd47x" name="涉及工程师" sourceRef="Gateway_04d5tro" targetRef="Activity_09ag01n" />
+      <bpmn:sequenceFlow id="Flow_0gtzh06" name="不涉及工程师" sourceRef="Gateway_04d5tro" targetRef="Activity_1ybj2u2" />
       <bpmn:sequenceFlow id="Flow_0elxtw0" sourceRef="Activity_09ag01n" targetRef="Gateway_199z3y7" />
       <bpmn:sequenceFlow id="Flow_184uarj" sourceRef="Activity_1ybj2u2" targetRef="Gateway_199z3y7" />
       <bpmn:startEvent id="Event_0gnnl5f">
@@ -826,6 +808,16 @@
       <bpmn:sequenceFlow id="Flow_02fli1m" name="全部不涉及" sourceRef="Gateway_1ughbu9" targetRef="Event_0srt00p">
         <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize == 0}</bpmn:conditionExpression>
       </bpmn:sequenceFlow>
+      <bpmn:parallelGateway id="Gateway_04d5tro">
+        <bpmn:incoming>Flow_14m4664</bpmn:incoming>
+        <bpmn:outgoing>Flow_0epd47x</bpmn:outgoing>
+        <bpmn:outgoing>Flow_0gtzh06</bpmn:outgoing>
+      </bpmn:parallelGateway>
+      <bpmn:parallelGateway id="Gateway_199z3y7">
+        <bpmn:incoming>Flow_0elxtw0</bpmn:incoming>
+        <bpmn:incoming>Flow_184uarj</bpmn:incoming>
+        <bpmn:outgoing>Flow_0xbmrsd</bpmn:outgoing>
+      </bpmn:parallelGateway>
     </bpmn:subProcess>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
@@ -847,12 +839,6 @@
         <dc:Bounds x="530" y="710" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1f5wqou_di" bpmnElement="Gateway_0vyx6xb">
-        <dc:Bounds x="765" y="1185" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1193er5_di" bpmnElement="Gateway_15ql8ot">
-        <dc:Bounds x="1665" y="1285" width="50" height="50" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0njknr1_di" bpmnElement="Activity_08c4m85" isExpanded="true">
         <dc:Bounds x="670" y="700" width="780" height="280" />
         <bpmndi:BPMNLabel />
@@ -934,6 +920,101 @@
       <bpmndi:BPMNShape id="BPMNShape_1w7o9oy" bpmnElement="Event_1trh68p">
         <dc:Bounds x="562" y="912" width="36" height="36" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0qyu80e" bpmnElement="Activity_0ak2ho3" isExpanded="true">
+        <dc:Bounds x="855" y="1420" width="925" height="280" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1rn9z6v" bpmnElement="Event_0haaibd">
+        <dc:Bounds x="885" y="1462" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1a8xmid" bpmnElement="mkzrrff_4">
+        <dc:Bounds x="975" y="1440" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0kubyme" bpmnElement="Gateway_151dwa8" isMarkerVisible="true">
+        <dc:Bounds x="1145" y="1545" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0sgsn68" bpmnElement="sjgcspg_4">
+        <dc:Bounds x="1250" y="1530" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0u4y8iq" bpmnElement="mkzrrsp_4">
+        <dc:Bounds x="1440" y="1530" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1iunr85" bpmnElement="Gateway_1bduqeh" isMarkerVisible="true">
+        <dc:Bounds x="1575" y="1545" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1un7h24" bpmnElement="Event_1jaa14d">
+        <dc:Bounds x="1692" y="1552" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1xjq7zc" bpmnElement="Event_125tmf0">
+        <dc:Bounds x="1152" y="1632" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_173xe0u_di" bpmnElement="Gateway_173xe0u" isMarkerVisible="true">
+        <dc:Bounds x="1000" y="1545" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1acjy96_di" bpmnElement="Event_1acjy96">
+        <dc:Bounds x="1007" y="1632" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_1aai3l6" bpmnElement="Flow_0n3x332">
+        <di:waypoint x="921" y="1480" />
+        <di:waypoint x="975" y="1480" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_0xkmcsn" bpmnElement="Flow_1mwm3jy">
+        <di:waypoint x="1050" y="1570" />
+        <di:waypoint x="1145" y="1570" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1081" y="1552" width="33" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_17gi23v" bpmnElement="Flow_1u1h3jz">
+        <di:waypoint x="1170" y="1595" />
+        <di:waypoint x="1170" y="1632" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1158" y="1610" width="55" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_00fxze9" bpmnElement="Flow_0aon77n">
+        <di:waypoint x="1195" y="1570" />
+        <di:waypoint x="1250" y="1570" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1201" y="1552" width="44" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_006s2xy" bpmnElement="Flow_1bzp3jv">
+        <di:waypoint x="1600" y="1545" />
+        <di:waypoint x="1600" y="1490" />
+        <di:waypoint x="1300" y="1490" />
+        <di:waypoint x="1300" y="1530" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1440" y="1472" width="21" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_0zq6rm2" bpmnElement="Flow_044zvbm">
+        <di:waypoint x="1540" y="1570" />
+        <di:waypoint x="1575" y="1570" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_0uqbz6j" bpmnElement="Flow_1gymwkm">
+        <di:waypoint x="1625" y="1570" />
+        <di:waypoint x="1692" y="1570" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1648" y="1552" width="22" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1f6uwa2_di" bpmnElement="Flow_1f6uwa2">
+        <di:waypoint x="1025" y="1520" />
+        <di:waypoint x="1025" y="1545" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1wjpfr4_di" bpmnElement="Flow_1wjpfr4">
+        <di:waypoint x="1025" y="1595" />
+        <di:waypoint x="1025" y="1632" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1029" y="1611" width="22" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_1d2w3p7" bpmnElement="Flow_0xi7z4i">
+        <di:waypoint x="1350" y="1570" />
+        <di:waypoint x="1440" y="1570" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BPMNShape_1sv6oe4" bpmnElement="Activity_072gbnv" isExpanded="true">
         <dc:Bounds x="870" y="1030" width="750" height="340" />
         <bpmndi:BPMNLabel />
@@ -1021,101 +1102,12 @@
         <dc:Bounds x="660" y="1050" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0qyu80e" bpmnElement="Activity_0ak2ho3" isExpanded="true">
-        <dc:Bounds x="855" y="1420" width="925" height="280" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="Gateway_1f5wqou_di" bpmnElement="Gateway_0vyx6xb">
+        <dc:Bounds x="765" y="1185" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1rn9z6v" bpmnElement="Event_0haaibd">
-        <dc:Bounds x="885" y="1462" width="36" height="36" />
+      <bpmndi:BPMNShape id="Gateway_1193er5_di" bpmnElement="Gateway_15ql8ot">
+        <dc:Bounds x="1665" y="1285" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1a8xmid" bpmnElement="mkzrrff_4">
-        <dc:Bounds x="975" y="1440" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0sgsn68" bpmnElement="sjgcspg_4">
-        <dc:Bounds x="1250" y="1530" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0u4y8iq" bpmnElement="mkzrrsp_4">
-        <dc:Bounds x="1440" y="1530" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1iunr85" bpmnElement="Gateway_1bduqeh" isMarkerVisible="true">
-        <dc:Bounds x="1575" y="1545" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1un7h24" bpmnElement="Event_1jaa14d">
-        <dc:Bounds x="1692" y="1552" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0kubyme" bpmnElement="Gateway_151dwa8" isMarkerVisible="true">
-        <dc:Bounds x="1145" y="1545" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1xjq7zc" bpmnElement="Event_125tmf0">
-        <dc:Bounds x="1152" y="1632" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_173xe0u_di" bpmnElement="Gateway_173xe0u" isMarkerVisible="true">
-        <dc:Bounds x="1000" y="1545" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1acjy96_di" bpmnElement="Event_1acjy96">
-        <dc:Bounds x="1007" y="1632" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_1aai3l6" bpmnElement="Flow_0n3x332">
-        <di:waypoint x="921" y="1480" />
-        <di:waypoint x="975" y="1480" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_0xkmcsn" bpmnElement="Flow_1mwm3jy">
-        <di:waypoint x="1050" y="1570" />
-        <di:waypoint x="1145" y="1570" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1081" y="1552" width="33" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_00fxze9" bpmnElement="Flow_0aon77n">
-        <di:waypoint x="1195" y="1570" />
-        <di:waypoint x="1250" y="1570" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1201" y="1552" width="44" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_006s2xy" bpmnElement="Flow_1bzp3jv">
-        <di:waypoint x="1600" y="1545" />
-        <di:waypoint x="1600" y="1490" />
-        <di:waypoint x="1300" y="1490" />
-        <di:waypoint x="1300" y="1530" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1440" y="1472" width="21" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_1d2w3p7" bpmnElement="Flow_0xi7z4i">
-        <di:waypoint x="1350" y="1570" />
-        <di:waypoint x="1440" y="1570" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_0zq6rm2" bpmnElement="Flow_044zvbm">
-        <di:waypoint x="1540" y="1570" />
-        <di:waypoint x="1575" y="1570" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_0uqbz6j" bpmnElement="Flow_1gymwkm">
-        <di:waypoint x="1625" y="1570" />
-        <di:waypoint x="1692" y="1570" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1648" y="1552" width="22" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_17gi23v" bpmnElement="Flow_1u1h3jz">
-        <di:waypoint x="1170" y="1595" />
-        <di:waypoint x="1170" y="1632" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1158" y="1610" width="55" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1f6uwa2_di" bpmnElement="Flow_1f6uwa2">
-        <di:waypoint x="1025" y="1520" />
-        <di:waypoint x="1025" y="1545" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1wjpfr4_di" bpmnElement="Flow_1wjpfr4">
-        <di:waypoint x="1025" y="1595" />
-        <di:waypoint x="1025" y="1632" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1029" y="1611" width="22" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1g6zc95_di" bpmnElement="Flow_1g6zc95">
         <di:waypoint x="486" y="750" />
         <di:waypoint x="530" y="750" />
@@ -1211,7 +1203,10 @@
         <dc:Bounds x="2450" y="320" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0a1pfq1" bpmnElement="Gateway_1succ9k">
+      <bpmndi:BPMNShape id="Gateway_0i0n8s1_di" bpmnElement="Gateway_1e8w7bw">
+        <dc:Bounds x="2555" y="442" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1dim3w9_di" bpmnElement="Gateway_1succ9k">
         <dc:Bounds x="3505" y="535" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_1m87r68" bpmnElement="Activity_1xsrtpj" isExpanded="true">
@@ -1244,10 +1239,6 @@
       <bpmndi:BPMNShape id="Event_0ho1sw8_di" bpmnElement="Event_0ho1sw8">
         <dc:Bounds x="2732" y="462" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_1wy27v4" bpmnElement="Flow_1wjzl0u">
-        <di:waypoint x="3040" y="350" />
-        <di:waypoint x="3100" y="350" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_0qxym6m" bpmnElement="Flow_19fpo83">
         <di:waypoint x="3200" y="350" />
         <di:waypoint x="3235" y="350" />
@@ -1272,6 +1263,10 @@
         <di:waypoint x="2738" y="350" />
         <di:waypoint x="2790" y="350" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_1wy27v4" bpmnElement="Flow_1wjzl0u">
+        <di:waypoint x="3040" y="350" />
+        <di:waypoint x="3100" y="350" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0xcpnrt_di" bpmnElement="Flow_0xcpnrt">
         <di:waypoint x="2840" y="390" />
         <di:waypoint x="2840" y="455" />
@@ -1307,6 +1302,15 @@
       <bpmndi:BPMNShape id="BPMNShape_0a6akwi" bpmnElement="mkzrrff_5">
         <dc:Bounds x="2765" y="620" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_19yd79o" bpmnElement="Event_0x5b2wc">
+        <dc:Bounds x="2892" y="812" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0cp1ayz" bpmnElement="Gateway_0o0lepl" isMarkerVisible="true">
+        <dc:Bounds x="2885" y="725" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_14jfhxs" bpmnElement="sjgcspg_5">
+        <dc:Bounds x="3000" y="710" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_1uddvin" bpmnElement="mkzrrsp_5">
         <dc:Bounds x="3170" y="710" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -1317,15 +1321,6 @@
       <bpmndi:BPMNShape id="BPMNShape_0ucnmxd" bpmnElement="Event_1tjj7kf">
         <dc:Bounds x="3422" y="732" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_14jfhxs" bpmnElement="sjgcspg_5">
-        <dc:Bounds x="3000" y="710" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_19yd79o" bpmnElement="Event_0x5b2wc">
-        <dc:Bounds x="2892" y="812" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0cp1ayz" bpmnElement="Gateway_0o0lepl" isMarkerVisible="true">
-        <dc:Bounds x="2885" y="725" width="50" height="50" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1430gpz_di" bpmnElement="Gateway_1430gpz" isMarkerVisible="true">
         <dc:Bounds x="2790" y="725" width="50" height="50" />
       </bpmndi:BPMNShape>
@@ -1336,6 +1331,13 @@
         <di:waypoint x="2711" y="660" />
         <di:waypoint x="2765" y="660" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_1fpbsa6" bpmnElement="Flow_0uq7eff">
+        <di:waypoint x="2910" y="775" />
+        <di:waypoint x="2910" y="812" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2898" y="790" width="55" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_1035sm2" bpmnElement="Flow_0stb0ce">
         <di:waypoint x="2935" y="750" />
         <di:waypoint x="3000" y="750" />
@@ -1367,13 +1369,6 @@
           <dc:Bounds x="3378" y="732" width="22" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_1fpbsa6" bpmnElement="Flow_0uq7eff">
-        <di:waypoint x="2910" y="775" />
-        <di:waypoint x="2910" y="812" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2898" y="790" width="55" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_06tovlr_di" bpmnElement="Flow_06tovlr">
         <di:waypoint x="2815" y="700" />
         <di:waypoint x="2815" y="725" />
@@ -1392,9 +1387,6 @@
           <dc:Bounds x="2819" y="791" width="22" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="BPMNShape_0skeub1" bpmnElement="Gateway_1e8w7bw">
-        <dc:Bounds x="2555" y="442" width="50" height="50" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_0j8sx43" bpmnElement="Event_1d40kan">
         <dc:Bounds x="2352" y="342" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -1446,9 +1438,8 @@
         <di:waypoint x="3530" y="585" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0uhjeie_di" bpmnElement="Flow_0uhjeie">
-        <di:waypoint x="3555" y="560" />
-        <di:waypoint x="3570" y="560" />
-        <di:waypoint x="3570" y="180" />
+        <di:waypoint x="3530" y="535" />
+        <di:waypoint x="3530" y="180" />
         <di:waypoint x="2500" y="180" />
         <di:waypoint x="2500" y="320" />
       </bpmndi:BPMNEdge>
@@ -1472,10 +1463,10 @@
       <bpmndi:BPMNShape id="BPMNShape_1cekhkz" bpmnElement="Event_06g8vvk">
         <dc:Bounds x="2627" y="1689" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1rdf9ny" bpmnElement="Gateway_04d5tro">
+      <bpmndi:BPMNShape id="Gateway_0ru9o1a_di" bpmnElement="Gateway_04d5tro">
         <dc:Bounds x="2700" y="1582" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1b33ukk" bpmnElement="Gateway_199z3y7">
+      <bpmndi:BPMNShape id="Gateway_1cfy5gl_di" bpmnElement="Gateway_199z3y7">
         <dc:Bounds x="3645" y="1682" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_0n30uyu" bpmnElement="Activity_09ag01n" isExpanded="true">
@@ -1555,6 +1546,101 @@
           <dc:Bounds x="3021" y="1652" width="33" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="BPMNShape_0pdwqde" bpmnElement="Activity_1ybj2u2" isExpanded="true">
+        <dc:Bounds x="2790" y="1800" width="940" height="280" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0y6ofh9" bpmnElement="Event_0ol63yw">
+        <dc:Bounds x="2820" y="1842" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_14v7tsz" bpmnElement="mkzrrff_8">
+        <dc:Bounds x="2910" y="1820" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1soz6vj" bpmnElement="Event_00q2qf1">
+        <dc:Bounds x="3062" y="2012" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0ztnipz" bpmnElement="Gateway_16t07po" isMarkerVisible="true">
+        <dc:Bounds x="3055" y="1925" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0bbe72l" bpmnElement="sjgcspg_8">
+        <dc:Bounds x="3150" y="1910" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1oiyxd2" bpmnElement="mkzrrsp_8">
+        <dc:Bounds x="3340" y="1910" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0qybl8t" bpmnElement="Gateway_1c6k976" isMarkerVisible="true">
+        <dc:Bounds x="3475" y="1925" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_08kt2jo" bpmnElement="Event_0nmzcnh">
+        <dc:Bounds x="3592" y="1932" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0bvgduj_di" bpmnElement="Gateway_0bvgduj" isMarkerVisible="true">
+        <dc:Bounds x="2935" y="1925" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0vde01v_di" bpmnElement="Event_0vde01v">
+        <dc:Bounds x="2942" y="2012" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_137c1jz" bpmnElement="Flow_02naor5">
+        <di:waypoint x="2856" y="1860" />
+        <di:waypoint x="2910" y="1860" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_02b49sk" bpmnElement="Flow_1gwfkl5">
+        <di:waypoint x="3080" y="1975" />
+        <di:waypoint x="3080" y="2012" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3068" y="1990" width="55" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_132uvko" bpmnElement="Flow_0jmj18j">
+        <di:waypoint x="3105" y="1950" />
+        <di:waypoint x="3150" y="1950" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3106" y="1932" width="44" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_1qbeeuj" bpmnElement="Flow_0fzqe69">
+        <di:waypoint x="3500" y="1925" />
+        <di:waypoint x="3500" y="1870" />
+        <di:waypoint x="3200" y="1870" />
+        <di:waypoint x="3200" y="1910" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3340" y="1852" width="21" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_1r8irxn" bpmnElement="Flow_1jr37d1">
+        <di:waypoint x="3250" y="1950" />
+        <di:waypoint x="3340" y="1950" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_0swzdou" bpmnElement="Flow_1ctnsbg">
+        <di:waypoint x="3440" y="1950" />
+        <di:waypoint x="3475" y="1950" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_0n6e12q" bpmnElement="Flow_1tge35x">
+        <di:waypoint x="3525" y="1950" />
+        <di:waypoint x="3592" y="1950" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3548" y="1932" width="22" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0zu6owj_di" bpmnElement="Flow_0zu6owj">
+        <di:waypoint x="2960" y="1900" />
+        <di:waypoint x="2960" y="1925" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1kr2i1f_di" bpmnElement="Flow_1kr2i1f">
+        <di:waypoint x="2985" y="1950" />
+        <di:waypoint x="3055" y="1950" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3004" y="1932" width="33" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_102whmg_di" bpmnElement="Flow_102whmg">
+        <di:waypoint x="2960" y="1975" />
+        <di:waypoint x="2960" y="2012" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2965" y="1991" width="22" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="BPMNShape_04be2wp" bpmnElement="Event_0gnnl5f">
         <dc:Bounds x="2392" y="1132" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -1643,101 +1729,6 @@
       <bpmndi:BPMNShape id="BPMNShape_1jlh2yw" bpmnElement="Event_0srt00p">
         <dc:Bounds x="2504" y="1312" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0pdwqde" bpmnElement="Activity_1ybj2u2" isExpanded="true">
-        <dc:Bounds x="2790" y="1800" width="940" height="280" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0y6ofh9" bpmnElement="Event_0ol63yw">
-        <dc:Bounds x="2820" y="1842" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_14v7tsz" bpmnElement="mkzrrff_8">
-        <dc:Bounds x="2910" y="1820" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0bbe72l" bpmnElement="sjgcspg_8">
-        <dc:Bounds x="3150" y="1910" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1oiyxd2" bpmnElement="mkzrrsp_8">
-        <dc:Bounds x="3340" y="1910" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0qybl8t" bpmnElement="Gateway_1c6k976" isMarkerVisible="true">
-        <dc:Bounds x="3475" y="1925" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_08kt2jo" bpmnElement="Event_0nmzcnh">
-        <dc:Bounds x="3592" y="1932" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1soz6vj" bpmnElement="Event_00q2qf1">
-        <dc:Bounds x="3062" y="2012" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0ztnipz" bpmnElement="Gateway_16t07po" isMarkerVisible="true">
-        <dc:Bounds x="3055" y="1925" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_0bvgduj_di" bpmnElement="Gateway_0bvgduj" isMarkerVisible="true">
-        <dc:Bounds x="2935" y="1925" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0vde01v_di" bpmnElement="Event_0vde01v">
-        <dc:Bounds x="2942" y="2012" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="BPMNEdge_137c1jz" bpmnElement="Flow_02naor5">
-        <di:waypoint x="2856" y="1860" />
-        <di:waypoint x="2910" y="1860" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_132uvko" bpmnElement="Flow_0jmj18j">
-        <di:waypoint x="3105" y="1950" />
-        <di:waypoint x="3150" y="1950" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3106" y="1932" width="44" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_1qbeeuj" bpmnElement="Flow_0fzqe69">
-        <di:waypoint x="3500" y="1925" />
-        <di:waypoint x="3500" y="1870" />
-        <di:waypoint x="3200" y="1870" />
-        <di:waypoint x="3200" y="1910" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3340" y="1852" width="21" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_1r8irxn" bpmnElement="Flow_1jr37d1">
-        <di:waypoint x="3250" y="1950" />
-        <di:waypoint x="3340" y="1950" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_0swzdou" bpmnElement="Flow_1ctnsbg">
-        <di:waypoint x="3440" y="1950" />
-        <di:waypoint x="3475" y="1950" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_0n6e12q" bpmnElement="Flow_1tge35x">
-        <di:waypoint x="3525" y="1950" />
-        <di:waypoint x="3592" y="1950" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3548" y="1932" width="22" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_02b49sk" bpmnElement="Flow_1gwfkl5">
-        <di:waypoint x="3080" y="1975" />
-        <di:waypoint x="3080" y="2012" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3068" y="1990" width="55" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0zu6owj_di" bpmnElement="Flow_0zu6owj">
-        <di:waypoint x="2960" y="1900" />
-        <di:waypoint x="2960" y="1925" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1kr2i1f_di" bpmnElement="Flow_1kr2i1f">
-        <di:waypoint x="2985" y="1950" />
-        <di:waypoint x="3055" y="1950" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3004" y="1932" width="33" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_102whmg_di" bpmnElement="Flow_102whmg">
-        <di:waypoint x="2960" y="1975" />
-        <di:waypoint x="2960" y="2012" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2965" y="1991" width="22" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_0f19815" bpmnElement="Flow_0q4xoqy">
         <di:waypoint x="2645" y="1380" />
         <di:waypoint x="2645" y="1460" />
diff --git a/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn b/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn
index 2590ead2..d12f3da3 100644
--- a/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn
+++ b/laws-modules/src/main/resources/bpmn/法规合规评估流程camund.bpmn
@@ -489,35 +489,31 @@
           <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${skip}</bpmn:conditionExpression>
         </bpmn:sequenceFlow>
       </bpmn:subProcess>
-      <bpmn:inclusiveGateway id="Gateway_1e8w7bw">
-        <bpmn:incoming>Flow_0rkq2tw</bpmn:incoming>
-        <bpmn:outgoing>Flow_0ljfd7s</bpmn:outgoing>
-        <bpmn:outgoing>Flow_0gac88y</bpmn:outgoing>
-      </bpmn:inclusiveGateway>
       <bpmn:sequenceFlow id="Flow_0rkq2tw" name="驳回" sourceRef="Gateway_1uodwb8" targetRef="Gateway_1e8w7bw">
         <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!pass}</bpmn:conditionExpression>
       </bpmn:sequenceFlow>
       <bpmn:sequenceFlow id="Flow_0ncu6j5" name="通过" sourceRef="Gateway_1uodwb8" targetRef="Event_1kdwhwn">
         <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${pass}</bpmn:conditionExpression>
       </bpmn:sequenceFlow>
-      <bpmn:sequenceFlow id="Flow_0ljfd7s" name="涉及工程师" sourceRef="Gateway_1e8w7bw" targetRef="Activity_1xsrtpj">
-        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize &gt; 0}</bpmn:conditionExpression>
-      </bpmn:sequenceFlow>
-      <bpmn:sequenceFlow id="Flow_0gac88y" name="不涉及工程师" sourceRef="Gateway_1e8w7bw" targetRef="Activity_1n4w1w7">
-        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${notInvolvedModuleOwnerListSize &gt; 0}</bpmn:conditionExpression>
-      </bpmn:sequenceFlow>
+      <bpmn:sequenceFlow id="Flow_0ljfd7s" name="涉及工程师" sourceRef="Gateway_1e8w7bw" targetRef="Activity_1xsrtpj" />
+      <bpmn:sequenceFlow id="Flow_0gac88y" name="不涉及工程师" sourceRef="Gateway_1e8w7bw" targetRef="Activity_1n4w1w7" />
       <bpmn:sequenceFlow id="Flow_117rgu5" sourceRef="bszgjldsp_2" targetRef="Gateway_1uodwb8" />
-      <bpmn:inclusiveGateway id="Gateway_1succ9k">
-        <bpmn:incoming>Flow_0zsh74h</bpmn:incoming>
-        <bpmn:incoming>Flow_0xkvov2</bpmn:incoming>
-        <bpmn:outgoing>Flow_0uhjeie</bpmn:outgoing>
-      </bpmn:inclusiveGateway>
       <bpmn:sequenceFlow id="Flow_0zsh74h" sourceRef="Activity_1xsrtpj" targetRef="Gateway_1succ9k" />
       <bpmn:sequenceFlow id="Flow_0xkvov2" sourceRef="Activity_1n4w1w7" targetRef="Gateway_1succ9k" />
       <bpmn:sequenceFlow id="Flow_0uhjeie" sourceRef="Gateway_1succ9k" targetRef="bszgjldsp_2" />
       <bpmn:startEvent id="Event_1d40kan">
         <bpmn:outgoing>Flow_0x6qt62</bpmn:outgoing>
       </bpmn:startEvent>
+      <bpmn:parallelGateway id="Gateway_1e8w7bw">
+        <bpmn:incoming>Flow_0rkq2tw</bpmn:incoming>
+        <bpmn:outgoing>Flow_0ljfd7s</bpmn:outgoing>
+        <bpmn:outgoing>Flow_0gac88y</bpmn:outgoing>
+      </bpmn:parallelGateway>
+      <bpmn:parallelGateway id="Gateway_1succ9k">
+        <bpmn:incoming>Flow_0zsh74h</bpmn:incoming>
+        <bpmn:incoming>Flow_0xkvov2</bpmn:incoming>
+        <bpmn:outgoing>Flow_0uhjeie</bpmn:outgoing>
+      </bpmn:parallelGateway>
     </bpmn:subProcess>
     <bpmn:sequenceFlow id="Flow_0mngw8y" name="驳回" sourceRef="Gateway_0mobyxv" targetRef="Gateway_04oc605">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!pass}</bpmn:conditionExpression>
@@ -560,16 +556,6 @@
       <bpmn:endEvent id="Event_06g8vvk">
         <bpmn:incoming>Flow_16ifeqw</bpmn:incoming>
       </bpmn:endEvent>
-      <bpmn:inclusiveGateway id="Gateway_04d5tro">
-        <bpmn:incoming>Flow_14m4664</bpmn:incoming>
-        <bpmn:outgoing>Flow_0epd47x</bpmn:outgoing>
-        <bpmn:outgoing>Flow_0gtzh06</bpmn:outgoing>
-      </bpmn:inclusiveGateway>
-      <bpmn:inclusiveGateway id="Gateway_199z3y7">
-        <bpmn:incoming>Flow_0elxtw0</bpmn:incoming>
-        <bpmn:incoming>Flow_184uarj</bpmn:incoming>
-        <bpmn:outgoing>Flow_0xbmrsd</bpmn:outgoing>
-      </bpmn:inclusiveGateway>
       <bpmn:subProcess id="Activity_09ag01n" name="模块责任人驳回子流程">
         <bpmn:incoming>Flow_0epd47x</bpmn:incoming>
         <bpmn:outgoing>Flow_0elxtw0</bpmn:outgoing>
@@ -728,12 +714,8 @@
       <bpmn:sequenceFlow id="Flow_16ifeqw" name="通过" sourceRef="Gateway_1gyluzc" targetRef="Event_06g8vvk">
         <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${pass}</bpmn:conditionExpression>
       </bpmn:sequenceFlow>
-      <bpmn:sequenceFlow id="Flow_0epd47x" name="涉及工程师" sourceRef="Gateway_04d5tro" targetRef="Activity_09ag01n">
-        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize &gt; 0}</bpmn:conditionExpression>
-      </bpmn:sequenceFlow>
-      <bpmn:sequenceFlow id="Flow_0gtzh06" name="不涉及工程师" sourceRef="Gateway_04d5tro" targetRef="Activity_1ybj2u2">
-        <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${notInvolvedModuleOwnerListSize &gt; 0}</bpmn:conditionExpression>
-      </bpmn:sequenceFlow>
+      <bpmn:sequenceFlow id="Flow_0epd47x" name="涉及工程师" sourceRef="Gateway_04d5tro" targetRef="Activity_09ag01n" />
+      <bpmn:sequenceFlow id="Flow_0gtzh06" name="不涉及工程师" sourceRef="Gateway_04d5tro" targetRef="Activity_1ybj2u2" />
       <bpmn:sequenceFlow id="Flow_0elxtw0" sourceRef="Activity_09ag01n" targetRef="Gateway_199z3y7" />
       <bpmn:sequenceFlow id="Flow_184uarj" sourceRef="Activity_1ybj2u2" targetRef="Gateway_199z3y7" />
       <bpmn:startEvent id="Event_0gnnl5f">
@@ -826,6 +808,16 @@
       <bpmn:sequenceFlow id="Flow_02fli1m" name="全部不涉及" sourceRef="Gateway_1ughbu9" targetRef="Event_0srt00p">
         <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${moduleOwnerListSize == 0}</bpmn:conditionExpression>
       </bpmn:sequenceFlow>
+      <bpmn:parallelGateway id="Gateway_04d5tro">
+        <bpmn:incoming>Flow_14m4664</bpmn:incoming>
+        <bpmn:outgoing>Flow_0epd47x</bpmn:outgoing>
+        <bpmn:outgoing>Flow_0gtzh06</bpmn:outgoing>
+      </bpmn:parallelGateway>
+      <bpmn:parallelGateway id="Gateway_199z3y7">
+        <bpmn:incoming>Flow_0elxtw0</bpmn:incoming>
+        <bpmn:incoming>Flow_184uarj</bpmn:incoming>
+        <bpmn:outgoing>Flow_0xbmrsd</bpmn:outgoing>
+      </bpmn:parallelGateway>
     </bpmn:subProcess>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
@@ -1211,6 +1203,12 @@
         <dc:Bounds x="2450" y="320" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0i0n8s1_di" bpmnElement="Gateway_1e8w7bw">
+        <dc:Bounds x="2555" y="442" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1dim3w9_di" bpmnElement="Gateway_1succ9k">
+        <dc:Bounds x="3505" y="535" width="50" height="50" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_1m87r68" bpmnElement="Activity_1xsrtpj" isExpanded="true">
         <dc:Bounds x="2645" y="220" width="835" height="335" />
         <bpmndi:BPMNLabel />
@@ -1389,12 +1387,6 @@
           <dc:Bounds x="2819" y="791" width="22" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="BPMNShape_0skeub1" bpmnElement="Gateway_1e8w7bw">
-        <dc:Bounds x="2555" y="442" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0a1pfq1" bpmnElement="Gateway_1succ9k">
-        <dc:Bounds x="3505" y="535" width="50" height="50" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_0j8sx43" bpmnElement="Event_1d40kan">
         <dc:Bounds x="2352" y="342" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -1446,9 +1438,8 @@
         <di:waypoint x="3530" y="585" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0uhjeie_di" bpmnElement="Flow_0uhjeie">
-        <di:waypoint x="3555" y="560" />
-        <di:waypoint x="3570" y="560" />
-        <di:waypoint x="3570" y="180" />
+        <di:waypoint x="3530" y="535" />
+        <di:waypoint x="3530" y="180" />
         <di:waypoint x="2500" y="180" />
         <di:waypoint x="2500" y="320" />
       </bpmndi:BPMNEdge>
@@ -1472,10 +1463,10 @@
       <bpmndi:BPMNShape id="BPMNShape_1cekhkz" bpmnElement="Event_06g8vvk">
         <dc:Bounds x="2627" y="1689" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1rdf9ny" bpmnElement="Gateway_04d5tro">
+      <bpmndi:BPMNShape id="Gateway_0ru9o1a_di" bpmnElement="Gateway_04d5tro">
         <dc:Bounds x="2700" y="1582" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1b33ukk" bpmnElement="Gateway_199z3y7">
+      <bpmndi:BPMNShape id="Gateway_1cfy5gl_di" bpmnElement="Gateway_199z3y7">
         <dc:Bounds x="3645" y="1682" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_0n30uyu" bpmnElement="Activity_09ag01n" isExpanded="true">