add his对接版本号

nb-system/src/main/java/com/nb/bus/controller/BusHospitalController.java

@@ -80,7 +80,7 @@ public class BusHospitalController extends BaseCrudController<BusHospitalEntity,
     public R publishScript(@RequestAttribute("tenantId")@ApiParam(hidden = true) String tenantId){
         BusHospitalEntity hospital = hospitalService.getById(tenantId);
         if (ObjectUtil.isNull(hospital.getDraftScript())||StrUtil.isEmpty(hospital.getDraftScript().getContent())) {
-            throw new CustomException("草稿脚本内容为空,发布失败");
+            throw new CustomException("请先【保存】草稿内容,再发布");
         }
         hospitalService.update(new UpdateWrapper<BusHospitalEntity>().lambda().eq(BusHospitalEntity::getId,tenantId)
                 .set(BusHospitalEntity::getScript,JSONUtil.toJsonStr(hospital.getDraftScript())));

nb-system/src/main/java/com/nb/bus/hospital/his/HisScriptSession.java

@@ -26,6 +26,7 @@ import com.nb.common.cache.value.Value;
 import com.nb.common.exception.CustomException;
 import com.nb.common.exception.ScriptException;
 import com.nb.common.result.R;
+import com.nb.common.util.ExceptionUtil;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.Assert;
@@ -208,9 +209,9 @@ public class HisScriptSession {
             sources= JSONUtil.toList(result.toString(), BusClinicEntity.class);
         }catch (Exception e){
             if(exec.getException()==null){
-                exec.setMessage(e.toString());
+                exec.setMessage(ExceptionUtil.getExceptionMsg(e));
             }
-            log.error("数据解析后转化为json失败,{},",text,e.getStackTrace());
+            log.error("数据解析后转化为json失败,",text,e);
             if(StrUtil.isNotEmpty(text)){
                 throw new ScriptException("脚本解析失败");
             }else {

nb-system/src/main/java/com/nb/bus/hospital/script/PythonParse.java

@@ -75,17 +75,23 @@ public class PythonParse implements ScriptParse {
     @Override
     public ExecuteResult exec(String param) {
         ExecuteResult executeResult = new ExecuteResult();
-        try {
-            executeResult.setInput(param);
-            long start = System.currentTimeMillis();
-            PyObject result = pyFunction.__call__(Py.newStringUTF8(param));
-            long end = System.currentTimeMillis();
-            executeResult.setSuccess(true);
-            executeResult.setUseTime(end-start);
-            executeResult.setResult( JSONUtil.parse(result));
-        }catch (Exception e){
+        executeResult.setInput(param);
+        long start = System.currentTimeMillis();
+        if(pyFunction==null){
             executeResult.setSuccess(false);
-            executeResult.setException(e);
+            executeResult.setMessage("系统对接不存在【已发布】脚本");
+        }else {
+            try {
+
+                PyObject result = pyFunction.__call__(Py.newStringUTF8(param));
+                long end = System.currentTimeMillis();
+                executeResult.setSuccess(true);
+                executeResult.setUseTime(end-start);
+                executeResult.setResult( JSONUtil.parse(result));
+            }catch (Exception e){
+                executeResult.setSuccess(false);
+                executeResult.setException(e);
+            }
         }
         return executeResult;