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

patient-co-wlyy/src/main/java/com/yihu/wlyy/logs/BusinessLogs.java

@@ -32,7 +32,7 @@ public class BusinessLogs {
        // 标签
        , label
        // 签约
        , sign
        , register
    }
    /**

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@@ -334,9 +334,7 @@ public class MessageService extends BaseService {
                map.put("type", type);
                map.put("read", String.valueOf(item.getRead()));
                map.put("sex", String.valueOf(item.getSex()));
                map.put("value1", String.valueOf(item.getValue1()));
                String value2 = String.valueOf(item.getValue2().intValue());
                map.put("value2",value2);
                map.put("czrq", DateUtil.dateToStrLong(item.getCzrq()));
                DevicePatientHealthIndex data =devicePatientHealthIndexDao.findOne(Long.valueOf(item.getTzCode()));
@@ -345,6 +343,10 @@ public class MessageService extends BaseService {
                    //记录时间
                    map.put("recordDate",DateUtil.dateToStrLong(data.getRecordDate()));
                    //指标数据
                    map.put("value1", data.getValue1());
                    String value2 = Integer.valueOf(data.getValue2()).toString();
                    map.put("value2",value2);
                    /*//获取上次血糖值
                    if("1".equals(type))
                    {

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

@@ -312,7 +312,7 @@ public class WechatController extends WeixinBaseController {
            if (json != null) {
                try {
                    Patient p = patientDao.findByIdcard(idcard);
                    BusinessLogs.info(BusinessLogs.BusinessType.sign, p.getCode(), new JSONObject(p));
                    BusinessLogs.info(BusinessLogs.BusinessType.register, p.getCode(), new JSONObject(p));
                } catch (Exception e) {
                    e.printStackTrace();
                }

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -318,7 +318,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            } else {
                try {
                    Patient p = patientService.findByIdcard(idcard);
                    BusinessLogs.info(BusinessLogs.BusinessType.sign, p.getCode(), new JSONObject(p));
                    BusinessLogs.info(BusinessLogs.BusinessType.register, p.getCode(), new JSONObject(p));
                } catch (Exception e) {
                    e.printStackTrace();
                }