Merge branch 'develop' into dev/mix20191225_security

mrman-service/src/main/java/com/diagbot/facade/ArRechomeFacade.java

@@ -15,6 +15,7 @@ import com.diagbot.service.MrMrcontentService;
 import com.diagbot.service.impl.ArRechomeServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.BABLDetailVO;
 import com.diagbot.vo.BABLVO;
 import com.google.common.collect.Lists;
@@ -134,17 +135,28 @@ public class ArRechomeFacade extends ArRechomeServiceImpl {
                 }
                 brRecdiagnoses.addAll(bablDetailVO.getZyqtzdList());
             }
-            //删除就的诊断列表
-            UpdateWrapper<BrRecdiagnose> brRecdiagnoseUpdateWrapper = new UpdateWrapper<>();
-            brRecdiagnoseUpdateWrapper.eq("BASYID", bablDetailVO.getBasyid());
-            brRecdiagnoseService.remove(brRecdiagnoseUpdateWrapper);
-            //插入新的诊断列表
-            brRecdiagnoseService.saveBatch(brRecdiagnoses);
+
+            if (ListUtil.isNotEmpty(brRecdiagnoses)) {
+                //删除就的诊断列表
+                UpdateWrapper<BrRecdiagnose> brRecdiagnoseUpdateWrapper = new UpdateWrapper<>();
+                brRecdiagnoseUpdateWrapper.eq("BASYID", bablDetailVO.getBasyid());
+                brRecdiagnoseService.remove(brRecdiagnoseUpdateWrapper);
+                //插入新的诊断列表
+                brRecdiagnoseService.saveBatch(brRecdiagnoses);
+            }
 
             //修改病历记录内容
             List<MrMrcontent> mrMrcontents = Lists.newLinkedList();
             if (ListUtil.isNotEmpty(bablDetailVO.getZybljlList())) {
-                mrMrcontents = BeanUtil.listCopyTo(bablDetailVO.getZybljlList(), MrMrcontent.class);
+                for (BLJLDetailDTO bljlDetailDTO : bablDetailVO.getZybljlList()) {
+                    MrMrcontent mrMrcontent = new MrMrcontent();
+                    BeanUtil.copyProperties(bljlDetailDTO, mrMrcontent);
+                    if (StringUtil.isBlank(mrMrcontent.getBljlnr())) {
+                        mrMrcontent.setBljlnr("");
+                    }
+                    mrMrcontents.add(mrMrcontent);
+                }
+                //                mrMrcontents = BeanUtil.listCopyTo(bablDetailVO.getZybljlList(), MrMrcontent.class);
                 mrMrcontentService.updateBatchById(mrMrcontents);
             }
             return true;