Merge branch 'master' of http://192.168.1.220:10080/esb/esb

hos-camel2/src/main/java/camel/gateway/processor/GatewayProcessor.java

@@ -25,7 +25,7 @@ import java.util.stream.Stream;
public class GatewayProcessor implements Processor {
    static Map<String, AppApi> apiMap = new HashMap<>();
    static final String agUrl = "http://192.168.1.221:10000";
    static final String brokerUrl = "http://127.0.0.1:8099";
    static final String brokerUrl = "http://172.19.103.37:8099";
    @Autowired
    private DiscoveryClient discoveryClient;

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/CrawlerManager.java

@@ -222,10 +222,12 @@ public class CrawlerManager {
                    }
                }
            } catch (Exception e) {
                e.printStackTrace();
                logger.error("档案上传失败,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
                return false;
            }
        } catch (Exception e) {
            e.printStackTrace();
            logger.error("采集病人失败,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo(), e);
            return false;
        }

hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/PatientCDAUpload.java

@@ -42,6 +42,7 @@ public class PatientCDAUpload {
            boolean result = upload(patient, zipFile, token);
            if (!result) {
                logger.info("上传病人档案失败,patient_id:" + patient.getPatientId() + ",event_no:" + patient.getEventNo());
                 FileUtil.deleteDirectory(new File(zipFile.directory));
                return result;
            }

hos-rest/src/main/resources/application.yml

@@ -13,7 +13,7 @@ spring:
  profiles: dev
  data:
    mongodb:
      host: 172.19.103.57
      host: 172.19.103.42
      port: 27017
      username: esb
      password: esb

src/main/java/com/yihu/hos/standard/service/standard/StandardVersionService.java

@@ -429,9 +429,10 @@ public class StandardVersionService extends SQLGeneralDAO {
            stdeDataset.setLanguage(getNotNull(l.get(4)[1]));
            stdeDataset.setClassModel(getNotNull(l.get(5)[1]));
            stdeDataset.setstandardId(standardId);
            if(org.apache.commons.lang3.StringUtils.isNotBlank(getNotNull(l.get(2)[1]))){
                stdeDataset.setCatalog(Integer.valueOf(getNotNull(l.get(2)[1])));
            }
            stdeDataset.setCatalog(0);
//            if(org.apache.commons.lang3.StringUtils.isNotBlank(getNotNull(l.get(2)[1]))){
//                stdeDataset.setCatalog(Integer.valueOf(getNotNull(l.get(2)[1])));
//            }
            stdDatasetService.add(standardVersion.getDataSetTableName(), stdeDataset);
            for (int row = 7; row < l.size(); row++) {
                //保存数据元
@@ -472,6 +473,9 @@ public class StandardVersionService extends SQLGeneralDAO {
    public String saveDictExcel(MultipartFile file, String version,Integer standardId) throws Exception {
        List<List<String[]>> list = ExcelUtilBigData.readerExcel(file.getInputStream(), 5, 3);
        list.stream().filter(medatas-> getNotNull(medatas.get(0)[1]).contains("ICD-10-CM")).forEach(medata->{
            System.out.println(list.indexOf(medata));
        });
        StandardVersion standardVersion = new StandardVersion(version);
        for (int i = 0; i < list.size(); i++) {
            List<String[]> l = list.get(i);
@@ -480,12 +484,12 @@ public class StandardVersionService extends SQLGeneralDAO {
            stdeDict.setstandardId(standardId);
            stdeDict.setCode(getNotNull(l.get(0)[1]));
            stdeDict.setName(getNotNull(l.get(1)[1]));
            stdeDict.setDefine(getNotNull(l.get(2)[1]));
            stdeDict.setDescription(getNotNull(l.get(3)[1]));
            String parentId = getNotNull(l.get(4)[1]);
            if(!StringUtils.isEmpty(parentId)){
                stdeDict.setParentId(Integer.valueOf(parentId));
            }
//            stdeDict.setDefine(getNotNull(l.get(2)[1]));
//            stdeDict.setDescription(getNotNull(l.get(3)[1]));
//            String parentId = getNotNull(l.get(4)[1]);
//            if(!StringUtils.isEmpty(parentId)){
//                stdeDict.setParentId(Integer.valueOf(parentId));
//            }
            stdDictService.add(standardVersion,stdeDict);
            for (int row = 0; row < l.size(); row++) {
                if (StringUtils.isEmpty(l.get(row)[4])) {

src/main/java/com/yihu/hos/system/dao/DatasourceDao.java

@@ -83,7 +83,7 @@ public class DatasourceDao extends SQLGeneralDAO {
    public DataGridResult getDatasourceByOrg(String orgId) throws Exception
    {
        DataGridResult re = new DataGridResult();
        String sql = "select * from System_Datasource";
        String sql = "select * from system_datasource";
        if(orgId!=null&&orgId.length()>0){
            sql += " where org_id ='"+orgId+"'";
        }
@@ -100,13 +100,13 @@ public class DatasourceDao extends SQLGeneralDAO {
   
    public void validDatasource(String id,String valid)  throws Exception
    {
        String sql = "update System_Datasource set activity_Flag='"+valid+"' where Id='"+id+"'";
        String sql = "update system_datasource set activity_Flag='"+valid+"' where Id='"+id+"'";
        super.execute(sql);
    }
   
    public List<SystemDatasource> getDatasources(String orgId) throws Exception {
        String sql = "select * from System_Datasource";
        String sql = "select * from system_datasource";
        if(orgId!=null&&orgId.length()>0){
            sql += " where org_id ='"+orgId+"'";
        }

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/versionDetailJs.jsp

@@ -100,7 +100,7 @@
        if(!this.validator.validate()){
          return;
        }
        $("#btn_save").html("确认中...").css("pointer-events","none");
        $("#btn_save").html("处理中...").css("pointer-events","none");
        var _url = "";
        var resultData;
        adapterplan.version.$addform.attrScan();

src/main/webapp/WEB-INF/ehr/jsp/standard/integration/versionDetailJs.jsp

@@ -121,7 +121,7 @@
          if(!this.validator.validate()){
            return;
          }
            $("#btn_save").html("确认中...").css("pointer-events","none");
            $("#btn_save").html("处理中...").css("pointer-events","none");
            var _url = "";
            var resultData;