Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetCommonService.java

@@ -121,6 +121,10 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
        return dictDao.findByDictName("imData").get(0).getDictCode();
    }
    public String getSystemUrl(){
        return dictDao.findByDictName("SYSTEM_URL").get(0).getDictCode();
    }
    // 0 调用省监管平台接口
    public String postToInter(String token, String api, JSONArray params,String url) throws Exception {
        getBaseSurperviseDict();
@@ -727,6 +731,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
    public String upNsOnlineAsk(String startDate, String endDate,String keyId) throws Exception {
        String base = getImUrl();
        getBaseSurperviseDict();
        String systemUrl = getSystemUrl();
        String url = getUrl();
        String api = "micc.upNsOnlineAsk";
        String upid = getCode();
@@ -747,6 +752,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
               "\tb.patient AS \"patient\",\n" +
               "\tb. NAME AS \"patientName\",\n" +
               "\tb.birthday as \"birthday\",\n" +
               "\tb.doctor as \"doctor\",\n" +
               "\ta.czrq as \"czrq\",\n" +
               "\ta.end_time as \"end_time\",\n" +
               "\ta.symptoms as \"symptoms\",\n" +
@@ -876,7 +882,7 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                jb.put("visit_time", info.get("czrq")==null?"1900-01-01":DateUtil.dateToStrLong((Date)info.get("czrq")));
                jb.put("visit_finish_time", info.get("end_time")==null?"1900-01-01":DateUtil.dateToStrLong((Date)info.get("end_time")));
                jb.put("complaint_content", info.get("content"));
                String procFile="";
               /* String procFile="";
                if (info.get("content")!=null){
                    JSONArray array = JSONArray.parseArray(info.get("content").toString());
                    for (int j=0;j<array.size();j++){
@@ -886,8 +892,8 @@ public class InternetCommonService extends BaseJpaService<InternetUpErrorLogDO,
                            break;
                        }
                    }
                }
                jb.put("proc_file", procFile);
                }*/
                jb.put("proc_file", systemUrl+"ims-web/#/login?type=9&doctorCode="+info.get("doctor")+"&qCode="+info.get("id"));
                jb.put("price", 0);
                jb.put("fg_reply", "1");
                jb.put("crt_time", DateUtil.dateToStrLong(DateUtil.getNow()));

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -185,6 +185,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
           activityDO.setDescription(templateName);
           activityDO.setGlobelTemplate(planCode);
           activityDO.setIntroduction(templateName);
           activityDO.setDelFlag(1);
           activityDO =  activityDao.save(activityDO);
           TaskDO taskDO = new TaskDO();
           taskDO.setSaasId("dev");