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

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActivityController.java

@@ -88,15 +88,15 @@ public class ActivityController extends EnvelopRestEndpoint {
                                                        @ApiParam(name = "patient",value = "居民code")
                                                        @RequestParam(value = "patient",required = true)String patient,
                                                        @ApiParam(name = "name",value = "居民名字")
                                                        @RequestParam(value = "name",required = true)String name,
                                                        @RequestParam(value = "name",required = false)String name,
                                                        @ApiParam(name = "idcard",value = "身份证")
                                                        @RequestParam(value = "idcard",required = true)String idcard,
                                                        @RequestParam(value = "idcard",required = false)String idcard,
                                                        @ApiParam(name = "hospital",value = "社区code")
                                                        @RequestParam(value = "hospital",required = true)String hospital,
                                                        @RequestParam(value = "hospital",required = false)String hospital,
                                                        @ApiParam(name = "hospitalName",value = "社区名称")
                                                            @RequestParam(value = "hospitalName",required = true)String hospitalName,
                                                            @RequestParam(value = "hospitalName",required = false)String hospitalName,
                                                        @ApiParam(name = "templateName",value = "计划模板名称")
                                                            @RequestParam(value = "templateName",required = true)String templateName){
                                                            @RequestParam(value = "templateName",required = false)String templateName){
        try {
            return service.createActivity(planCode,patient,name,idcard,hospital,hospitalName,templateName);
        }catch (Exception e){

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

@@ -150,6 +150,28 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
    public MixEnvelop<ActivityDO,ActivityDO> createActivity(String planCode,String patient,String name,String idcard,String hospital,String hospitalName,String templateName){
        MixEnvelop<ActivityDO, ActivityDO> envelop = new MixEnvelop<>();
        AccountDO accountDO = accountDao.selectByPatientId(patient);
        if (accountDO==null){
            accountDO = new AccountDO();
            accountDO.setIdCard(idcard);
            accountDO.setStatus(1);
            accountDO.setTotal(0);
            accountDO.setPatientId(patient);
            accountDO.setCouponTotal(0L);
            accountDO.setPassword("123456");
            if(idcard.length()>=4){// 判断是否长度大于等于4
                String cardNumber=idcard.substring(idcard.length()- 4,idcard.length());//截取两个数字之间的部分
                int random = (int)((Math.random()*9+1)*100000);
                accountDO.setCardNumber(cardNumber+Integer.toString(random));
            }
            accountDO.setAccountName(name);
            accountDO.setHospitalName(hospitalName);
            accountDO.setHospital(hospital);
            accountDO.setSaasId("dev");
            accountDO.setCreateTime(new Date());
            accountDO.setUpdateTime(new Date());
            accountDO = accountDao.save(accountDO);
        }
        ActivityDO activityDO = activityDao.selectByTemplateIdAndType(planCode,"健康计划");
       if (activityDO==null){
           activityDO = new ActivityDO();
@@ -159,10 +181,13 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
           activityDO.setUpdateTime(new Date());
           activityDO.setOrganizer("SYSTEM");
           activityDO.setTitle(templateName);
           activityDO.setType("健康计划");
           activityDO.setDescription(templateName);
           activityDO.setGlobelTemplate(planCode);
           activityDO.setIntroduction(templateName);
           activityDO =  activityDao.save(activityDO);
           TaskDO taskDO = new TaskDO();
           taskDO.setSaasId("dev");
           taskDO.setCreateTime(new Date());
           taskDO.setUpdateTime(new Date());
           taskDO.setTitle(templateName);

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -457,7 +457,7 @@ public class RehabilitationManageService {
        String sql = " select d.*,DATE_FORMAT(d.execute_time,'%Y/%m/%d %H:%i') as executeTime ,i.code,i.name from wlyy_specialist.wlyy_rehabilitation_plan_detail d " +
                " LEFT JOIN wlyy_rehabilitation_service_item i on i.code = d.hospital_service_item_id  " +
                " where  d.plan_id='"+planId+"' " ;
                " where  d.plan_id='"+planId+"' AND  d.execute_time IS NOT NULL  and d.execute_time <>'' " ;
        if(searchTask!=null){
            if(searchTask==8){
                sql+="and d.doctor='"+doctorCode+"' ";