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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prenatalInspector/PrenatalInspectorPreCardService.java

@@ -649,8 +649,12 @@ public class PrenatalInspectorPreCardService extends BaseService {
        if(StringUtils.isNotBlank(preCard.getHeight())&&StringUtils.isNotBlank(preCard.getWeight())){
            //先判断体征数据是否变更
            DevicePatientHealthIndex index = healthIndexDao.findLastData(patientCode, 3);
            String height = index.getValue2();
            String weight = index.getValue1();
            String height = null;
            String weight = null;
            if(index!=null){
                height = index.getValue2();
                weight = index.getValue1();
            }
            if(!preCard.getHeight().equals(height)||!preCard.getWeight().equals(weight)){
                //更新体征数据
                JSONObject json = new JSONObject();
@@ -663,7 +667,6 @@ public class PrenatalInspectorPreCardService extends BaseService {
                    e.printStackTrace();
                    logger.error("预建卡时 保存体征数据失败。。。");
                }
            }
        }
    }

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

@@ -2637,7 +2637,7 @@ public class SignWebService extends BaseService {
                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"))){
                    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;
                    }