From a57ada9b0e9d616795889853785e3b1f9091769e Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Mon, 22 Nov 2021 16:14:22 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/pojo/CancerScreeningModel.java     |  2 +-
 .../platform/operate/web/facade/CancerScreeningFacade.java    |  8 ++++----
 .../platform/operate/web/result/CancerScreeningResult.java    | 11 +++++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
index 17e2b8f..b2dfdb1 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
@@ -288,7 +288,7 @@ public class CancerScreeningModel extends BaseModel {
     private String bLzdRy;
     //诊断时间
     private Date bLzdSj;
-    //最后诊断 内容字段 yn(0未见异常,1异常);yc(异常项1-9)展示用到enum(LhEndDiagnosisContent);qt(其他注明);
+    //最后诊断 内容字段 yn(0未见异常,1异常);yc(异常项1-9),前端存成数组[],展示用到enum(LhEndDiagnosisContent);qt(其他注明);
     private Map<String,Object> zhJd;
     //诊断机构
     private String zHzdJg;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
index d3bf249..91fb270 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
@@ -316,11 +316,11 @@ public class CancerScreeningFacade {
         //乳腺最后随访结果内容翻译字段（map key:yc）
         if(null!=cancerScreeningModel.getZhJd()){
             if(null!=cancerScreeningModel.getZhJd().get("yc")){
-                String[] arry = null;
-                for (int i=0; i<((String[]) cancerScreeningModel.getZhJd().get("yc")).length;i++) {
-                    arry[i]=LhEndDiagnosisContent.getName(((String[]) cancerScreeningModel.getZhJd().get("yc"))[i]);
+                List<String> list=new ArrayList<>();
+                for (String yc : (List<String>) cancerScreeningModel.getZhJd().get("yc")) {
+                    list.add(LhEndDiagnosisContent.getName(yc));
                 }
-                result.setMapYcName(arry);
+                result.setMapYcName(list);
             }
         }
         org.springframework.beans.BeanUtils.copyProperties(cancerScreeningModel,result);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java
index 1d741b4..97c464d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java
@@ -2,6 +2,8 @@ package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.pojo.CancerScreeningModel;
 
+import java.util.List;
+
 /**
  * Created by Administrator on 2021-07-19.
  */
@@ -16,14 +18,15 @@ public class CancerScreeningResult extends CancerScreeningModel {
     private String newRxCssjName;
     //乳腺X线检查容翻译字段
     private String rxXJcName;
-    //乳腺最后随访结果内容翻译字段（map key:yc）
-    private String[] mapYcName;
+    //乳腺最后随访结果内容翻译字段（map key:yc）用到enum(LhEndDiagnosisContent)
+    private List<String> mapYcName;
+
 
-    public String[] getMapYcName() {
+    public List<String> getMapYcName() {
         return mapYcName;
     }
 
-    public void setMapYcName(String[] mapYcName) {
+    public void setMapYcName(List<String> mapYcName) {
         this.mapYcName = mapYcName;
     }
 
-- 
1.8.3.1