Merge branch 'srdev' of http://192.168.1.220:10080/Amoy/patient-co-management into srdev

common/common-entity/src/main/java/com/yihu/wlyy/entity/concern/ConcernDO.java

@@ -30,6 +30,7 @@ public class ConcernDO extends IdEntity {
	private String concernDoctorName;//关注的医生名称
	private Date createTime;//创建时间
	private Date updateTime;//修改时间
	private Date cancelTime;//取消关注时间
	// Constructors
@@ -149,9 +150,8 @@ public class ConcernDO extends IdEntity {
	public String getConcernSourceName() {
		switch (concernSource){
			case 1:return 	"扫描二维码";
			case 2:return 	"页面跳转";
			case 3:return 	"咨询关注";
			default: return "扫描二维码";
			case 2:return 	"咨询关注";
			default: return "其他";
		}
	}
@@ -196,4 +196,12 @@ public class ConcernDO extends IdEntity {
		this.updateTime = updateTime;
	}
	@Column(name = "cancel_time", nullable = false, length = 0)
	public Date getCancelTime() {
		return cancelTime;
	}
	public void setCancelTime(Date cancelTime) {
		this.cancelTime = cancelTime;
	}
}

patient-co/patient-co-statistics-es/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 8082
spring:
  application:

patient-co/patient-co-statistics-es/src/main/resources/quartz.properties

@@ -1,9 +1,8 @@
# Default Properties file for use by StdSchedulerFactory
# to create a Quartz Scheduler Instance, if a different
# properties file is not explicitly specified.
#
org.quartz.scheduler.instanceName: DefaultQuartzScheduler
org.quartz.scheduler.instanceId: AUTO
org.quartz.scheduler.rmi.export: false
org.quartz.scheduler.rmi.proxy: false
org.quartz.scheduler.wrapJobExecutionInUserTransaction: false
@@ -24,18 +23,9 @@ org.quartz.jobStore.misfireThreshold: 60000
# Configure JobStore Cluster
org.quartz.jobStore.class:org.quartz.impl.jdbcjobstore.JobStoreTX
org.quartz.jobStore.driverDelegateClass:org.quartz.impl.jdbcjobstore.StdJDBCDelegate
#datasource׺
## 集群配置
org.quartz.jobStore.isClustered=true
org.quartz.jobStore.tablePrefix:QRTZ_
#org.quartz.jobStore.dataSource:qzDS
#
##============================================================================
## Configure Datasources
##============================================================================
##datasource
#org.quartz.dataSource.qzDS.driver: com.mysql.jdbc.Driver
#org.quartz.dataSource.qzDS.URL: jdbc:mysql://172.19.103.85/wlyy?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#org.quartz.dataSource.qzDS.user: root
#org.quartz.dataSource.qzDS.password: 123456
org.quartz.jobGroupName = RS_JOBGROUP_NAME
org.quartz.triggerGroupName = RS_TRIGGERGROUP_NAME
org.quartz.triggerGroupName = RS_TRIGGERGROUP_NAME

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/concern/ConcernService.java

@@ -163,6 +163,7 @@ public class ConcernService extends BaseService {
        Doctor doctor = doctorDao.findByCodeWithLock(doctorCode);
        //删除关注
        concern.setStatus(-1);
        concern.setCancelTime(new Date());
        //删除团队
        doctorTeamDao.deleteTeam(concern.getTeamCode());
        //删除团队成员

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@@ -1126,4 +1126,9 @@ public class PatientService extends TokenService {
        }
        return true;
    }
    @Transactional
    public void updateSsc(String patientCode, String ssc) {
       Patient p=  patientDao.findByCode(patientCode);
        p.setSsc(ssc);
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -363,6 +363,23 @@ public class PatientController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "updateSsc",method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("updateSsc")
    public String updateSsc(
            @RequestParam(required = false,name = "patientCode") String patientCode,
            @RequestParam(required = true,name = "ssc") String ssc) {
        try {
            if(org.springframework.util.StringUtils.isEmpty(patientCode)){
                patientCode=getUID();
            }
            patientService.updateSsc(patientCode,ssc);
            return success("修改成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "修改失败！");
        }
    }
    /**
     * 退出登录
     *

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/wechat/process/WeiXinEventProcess.java

@@ -633,7 +633,7 @@ public class WeiXinEventProcess {
            // 图文消息URL
            url = url.replace("{server}", wechat_base_url)
                    .replace("{appId}", appId)
                    .replace("{doctorCode}", keys[0]);
                    .replace("{doctorCode}", keys[0]+"_1");
            //图片地址
            picUrl = picUrl.replace("{server}", serverUrl);

patient-co/patient-co-wlyy/src/main/resources/system.properties

@@ -12,7 +12,7 @@ ehr_services = http://localhost:9009/api/v1.0/
ehr_services_base = http://localhost:10220/api/v1.0/
# 微信图文消息URL
doctor_qrcode_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fssgg%2fhtml%2fdoctor-homepage-new.html&response_type=code&scope=snsapi_base&state={doctorCode}#wechat_redirect
doctor_qrcode_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fyszx%2fhtml%2fdoctor-homepage.html&response_type=code&scope=snsapi_base&state={doctorCode}#wechat_redirect
doctor_hos_qrcode_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fqygl%2fhtml%2fsearch-doctor.html&response_type=code&scope=snsapi_base&state={hospital}#wechat_redirect
doctor_subscribe_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fqygl%2fhtml%2fsigning-welcome.html&response_type=code&scope=snsapi_base&state=code#wechat_redirect
doctor_town_qrcode_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fqygl%2fhtml%2fsearch-community.html&response_type=code&scope=snsapi_base&state={town}#wechat_redirect

patient-co/patient-co-wlyy/src/main/resources/wechat/weixin_menu.txt

@@ -1,13 +1,8 @@
{
"button":[
   {
	  "name":"家庭医生",
	  "name":"咨询医生",
	  "sub_button":[
		  {
			"type":"view",
			"name":"咨询医生",
			"url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fqygl%2fhtml%2fsigning_management.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
		  },
		  {
			"type":"view",
			"name":"关注咨询",
@@ -16,12 +11,12 @@
		  {
			"type":"view",
			"name":"我的关注",
			"url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fyszd%2fhtml%2fdoctor-guidance.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
			"url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fyszd%2fhtml%2ffocused-doctor.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
		  },
		  {
            "type":"view",
            "name":"查找医生",
            "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fjkjy%2fhtml%2farticle_list.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
            "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fyszd%2fhtml%2fselect-consult-doctor.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
          }
	  ]
@@ -33,12 +28,7 @@
		   "type":"view",
		   "name":"我的资料",
		   "url":"https://open.weixin.qq.com/connect/oauth2/authorize?appid=appId&redirect_uri=server_url%2fwx%2fhtml%2fgrzx%2fhtml%2fmy-detail.html&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
		},
        {
         	"type":"click",
         	"name":"操作说明",
         	"key":"caozuoshuoming"
        }
		}
	 ]
  }
]