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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/record/HealthDataService.java

@@ -41,7 +41,7 @@ public class HealthDataService extends BaseService {
            if (status == 200){
                String xmlData = jsonObject.getString("data");
                if (!StringUtils.isEmpty(xmlData)){
                    String xmlJson = XMLUtil.xml2JSON(xmlData);
                    String xmlJson = XMLUtil.xml2json(xmlData);
                    result = new JSONObject(xmlJson);
                }
            }

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/XMLUtil.java

@@ -308,6 +308,10 @@ public class XMLUtil {
            jp = xmlMapper.getFactory().createParser(xml);
            JsonGenerator jg = objectMapper.getFactory().createGenerator(w);
            while (jp.nextToken() != null) {
                String name = jp.getParsingContext().getCurrentName();
                if ("".equals(name)){
                    jp.overrideCurrentName("text");
                }
                jg.copyCurrentEvent(jp);
            }
            jp.close();