jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 938c0d7a039ce3a286e8b5b0558eda2a9176aec2

Authored by wtt
1 parent 1dd5f5b3ef
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 30 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 938c0d7
... ... @@ -1094,11 +1094,23 @@
1094 1094 public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
1095 1095  
1096 1096 setZyzlState(destModel.getZyzlState());
1097   - setZyzlContent(destModel.getZyzlContent());
  1097 + if("no".equals(destModel.getZyzlState())){
  1098 + setZyzlContent(null);
  1099 + }else {
  1100 + setZyzlContent(destModel.getZyzlContent());
  1101 + }
1098 1102 setZywzzlState(destModel.getZywzzlState());
1099   - setZywzzlContent(destModel.getZywzzlContent());
  1103 + if("no".equals(destModel.getZywzzlState())){
  1104 + setZywzzlContent(null);
  1105 + }else {
  1106 + setZywzzlContent(destModel.getZywzzlContent());
  1107 + }
1100 1108 setZyatzlState(destModel.getZyatzlState());
1101   - setZyatzlContent(destModel.getZyatzlContent());
  1109 + if("no".equals(destModel.getZyatzlState())){
  1110 + setZyatzlContent(null);
  1111 + }else {
  1112 + setZyatzlContent(destModel.getZyatzlContent());
  1113 + }
1102 1114  
1103 1115 setResultSupple(destModel.getResultSupple());
1104 1116 setTtita(destModel.getTtita());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 938c0d7
... ... @@ -1933,13 +1933,24 @@
1933 1933 }
1934 1934 public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
1935 1935 if (null != antExChuModel) {
1936   -
1937 1936 setZyzlState(antExChuModel.getZyzlState());
1938   - setZyzlContent(antExChuModel.getZyzlContent());
  1937 + if("no".equals(antExChuModel.getZyzlState())){
  1938 + setZyzlContent(null);
  1939 + }else {
  1940 + setZyzlContent(antExChuModel.getZyzlContent());
  1941 + }
1939 1942 setZywzzlState(antExChuModel.getZywzzlState());
1940   - setZywzzlContent(antExChuModel.getZywzzlContent());
  1943 + if("no".equals(antExChuModel.getZywzzlState())){
  1944 + setZywzzlContent(null);
  1945 + }else {
  1946 + setZywzzlContent(antExChuModel.getZywzzlContent());
  1947 + }
1941 1948 setZyatzlState(antExChuModel.getZyatzlState());
1942   - setZyatzlContent(antExChuModel.getZyatzlContent());
  1949 + if("no".equals(antExChuModel.getZyatzlState())){
  1950 + setZyatzlContent(null);
  1951 + }else {
  1952 + setZyatzlContent(antExChuModel.getZyatzlContent());
  1953 + }
1943 1954  
1944 1955 setResultSupple(antExChuModel.getResultSupple());
1945 1956 setTtita(antExChuModel.getTtita());