基因定制区分CKO和KO

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -381,6 +381,17 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
                 RandomUtil.randomString(RandomUtil.BASE_CHAR_NUMBER_LOWER, 4));
         log.info("生成word 项目名称：{} 文件名称：{}", detail.getProjectName(), fileName);
 
+        //遗传背景说明
+        if (detail.getTarget().contains(GeneTargetEnum.PURIFICATION.getCode())) {
+            StrainPurificationInfoDto purification = detail.getPurification();
+
+            //遗传背景替换
+            String geneticBackground = purification.getGeneticBackground();
+            if (StrUtil.isNotBlank(geneticBackground)) {
+                purification.setGeneticBackground(geneticBackground.replace("CKO", "CK"));
+            }
+        }
+
         JSONObject dataMap = JSON.parseObject(JSON.toJSONString(detail));
         wordDataService.fillDocCreator(dataMap);
 
@@ -393,16 +404,6 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
             }
         }
 
-        //遗传背景说明
-        if (detail.getTarget().contains(GeneTargetEnum.PURIFICATION.getCode())) {
-            JSONObject noteObj = new JSONObject();
-            String geneticBackgroundNote = detail.getPurification().getGeneticBackgroundNote();
-            if (StrUtil.isNotBlank(geneticBackgroundNote)) {
-                noteObj = JSON.parseObject(geneticBackgroundNote);
-            }
-            dataMap.getJSONObject("purification").put("geneticBackgroundNote", noteObj);
-        }
-
         dataMap.put("approvalNo", WordUtil.padString(flowInfo.getApprovalNo(), 14));
         dataMap.put("revisionNo", WordUtil.padString(flowInfo.getRevisionNo(), 14));
         dataMap.put("receiptDate", WordUtil.padString(flowInfo.getReceiptDate(), 12));

jfcloud-gene-biz/src/main/resources/ftlTemplate/geneCustom.ftl

@@ -3700,7 +3700,7 @@
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
                                         </w:rPr>
-                                        <#if purification.geneticBackground?? && purification.geneticBackground?contains('CKO')>
+                                        <#if purification.geneticBackground?? && purification.geneticBackground?contains('CK')>
                                             <w:sym w:font="Wingdings 2" w:char="F052"/>
                                         <#else >
                                             <w:sym w:font="Wingdings 2" w:char="F0A3"/>
@@ -3827,7 +3827,7 @@
                                         </w:rPr>
                                         <w:t xml:space="preserve"> </w:t>
                                     </w:r>
-                                    <#if purification.geneticBackgroundOther??>
+                                    <#if purification.geneticBackground?? && purification.geneticBackground?contains('其他')>
                                     <w:r>
                                         <w:rPr>
                                             <w:rFonts w:hint="default"/>
@@ -3838,7 +3838,6 @@
                                     </w:r>
                                     </#if>
                                 </w:p>
-
 							</w:tc>
 						</w:tr>
                         <#if purification.geneticBackground?? && purification.geneticBackground?contains('KO')>
@@ -4137,7 +4136,7 @@
 							</w:tc>
 						</w:tr>
                         </#if>
-                        <#if purification.geneticBackground?? && purification.geneticBackground?contains('CKO')>
+                        <#if purification.geneticBackground?? && purification.geneticBackground?contains('CK')>
 						<w:tr w:rsidR="00B33B30" w:rsidTr="007E570B">
 							<w:trPr>
 								<w:trHeight w:val="425"/>
@@ -5025,7 +5024,7 @@
 							</w:tc>
 						</w:tr>
                         </#if>
-                        <#if purification.geneticBackgroundOther??>>
+                        <#if purification.geneticBackground?? && purification.geneticBackground?contains('其他')>
 						<w:tr w:rsidR="00B33B30" w:rsidTr="007E570B">
 							<w:trPr>
 								<w:trHeight w:val="425"/>