解决空指针

cdssman-service/src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -369,7 +369,6 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                     klOperationFacade.saveAll(commonParam,klConceptSaveVO.getKlOperationVO());
                     break;
                 case VitalResult:
-                    klVitalResFacade.saveAll(commonParam,klConceptSaveVO.getKlVitalResultVO());
                     klRelationFacade.saveKlVitalRes(commonParam, klConceptSaveVO.getKlVitalResultVO());
                     break;
 

cdssman-service/src/main/java/com/diagbot/facade/KlLisFacade.java

@@ -96,6 +96,9 @@ public class KlLisFacade extends KlLisServiceImpl {
      * @return
      */
     public boolean saveAll(CommonParam commonParam, KlLisVO klLisVO) {
+        if(klLisVO == null){
+            return false;
+        }
         // 先删除疾病扩展表
         this.remove(new QueryWrapper<KlLis>().eq("concept_id", commonParam.getConceptId()));
         // 重新插入扩展表

cdssman-service/src/main/java/com/diagbot/facade/KlOperationFacade.java

@@ -32,6 +32,9 @@ public class KlOperationFacade extends KlOperationServiceImpl {
      * @return
      */
     public boolean saveAll(CommonParam commonParam, KlOperationVO klOperationVO) {
+        if(klOperationVO == null){
+            return false;
+        }
         // 先删除手术扩展表
         this.remove(new QueryWrapper<KlOperation>().eq("concept_id", commonParam.getConceptId()));
         // 重新插入扩展表

cdssman-service/src/main/java/com/diagbot/facade/KlPacsFacade.java

@@ -39,6 +39,9 @@ public class KlPacsFacade extends KlPacsServiceImpl {
      * @return
      */
     public boolean saveAll(CommonParam commonParam, KlPacsVO klPacsVO) {
+        if(klPacsVO == null){
+            return false;
+        }
         // 先删除辅检扩展表
         this.remove(new QueryWrapper<KlPacs>().eq("concept_id", commonParam.getConceptId()));
         // 重新插入扩展表

cdssman-service/src/main/java/com/diagbot/facade/KlRelationFacade.java

@@ -7,10 +7,13 @@ import com.diagbot.dto.TreeDTO;
 import com.diagbot.entity.CommonParam;
 import com.diagbot.entity.KlRelation;
 import com.diagbot.entity.KlRelationOrder;
+import com.diagbot.entity.KlVitalResult;
 import com.diagbot.enums.RelationLibTypeEnum;
 import com.diagbot.service.KlRelationOrderService;
 import com.diagbot.service.KlRelationService;
+import com.diagbot.service.KlVitalResultService;
 import com.diagbot.service.impl.KlRelationServiceImpl;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.KlDiseaseVO;
@@ -47,6 +50,10 @@ public class KlRelationFacade extends KlRelationServiceImpl {
     @Autowired
     KlConceptFacade klConceptFacade;
 
+    @Qualifier("klVitalResultServiceImpl")
+    @Autowired
+    KlVitalResultService klVitalResultService;
+;
     public TreeAllDTO getTree(TreeVO treeVO) {
         List<Long[]> pList = new ArrayList<>();
         pList.add(new Long[] { 402L, 600L, 301L, 600L, 101L });//药品化学物质类别
@@ -164,6 +171,21 @@ public class KlRelationFacade extends KlRelationServiceImpl {
      * @param klVitalResultVO
      */
     public void saveKlVitalRes(CommonParam commonParam, KlVitalResultVO klVitalResultVO) {
+        if(klVitalResultVO == null){
+            return;
+        }
+        // 先删除体征结果扩展表
+        klVitalResultService.remove(new QueryWrapper<KlVitalResult>().eq("concept_id", commonParam.getConceptId()));
+        // 重新插入扩展表
+        KlVitalResult klVitalResult = new KlVitalResult();
+        BeanUtil.copyProperties(klVitalResultVO, klVitalResult);
+        klVitalResult.setConceptId(commonParam.getConceptId());
+        klVitalResult.setGmtModified(commonParam.getNow());
+        klVitalResult.setGmtCreate(commonParam.getNow());
+        klVitalResult.setCreator(commonParam.getPerson());
+        klVitalResult.setModifier(commonParam.getPerson());
+        klVitalResultService.save(klVitalResult);
+
         // 体征结果关联科室，部位统一处理。先查找全部数据，删除关联排序表，再删除关联表
         List<Integer> relationIdList = Lists.newArrayList(
                 RelationLibTypeEnum.relationDept.getKey(),

cdssman-service/src/main/java/com/diagbot/facade/KlVitalResFacade.java

@@ -34,26 +34,6 @@ public class KlVitalResFacade extends KlVitalResultServiceImpl {
     @Autowired
     KlConceptFacade klConceptFacade;
 
-    /**
-     * 保存体征结果扩展表
-     *
-     * @param commonParam
-     * @param klVitalResultVO
-     * @return
-     */
-    public boolean saveAll(CommonParam commonParam, KlVitalResultVO klVitalResultVO) {
-        // 先删除体征结果扩展表
-        this.remove(new QueryWrapper<KlVitalResult>().eq("concept_id", commonParam.getConceptId()));
-        // 重新插入扩展表
-        KlVitalResult klVitalResult = new KlVitalResult();
-        BeanUtil.copyProperties(klVitalResultVO, klVitalResult);
-        klVitalResult.setConceptId(commonParam.getConceptId());
-        klVitalResult.setGmtModified(commonParam.getNow());
-        klVitalResult.setGmtCreate(commonParam.getNow());
-        klVitalResult.setCreator(commonParam.getPerson());
-        klVitalResult.setModifier(commonParam.getPerson());
-        return this.save(klVitalResult);
-    }
 
     public void getKlVitalResult(Long conceptId, KlConceptAllDTO klConceptAll) {
         KlVitalResult klVitalResult = this.getOne(new QueryWrapper<KlVitalResult>()