Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co-service/wlyy_device/src/main/java/com/yihu/hos/device/model/TrackPatient.java

@@ -8,7 +8,7 @@ import java.util.Date;
 * Created by Trick on 2018/1/4.
 */
@Entity
@Table(name = "wlyy_track_patient")
@Table(name = "wlyy_track_patient",schema ="wlyy",catalog = "wlyy")
public class TrackPatient extends IdEntity {
    private String patientCode;//关联居民code，医生的重点关注对象

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -2677,21 +2677,21 @@ public class SignWebService extends BaseService {
            //获取智业团队签约上线
            String jwCode = one.getMappingCode();//智业服务团队的code
            try{
//                String response = jwSignService.getSickFamilyDoctorSignLimit(jwCode);
//                com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(response);
//                if(json.getInteger("status")==200){
//                    com.alibaba.fastjson.JSONObject data = json.getJSONObject("data");
//                    if("1".equals(data.getString("CODE"))&&data.getJSONArray("DATA").size()>0){
//                        int sign_limit_number = data.getJSONArray("DATA").getJSONObject(0).getInteger("SIGN_LIMIT_NUMBER");//签约上线
//                        limitTotal+=sign_limit_number;
//                    }
//                }
                String response = jwSignService.getSickFamilyDoctorSignLimit(jwCode);
                com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(response);
                if(json.getInteger("status")==200){
                    com.alibaba.fastjson.JSONObject data = json.getJSONObject("data");
                    if("1".equals(data.getString("CODE"))&&data.getJSONArray("DATA").size()>0){
                        int sign_limit_number = data.getJSONArray("DATA").getJSONObject(0).getInteger("SIGN_LIMIT_NUMBER");//签约上线
                        limitTotal+=sign_limit_number;
                    }
                }
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        re.put("signTotal",signTotal);
        re.put("limitTotal",1500);
        re.put("limitTotal",limitTotal);
        return re;
    }

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

@@ -885,7 +885,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                // 设置患者身份证号
                json.put("idCard", temp.getIdcard());
                //1.4.2 医疗保险号
                json.put("medicareNumber", temp.getMedicareNumber());
                json.put("medicareNumber", temp.getMedicareNumber()==null?"":temp.getMedicareNumber());
                // 设置患者出生年月
                json.put("birthday", DateUtil.dateToStr(temp.getBirthday(), DateUtil.YYYY_MM_DD));
                // 设置患者手机号码

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

@@ -400,8 +400,7 @@ public class WeiXinEventProcess {
                    " WHERE " +
                    " p.openid ='"+openid+"' " +
                    " AND f.`status` >0 " +
                    " AND f.expenses_status ='1' " +
                    " AND f.hospital = '3502030400'";
                    " AND f.expenses_status ='1' ";
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            logger.info("hslq_Wifi_openid_info: "+openid);