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

# Conflicts:
#	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/bank/TaskService.java

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/bank/CreditLogService.java

@@ -156,6 +156,11 @@ public class CreditLogService {
        if (patient == null){
            throw new Exception("该居民不存在");
        }
        SignFamily signFamily = signFamilyDao.findByPatient(patient.getCode());
        if (signFamily!=null){
            object.put("hospital",signFamily.getHospital());
            object.put("hospitalName",signFamily.getHospitalName());
        }
        object.put("name",patient.getName());
        object.put("idCard",patient.getIdcard());
        object.put("openId",patient.getOpenid());
@@ -274,7 +279,13 @@ public class CreditLogService {
        if (patient == null){
            throw new Exception("该居民不存在");
        }
        SignFamily signFamily = signFamilyDao.findByPatient(patient.getCode());
        if (signFamily != null){
            object.put("hospital",signFamily.getHospital());
            object.put("hospitalName",signFamily.getHospitalName());
        }
        object.put("name",patient.getName());
        object.put("idCard",patient.getIdcard());
        String response = null;
        String url =getBaseUrl() + "selectAccount";
        Map<String,String> params = new HashMap<>();
@@ -609,7 +620,12 @@ public class CreditLogService {
        JSONArray jsonArray  = new JSONArray();
        for (int i =0 ;i<array.size();i++){
            Patient patient = patientDao.findByCode(array.getString(i));
            SignFamily signFamily = signFamilyDao.findByPatient(patient.getCode());
            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(patient);
            if (signFamily != null){
                jsonObject.put("hospital",signFamily.getHospital());
                jsonObject.put("hospitalName",signFamily.getHospitalName());
            }
            jsonArray.add(jsonObject);
        }
        JSONObject object1 = new JSONObject();
@@ -643,6 +659,11 @@ public class CreditLogService {
        if (patient == null){
            throw new Exception("该居民不存在");
        }
        SignFamily signFamily = signFamilyDao.findByPatient(patient.getCode());
        if (signFamily != null){
            object.put("hospital",signFamily.getHospital());
            object.put("hospitalName",signFamily.getHospitalName());
        }
        object.put("name",patient.getName());
        object.put("idCard",patient.getIdcard());
        object.put("openId",patient.getOpenid());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/health/bank/AccountController.java

@@ -4,15 +4,12 @@
package com.yihu.wlyy.web.third.health.bank;
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.wechat.WechatTemplateConfig;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.wechat.WechatTemplateConfigDao;
import com.yihu.wlyy.service.app.health.bank.CreditLogService;
import com.yihu.wlyy.service.app.health.bank.TaskService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.web.BaseController;
import com.yihu.wlyy.web.WeixinBaseController;
import com.yihu.wlyy.wechat.util.WeiXinAccessTokenUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,9 +23,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
 * @author wangzhinan
 * @create 2018-05-07 8:50
@@ -37,7 +31,7 @@ import java.util.Map;
@RestController
@RequestMapping(value = "/healthBank",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "小程序")
public class AccountController extends BaseController {
public class AccountController extends WeixinBaseController {
    private static Logger logger = LoggerFactory.getLogger(AccountController.class);
    @Autowired