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

common/common-entity/src/main/java/com/yihu/es/entity/QuestionnaireWinningESDO.java

@@ -29,6 +29,8 @@ public class QuestionnaireWinningESDO {
	private Integer prizeType;
	//奖品兑奖码
	private String prizeCode;
	//奖品名称
	private String prizeName;
	//兑奖地址
	private String address;
	//奖品有效期
@@ -157,4 +159,12 @@ public class QuestionnaireWinningESDO {
	public void setValidity(Date validity) {
		this.validity = validity;
	}
	
	public String getPrizeName() {
		return prizeName;
	}
	
	public void setPrizeName(String prizeName) {
		this.prizeName = prizeName;
	}
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/questionnaire/QuestionnairePrize.java

@@ -24,6 +24,8 @@ public class QuestionnairePrize extends IdEntity implements Serializable {
	private Integer type;
	//奖品兑奖码
	private String prizeCode;
	//奖品名称
	private String prizeName;
	//奖品有效期
	private Date validity;
	//兑奖地址
@@ -106,4 +108,12 @@ public class QuestionnairePrize extends IdEntity implements Serializable {
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	
	public String getPrizeName() {
		return prizeName;
	}
	
	public void setPrizeName(String prizeName) {
		this.prizeName = prizeName;
	}
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/questionnaire/QuestionnaireWinning.java

@@ -35,6 +35,8 @@ public class QuestionnaireWinning extends IdEntity implements Serializable {
	private Integer winning;
	//奖品兑奖码
	private String prizeCode;
	//奖品名称
	private String prizeName;
	//兑奖地址
	private String address;
	//奖品有效期
@@ -147,4 +149,12 @@ public class QuestionnaireWinning extends IdEntity implements Serializable {
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	
	public String getPrizeName() {
		return prizeName;
	}
	
	public void setPrizeName(String prizeName) {
		this.prizeName = prizeName;
	}
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/survey/QuestionnaireController.java

@@ -2,6 +2,8 @@ package com.yihu.wlyy.controller.manager.survey;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.entity.WlyyUserRole;
import com.yihu.wlyy.entity.survey.QuestionnairePrize;
import com.yihu.wlyy.entity.survey.QuestionnaireWinning;
import com.yihu.wlyy.service.manager.survey.QuestionnaireService;
import com.yihu.wlyy.service.manager.wlyyrole.WlyyUserRoleService;
import com.yihu.wlyy.vo.UserPrizeVO;
@@ -40,13 +42,14 @@ public class QuestionnaireController extends BaseController {
    @RequestMapping(value = "list")
    @ResponseBody
    public String searchList(
            @RequestParam(value = "type",defaultValue = "1")Integer type,
            @RequestParam(value = "name",required = false)String name,
            @RequestParam(value = "idCard",required = false)String idCard,
            @RequestParam(value = "page",required = false)Integer page,
            @RequestParam(value = "rows",required = false)Integer pageSize){
        try{
            List<UserPrizeVO> userprizes = questionnaireService.searchList(name,idCard,page, pageSize);
            List<UserPrizeVO> total = questionnaireService.searchListCount(name,idCard);
            List<QuestionnaireWinning> userprizes = questionnaireService.searchList(type ,name,idCard,page, pageSize);
            List<QuestionnaireWinning> total = questionnaireService.searchListCount(type,name,idCard);
            return write(200,"操作成功",page,pageSize,total.size(),userprizes);
        }catch (Exception ex){
            error(ex);

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/survey/QuestionnaireService.java

@@ -2,6 +2,7 @@ package com.yihu.wlyy.service.manager.survey;
import com.yihu.wlyy.entity.HospitalDept;
import com.yihu.wlyy.entity.survey.QuestionnairePrize;
import com.yihu.wlyy.entity.survey.QuestionnaireWinning;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.repository.survey.QuestionnairePrizeDao;
import com.yihu.wlyy.service.common.excel.ExcelData;
@@ -27,6 +28,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -44,15 +46,15 @@ public class QuestionnaireService extends BaseJpaService {
    @Value("${Riva.RIVAED_KEY2}")
    private String key2;//key2值
    public List<UserPrizeVO> searchList(String name,String idCard,Integer page,Integer pageSize) throws Exception{
    public List<QuestionnaireWinning> searchList(Integer type,String name,String idCard,Integer page,Integer pageSize) throws Exception{
        if(page <= 0){
            page = 1;
        }
        if(pageSize <= 0){
            pageSize = 15;
        }
    String sql = "SELECT w.user_name, w.user_idcard, w.user_openid, w.prize_type, w.prize_code, p.validity, p.address FROM wlyy_questionnaire_winning w, wlyy_questionnaire_prize p WHERE w.prize_code = p.`code` and w.winning = 1 and w.del = 0 and p.used = 1 and p.del = 0  " +
            "and type = 2";
    String sql = "SELECT w.* FROM wlyy_questionnaire_winning w WHERE w.winning = 1 and w.del = 0  " +
            "and w.prize_type = " + type;
        if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(idCard)){
            sql += " w.user_name = " + name + " w.user_idcard = " + idCard;
        }else if (StringUtils.isEmpty(name) && StringUtils.isNotEmpty(idCard)){
@@ -61,14 +63,14 @@ public class QuestionnaireService extends BaseJpaService {
            sql += " w.user_name = " + name;
        }
        sql += " order by w.update_time desc limit " + (page-1) +"," +pageSize;
        List<UserPrizeVO> userPrizeVOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(UserPrizeVO.class));
        List<QuestionnaireWinning> userPrizeVOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(QuestionnaireWinning.class));
        return userPrizeVOList;
    }
    public List<UserPrizeVO> searchListCount(String name,String idCard) throws Exception{
    public List<QuestionnaireWinning> searchListCount(Integer type, String name, String idCard) throws Exception{
    String sql = "SELECT w.user_name, w.user_idcard, w.user_openid, w.prize_type, w.prize_code, p.validity, p.address FROM wlyy_questionnaire_winning w, wlyy_questionnaire_prize p WHERE w.prize_code = p.`code` and w.winning = 1 and w.del = 0 and p.used = 1 and p.del = 0  " +
            "and type = 2";
        String sql = "SELECT w.* FROM wlyy_questionnaire_winning w WHERE w.winning = 1 and w.del = 0  " +
                "and w.prize_type = " + type;
        if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(idCard)){
            sql += " w.user_name = " + name + " w.user_idcard = " + idCard;
        }else if (StringUtils.isEmpty(name) && StringUtils.isNotEmpty(idCard)){
@@ -76,8 +78,8 @@ public class QuestionnaireService extends BaseJpaService {
        }else if (StringUtils.isNotEmpty(name) && StringUtils.isEmpty(idCard)){
            sql += " w.user_name = " + name;
        }
        sql += " order by w.idCard desc ";
        List<UserPrizeVO> userPrizeVOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<UserPrizeVO>());
        sql += " order by w.update_time desc ";
        List<QuestionnaireWinning> userPrizeVOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(QuestionnaireWinning.class));
        return userPrizeVOList;
    }
@@ -105,11 +107,10 @@ public class QuestionnaireService extends BaseJpaService {
            });
            //判断导入的奖品资源是否存在,不存在则保存
            QuestionnairePrize existPrize = prizeDao.findByPrizeType(1,prize.getPrizeCode());
            QuestionnairePrize existPrize = prizeDao.findByPrizeType(prize.getType(),prize.getPrizeCode());
            if(existPrize == null){
                //                需要从表格取值
                prize.setCode(getCode());
                prize.setType(1);
                prize.setUsed(0);
                prize.setDel(0);
                prize.setCreateTime(new Date());
@@ -128,8 +129,19 @@ public class QuestionnaireService extends BaseJpaService {
     */
    private Map<Integer, ExcelData> mappingQuestionnairePrize(QuestionnairePrize prize) {
        Map<Integer, ExcelData> dataMap = new HashMap<>();
        //兑奖码
        //奖品类型
        dataMap.put(0, new ExcelData() {
            @Override
            public void transform(String data) {
                //加密
                Integer type = Integer.valueOf(data);
                prize.setType(type);
            }
        });
        //兑奖码
        dataMap.put(1, new ExcelData() {
            @Override
            public void transform(String data) {
                //加密
@@ -140,15 +152,21 @@ public class QuestionnaireService extends BaseJpaService {
        });
        //有效期
        dataMap.put(1, new ExcelData() {
        dataMap.put(2, new ExcelData() {
            @Override
            public void transform(String data) {
                prize.setValidity(new Date());
                try {
                    SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm");
                    Date validity = format.parse(data);
                    prize.setValidity(validity);
                } catch (ParseException e) {
                    e.printStackTrace();
                }
            }
        });
        //领取地址
        dataMap.put(2, new ExcelData() {
        dataMap.put(3, new ExcelData() {
            @Override
            public void transform(String data) {
                prize.setAddress(data);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/imm/ChildInfoService.java

@@ -37,8 +37,8 @@ public class ChildInfoService extends BaseService {
		ChildInfo childInfo = childInfoDao.findByBarcode(barCode);
		//2.如果本地数据库无记录则请求基卫接口查询
		if(childInfo == null){
//		    String re = immuneService.GetChildrenInfo(barCode);
		    String re = "{\"status\":200,\"message\":\"string\",\"data\":{\"birthday\":\"2017-01-05\",\"deptName\":\"金山街道社区卫生服务中心\",\"deptNum\":\"350211B1040\",\"name\":\"刘柠\",\"sex\":2.0}}";
		    String re = immuneService.GetChildrenInfo(barCode);
//		    String re = "{\"status\":200,\"message\":\"string\",\"data\":{\"birthday\":\"2017-01-05\",\"deptName\":\"金山街道社区卫生服务中心\",\"deptNum\":\"350211B1040\",\"name\":\"刘柠\",\"sex\":2.0}}";
			JSONObject rejson = JSONObject.parseObject(re);
			int status = rejson.getInteger("status");
			JSONObject data = rejson.getJSONObject("data");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/questionnaire/QuestionnaireService.java

@@ -95,31 +95,35 @@ public class QuestionnaireService extends BaseService {
			String awardProbability = SystemConfig.sysPropertiesSets.get("winning_pr");
			//抽奖
			LotteryItem lotteryItem = LotteryUtils.isWinning(new Double(awardProbability));
			QuestionnaireWinning questionnaireWinning = new QuestionnaireWinning();
			questionnaireWinning.setCode(UUID.randomUUID().toString());
			questionnaireWinning.setDel(0);
			questionnaireWinning.setPrizeType(1);
			questionnaireWinning.setUserCode(questionnaireUsers.getCode());
			questionnaireWinning.setUserIdcard(questionnaireUsers.getIdcard());
			questionnaireWinning.setUserName(questionnaireUsers.getName());
			questionnaireWinning.setUserOpenid(questionnaireUsers.getOpenid());
			questionnaireWinning.setCreateTime(new Date());
			questionnaireWinning.setUpdateTime(new Date());
			
			//中奖
			if("YES".equals(lotteryItem.getAwardName())){
				List<QuestionnaireWinning> winningList = questionnaireWinningDao.findByUserIdcardAndUserOpenid(questionnaireUsers.getIdcard(),questionnaireUsers.getOpenid());
				if(winningList.isEmpty()){
				
				}else{
					questionnaireWinning = winningList.get(0);
					
//					return winningList;
				}
				
			}else{
			//未中奖
			}
		}
		
		
//		QuestionnaireWinning questionnaireWinning = new QuestionnaireWinning();
//		questionnaireWinning.setCode(UUID.randomUUID().toString());
//		questionnaireWinning.setDel(0);
//		questionnaireWinning.setPrizeType(1);
//		questionnaireWinning.setUserCode(questionnaireUsers.getCode());
//		questionnaireWinning.setUserIdcard(questionnaireUsers.getIdcard());
//		questionnaireWinning.setUserName(questionnaireUsers.getName());
//		questionnaireWinning.setUserOpenid(questionnaireUsers.getOpenid());
//		questionnaireWinning.setCreateTime(new Date());
//		questionnaireWinning.setUpdateTime(new Date());
		
		
		

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/template/DoctorGuidanceTempService.java

@@ -91,7 +91,7 @@ public class DoctorGuidanceTempService extends BaseService {
     * @param content 指导内容
     * @return
     */
    public DoctorGuidanceTemp add(String doctor, String content, String modelName, String imagesUrl) {
    public DoctorGuidanceTemp add(String doctor, String content, String modelName, String imagesUrl) throws Exception{
        DoctorGuidanceTemp guidanceTemp = new DoctorGuidanceTemp();
        String imageUrls = "";
        String imageRow = "";
@@ -104,7 +104,11 @@ public class DoctorGuidanceTempService extends BaseService {
        guidanceTemp.setModelName(modelName);
        if (imagesUrl == null || "".equals(imagesUrl)) {
        if (StringUtils.isNotEmpty(imagesUrl)) {
            imagesUrl = CommonUtil.validateImages(imagesUrl);
        }
        /*if (imagesUrl == null || "".equals(imagesUrl)) {
            imagesUrl = null;
        } else {
            String[] images = imagesUrl.split(",");
@@ -122,7 +126,7 @@ public class DoctorGuidanceTempService extends BaseService {
            imagesUrl = imageUrls + imageRow;
            imagesUrl = imagesUrl.substring(0, imagesUrl.length() - 1);
        }
        }*/
        guidanceTemp.setImagesUrl(imagesUrl);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/guahao/ImmuneService.java

@@ -71,22 +71,22 @@ public class ImmuneService {
	public List<Map<String,String>> getOrgImmuneList()throws Exception {
		
		List<Map<String, String>> re = new ArrayList<>();
//
//		String url = jwUrl + "/third/guahao/imm/GetOrgImmuneList";
//		List<NameValuePair> params = new ArrayList<>();
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String xml = data.getString("data");
		String url = jwUrl + "/third/guahao/imm/GetOrgImmuneList";
		List<NameValuePair> params = new ArrayList<>();
		String response = httpClientUtil.post(url, params, "UTF-8");
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String xml = data.getString("data");
		
		int status = 200;
		String xml = "<root>\n" +
				"    <org id=\"503\" code=\"350211B1010\" short_name=\"思明区鼓浪屿街道社区卫生服务中心\" zone_code=\"\" zone_name=\"\">思明区鼓浪屿街道社区卫生服务中心</org>\n" +
				"    <org id=\"316\" code=\"350211B1019\" short_name=\"集美街道社区\" zone_code=\"350211\" zone_name=\"集美区\">集美街道社区卫生服务中心</org>\n" +
				"    <org id=\"502\" code=\"350211B1040\" short_name=\"金山街道社区卫生服务中心\" zone_code=\"350206\" zone_name=\"湖里区\">金山街道社区卫生服务中心</org>\n" +
				"</root>";
//		int status = 200;
//		String xml = "<root>\n" +
//				"    <org id=\"503\" code=\"350211B1010\" short_name=\"思明区鼓浪屿街道社区卫生服务中心\" zone_code=\"\" zone_name=\"\">思明区鼓浪屿街道社区卫生服务中心</org>\n" +
//				"    <org id=\"316\" code=\"350211B1019\" short_name=\"集美街道社区\" zone_code=\"350211\" zone_name=\"集美区\">集美街道社区卫生服务中心</org>\n" +
//				"    <org id=\"502\" code=\"350211B1040\" short_name=\"金山街道社区卫生服务中心\" zone_code=\"350206\" zone_name=\"湖里区\">金山街道社区卫生服务中心</org>\n" +
//				"</root>";
		
		if(200 == status && StringUtils.isNotBlank(xml)){
			Document document = DocumentHelper.parseText(xml);
@@ -123,86 +123,86 @@ public class ImmuneService {
	 */
	public JSONObject getOrgScheduleAndNumberList(String orgCode) throws Exception{
	
//		String url = jwUrl + "/imm/GetOrgScheduleAndNumberList";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("OrgCode", "orgCode"));
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String xml = data.getString("data");
		int status = 200;
		String xml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
				"<ArrayOfImmuneSchudleModel\n" +
				"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
				"    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
				"    <ImmuneSchudleModel>\n" +
				"        <ORG_ID>501</ORG_ID>\n" +
				"        <ORG_CODE>350211B1039</ORG_CODE>\n" +
				"        <ORG_NAME>新阳街道社区卫生服务中心</ORG_NAME>\n" +
				"        <DateNumbers>\n" +
				"            <DateNumber>\n" +
				"                <SECTIONLIST>\n" +
				"                    <Section>\n" +
				"                        <ID>081000</ID>\n" +
				"                        <MAX>1</MAX>\n" +
				"                        <USED>0</USED>\n" +
				"                        <START_TIME>2017-08-12T08:00:00</START_TIME>\n" +
				"                        <END_TIME>2017-08-12T08:08:00</END_TIME>\n" +
				"                        <TIME>AM</TIME>\n" +
				"                        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
				"                    </Section>\n" +
				"                    <Section>\n" +
				"                        <ID>081001</ID>\n" +
				"                        <MAX>1</MAX>\n" +
				"                        <USED>0</USED>\n" +
				"                        <START_TIME>2017-08-12T15:00:00</START_TIME>\n" +
				"                        <END_TIME>2017-08-12T15:08:00</END_TIME>\n" +
				"                        <TIME>PM</TIME>\n" +
				"                        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
				"                    </Section>\n" +
				"                </SECTIONLIST>\n" +
				"                <ID>350211B10392017081802</ID>\n" +
				"                <DATE>2017-08-18T00:00:00</DATE>\n" +
				"                <TIME>PM</TIME>\n" +
				"                <MAX>10</MAX>\n" +
				"                <USED>0</USED>\n" +
				"                <FEE>0</FEE>\n" +
				"                <STATUS>1</STATUS>\n" +
				"            </DateNumber>\n" +
				"            <DateNumber>\n" +
				"                <SECTIONLIST>\n" +
				"                    <Section>\n" +
				"                        <ID>081000</ID>\n" +
				"                        <MAX>1</MAX>\n" +
				"                        <USED>0</USED>\n" +
				"                        <START_TIME>2017-08-12T08:00:00</START_TIME>\n" +
				"                        <END_TIME>2017-08-12T08:08:00</END_TIME>\n" +
				"                        <TIME>AM</TIME>\n" +
				"                        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
				"                    </Section>\n" +
				"                    <Section>\n" +
				"                        <ID>081001</ID>\n" +
				"                        <MAX>1</MAX>\n" +
				"                        <USED>0</USED>\n" +
				"                        <START_TIME>2017-08-12T15:00:00</START_TIME>\n" +
				"                        <END_TIME>2017-08-12T15:08:00</END_TIME>\n" +
				"                        <TIME>PM</TIME>\n" +
				"                        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
				"                    </Section>\n" +
				"                </SECTIONLIST>\n" +
				"                <ID>350211B10392017081802</ID>\n" +
				"                <DATE>2017-08-18T00:00:00</DATE>\n" +
				"                <TIME>PM</TIME>\n" +
				"                <MAX>10</MAX>\n" +
				"                <USED>0</USED>\n" +
				"                <FEE>0</FEE>\n" +
				"                <STATUS>1</STATUS>\n" +
				"            </DateNumber>\n" +
				"        </DateNumbers>\n" +
				"    </ImmuneSchudleModel>\n" +
				"</ArrayOfImmuneSchudleModel>";
		String url = jwUrl + "/imm/GetOrgScheduleAndNumberList";
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("OrgCode", "orgCode"));
		String response = httpClientUtil.post(url, params, "UTF-8");
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String xml = data.getString("data");
//		int status = 200;
//		String xml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
//				"<ArrayOfImmuneSchudleModel\n" +
//				"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
//				"    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
//				"    <ImmuneSchudleModel>\n" +
//				"        <ORG_ID>501</ORG_ID>\n" +
//				"        <ORG_CODE>350211B1039</ORG_CODE>\n" +
//				"        <ORG_NAME>新阳街道社区卫生服务中心</ORG_NAME>\n" +
//				"        <DateNumbers>\n" +
//				"            <DateNumber>\n" +
//				"                <SECTIONLIST>\n" +
//				"                    <Section>\n" +
//				"                        <ID>081000</ID>\n" +
//				"                        <MAX>1</MAX>\n" +
//				"                        <USED>0</USED>\n" +
//				"                        <START_TIME>2017-08-12T08:00:00</START_TIME>\n" +
//				"                        <END_TIME>2017-08-12T08:08:00</END_TIME>\n" +
//				"                        <TIME>AM</TIME>\n" +
//				"                        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
//				"                    </Section>\n" +
//				"                    <Section>\n" +
//				"                        <ID>081001</ID>\n" +
//				"                        <MAX>1</MAX>\n" +
//				"                        <USED>0</USED>\n" +
//				"                        <START_TIME>2017-08-12T15:00:00</START_TIME>\n" +
//				"                        <END_TIME>2017-08-12T15:08:00</END_TIME>\n" +
//				"                        <TIME>PM</TIME>\n" +
//				"                        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
//				"                    </Section>\n" +
//				"                </SECTIONLIST>\n" +
//				"                <ID>350211B10392017081802</ID>\n" +
//				"                <DATE>2017-08-18T00:00:00</DATE>\n" +
//				"                <TIME>PM</TIME>\n" +
//				"                <MAX>10</MAX>\n" +
//				"                <USED>0</USED>\n" +
//				"                <FEE>0</FEE>\n" +
//				"                <STATUS>1</STATUS>\n" +
//				"            </DateNumber>\n" +
//				"            <DateNumber>\n" +
//				"                <SECTIONLIST>\n" +
//				"                    <Section>\n" +
//				"                        <ID>081000</ID>\n" +
//				"                        <MAX>1</MAX>\n" +
//				"                        <USED>0</USED>\n" +
//				"                        <START_TIME>2017-08-12T08:00:00</START_TIME>\n" +
//				"                        <END_TIME>2017-08-12T08:08:00</END_TIME>\n" +
//				"                        <TIME>AM</TIME>\n" +
//				"                        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
//				"                    </Section>\n" +
//				"                    <Section>\n" +
//				"                        <ID>081001</ID>\n" +
//				"                        <MAX>1</MAX>\n" +
//				"                        <USED>0</USED>\n" +
//				"                        <START_TIME>2017-08-12T15:00:00</START_TIME>\n" +
//				"                        <END_TIME>2017-08-12T15:08:00</END_TIME>\n" +
//				"                        <TIME>PM</TIME>\n" +
//				"                        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
//				"                    </Section>\n" +
//				"                </SECTIONLIST>\n" +
//				"                <ID>350211B10392017081802</ID>\n" +
//				"                <DATE>2017-08-18T00:00:00</DATE>\n" +
//				"                <TIME>PM</TIME>\n" +
//				"                <MAX>10</MAX>\n" +
//				"                <USED>0</USED>\n" +
//				"                <FEE>0</FEE>\n" +
//				"                <STATUS>1</STATUS>\n" +
//				"            </DateNumber>\n" +
//				"        </DateNumbers>\n" +
//				"    </ImmuneSchudleModel>\n" +
//				"</ArrayOfImmuneSchudleModel>";
		
		
		
@@ -312,29 +312,28 @@ public class ImmuneService {
	                           String patientName,
	                           String patientID,
	                           String patientPhone) throws Exception{
//		String url = jwUrl + "/third/guahao/imm/RegisterImmune";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("BarCode", barCode));
//		params.add(new BasicNameValuePair("OrgCode", orgCode));
//		params.add(new BasicNameValuePair("SectionType", sectionType));
//		params.add(new BasicNameValuePair("strStart", strStart));
//		params.add(new BasicNameValuePair("SSID", ssid));
//		params.add(new BasicNameValuePair("PatientName", patientName));
//		params.add(new BasicNameValuePair("PatientID", patientID));
//		params.add(new BasicNameValuePair("PatientPhone", patientPhone));
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String ok = data.getString("data");
//		if(200 != status || !"OK".equals(ok)){
//			throw new Exception("免疫接种预约失败！");
//		}else{
//			return response;
//		}
		String url = jwUrl + "/third/guahao/imm/RegisterImmune";
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("BarCode", barCode));
		params.add(new BasicNameValuePair("OrgCode", orgCode));
		params.add(new BasicNameValuePair("SectionType", sectionType));
		params.add(new BasicNameValuePair("strStart", strStart));
		params.add(new BasicNameValuePair("SSID", ssid));
		params.add(new BasicNameValuePair("PatientName", patientName));
		params.add(new BasicNameValuePair("PatientID", patientID));
		params.add(new BasicNameValuePair("PatientPhone", patientPhone));
		String response = httpClientUtil.post(url, params, "UTF-8");
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String ok = data.getString("data");
		if(200 != status || !"OK".equals(ok)){
			throw new Exception("免疫接种预约失败！");
		}else{
			return response;
		}
		
		return "";
	}
	
	/**
@@ -357,28 +356,27 @@ public class ImmuneService {
	                             String patientName,
	                             String patientID,
	                             String patientPhone) throws Exception{
//		String url = jwUrl + "/third/guahao/imm/UnResRegisterImmune";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("BarCode", barCode));
//		params.add(new BasicNameValuePair("OrgCode", orgCode));
//		params.add(new BasicNameValuePair("SectionType", sectionType));
//		params.add(new BasicNameValuePair("strStart", strStart));
//		params.add(new BasicNameValuePair("SSID", ssid));
//		params.add(new BasicNameValuePair("PatientName", patientName));
//		params.add(new BasicNameValuePair("PatientID", patientID));
//		params.add(new BasicNameValuePair("PatientPhone", patientPhone));
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String ok = data.getString("data");
//		if(200 != status || !"OK".equals(ok)){
//			throw new Exception("取消免疫接种失败！");
//		}else{
//			return response;
//		}
		return "";
		String url = jwUrl + "/third/guahao/imm/UnResRegisterImmune";
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("BarCode", barCode));
		params.add(new BasicNameValuePair("OrgCode", orgCode));
		params.add(new BasicNameValuePair("SectionType", sectionType));
		params.add(new BasicNameValuePair("strStart", strStart));
		params.add(new BasicNameValuePair("SSID", ssid));
		params.add(new BasicNameValuePair("PatientName", patientName));
		params.add(new BasicNameValuePair("PatientID", patientID));
		params.add(new BasicNameValuePair("PatientPhone", patientPhone));
		String response = httpClientUtil.post(url, params, "UTF-8");
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String ok = data.getString("data");
		if(200 != status || !"OK".equals(ok)){
			throw new Exception("取消免疫接种失败！");
		}else{
			return response;
		}
	}
	
	/**
@@ -389,79 +387,79 @@ public class ImmuneService {
	 */
	public JSONArray GetResImmuneListWithBarCode(String barCode) throws Exception{
		
//		String url = jwUrl + "/third/guahao/imm/GetResImmuneListWithBarCode";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("BarCode", barCode));
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String xml = data.getString("data");
		int status = 200;
		String xml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
				"<ArrayOfV_RESERVATION_IMMUNE\n" +
				"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
				"    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
				"    <V_RESERVATION_IMMUNE>\n" +
				"        <ORG_ID>502</ORG_ID>\n" +
				"        <ORG_CODE>350211B1040</ORG_CODE>\n" +
				"        <ORG_NAME>金山街道社区卫生服务中心</ORG_NAME>\n" +
				"        <RES_DATE>2017-08-22</RES_DATE>\n" +
				"        <REGISTER_TIME>2017-08-18T15:21:28</REGISTER_TIME>\n" +
				"        <STATUS>1</STATUS>\n" +
				"        <START_TIME>08:24</START_TIME>\n" +
				"        <END_TIME>08:32</END_TIME>\n" +
				"        <SOURCE xsi:nil=\"true\" />\n" +
				"        <RES_TELEPHONE>18798989988</RES_TELEPHONE>\n" +
				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
				"        <NOTICE_STATUS xsi:nil=\"true\" />\n" +
				"        <NOTICE_DATE xsi:nil=\"true\" />\n" +
				"        <NUMBER_ID>084550</NUMBER_ID>\n" +
				"        <NAME>刘柠</NAME>\n" +
				"        <CARD_NO>D20111110</CARD_NO>\n" +
				"        <ID_CARD>350426199009203039</ID_CARD>\n" +
				"        <RES_ID>6b8c2b58d4254bc9b1c945cb8c90cb9e</RES_ID>\n" +
				"        <UPDATE_TIME xsi:nil=\"true\" />\n" +
				"        <CREATE_TIME xsi:nil=\"true\" />\n" +
				"        <UPLOAD_STATUS xsi:nil=\"true\" />\n" +
				"        <DATA_STATUS xsi:nil=\"true\" />\n" +
				"        <IS_CORRECT xsi:nil=\"true\" />\n" +
				"        <LOCAL_SOURCE xsi:nil=\"true\" />\n" +
				"        <START_TIME_RATE xsi:nil=\"true\" />\n" +
				"        <END_TIME_RATE xsi:nil=\"true\" />\n" +
				"        <BARCODE>0052248552</BARCODE>\n" +
				"     </V_RESERVATION_IMMUNE>\n" +
				"     <V_RESERVATION_IMMUNE>\n" +
				"        <ORG_ID>502</ORG_ID>\n" +
				"        <ORG_CODE>350211B1040</ORG_CODE>\n" +
				"        <ORG_NAME>金山街道社区卫生服务中心</ORG_NAME>\n" +
				"        <RES_DATE>2017-08-22</RES_DATE>\n" +
				"        <REGISTER_TIME>2017-08-18T15:21:28</REGISTER_TIME>\n" +
				"        <STATUS>1</STATUS>\n" +
				"        <START_TIME>08:24</START_TIME>\n" +
				"        <END_TIME>08:32</END_TIME>\n" +
				"        <SOURCE xsi:nil=\"true\" />\n" +
				"        <RES_TELEPHONE>18798989988</RES_TELEPHONE>\n" +
				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
				"        <NOTICE_STATUS xsi:nil=\"true\" />\n" +
				"        <NOTICE_DATE xsi:nil=\"true\" />\n" +
				"        <NUMBER_ID>084550</NUMBER_ID>\n" +
				"        <NAME>刘柠</NAME>\n" +
				"        <CARD_NO>D20111110</CARD_NO>\n" +
				"        <ID_CARD>350426199009203039</ID_CARD>\n" +
				"        <RES_ID>6b8c2b58d4254bc9b1c945cb8c90cb9e</RES_ID>\n" +
				"        <UPDATE_TIME xsi:nil=\"true\" />\n" +
				"        <CREATE_TIME xsi:nil=\"true\" />\n" +
				"        <UPLOAD_STATUS xsi:nil=\"true\" />\n" +
				"        <DATA_STATUS xsi:nil=\"true\" />\n" +
				"        <IS_CORRECT xsi:nil=\"true\" />\n" +
				"        <LOCAL_SOURCE xsi:nil=\"true\" />\n" +
				"        <START_TIME_RATE xsi:nil=\"true\" />\n" +
				"        <END_TIME_RATE xsi:nil=\"true\" />\n" +
				"        <BARCODE>0052248552</BARCODE>\n" +
				"     </V_RESERVATION_IMMUNE>\n" +
				"</ArrayOfV_RESERVATION_IMMUNE>";
		String url = jwUrl + "/third/guahao/imm/GetResImmuneListWithBarCode";
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("BarCode", barCode));
		String response = httpClientUtil.post(url, params, "UTF-8");
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String xml = data.getString("data");
//		int status = 200;
//		String xml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
//				"<ArrayOfV_RESERVATION_IMMUNE\n" +
//				"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
//				"    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
//				"    <V_RESERVATION_IMMUNE>\n" +
//				"        <ORG_ID>502</ORG_ID>\n" +
//				"        <ORG_CODE>350211B1040</ORG_CODE>\n" +
//				"        <ORG_NAME>金山街道社区卫生服务中心</ORG_NAME>\n" +
//				"        <RES_DATE>2017-08-22</RES_DATE>\n" +
//				"        <REGISTER_TIME>2017-08-18T15:21:28</REGISTER_TIME>\n" +
//				"        <STATUS>1</STATUS>\n" +
//				"        <START_TIME>08:24</START_TIME>\n" +
//				"        <END_TIME>08:32</END_TIME>\n" +
//				"        <SOURCE xsi:nil=\"true\" />\n" +
//				"        <RES_TELEPHONE>18798989988</RES_TELEPHONE>\n" +
//				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
//				"        <NOTICE_STATUS xsi:nil=\"true\" />\n" +
//				"        <NOTICE_DATE xsi:nil=\"true\" />\n" +
//				"        <NUMBER_ID>084550</NUMBER_ID>\n" +
//				"        <NAME>刘柠</NAME>\n" +
//				"        <CARD_NO>D20111110</CARD_NO>\n" +
//				"        <ID_CARD>350426199009203039</ID_CARD>\n" +
//				"        <RES_ID>6b8c2b58d4254bc9b1c945cb8c90cb9e</RES_ID>\n" +
//				"        <UPDATE_TIME xsi:nil=\"true\" />\n" +
//				"        <CREATE_TIME xsi:nil=\"true\" />\n" +
//				"        <UPLOAD_STATUS xsi:nil=\"true\" />\n" +
//				"        <DATA_STATUS xsi:nil=\"true\" />\n" +
//				"        <IS_CORRECT xsi:nil=\"true\" />\n" +
//				"        <LOCAL_SOURCE xsi:nil=\"true\" />\n" +
//				"        <START_TIME_RATE xsi:nil=\"true\" />\n" +
//				"        <END_TIME_RATE xsi:nil=\"true\" />\n" +
//				"        <BARCODE>0052248552</BARCODE>\n" +
//				"     </V_RESERVATION_IMMUNE>\n" +
//				"     <V_RESERVATION_IMMUNE>\n" +
//				"        <ORG_ID>502</ORG_ID>\n" +
//				"        <ORG_CODE>350211B1040</ORG_CODE>\n" +
//				"        <ORG_NAME>金山街道社区卫生服务中心</ORG_NAME>\n" +
//				"        <RES_DATE>2017-08-22</RES_DATE>\n" +
//				"        <REGISTER_TIME>2017-08-18T15:21:28</REGISTER_TIME>\n" +
//				"        <STATUS>1</STATUS>\n" +
//				"        <START_TIME>08:24</START_TIME>\n" +
//				"        <END_TIME>08:32</END_TIME>\n" +
//				"        <SOURCE xsi:nil=\"true\" />\n" +
//				"        <RES_TELEPHONE>18798989988</RES_TELEPHONE>\n" +
//				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
//				"        <NOTICE_STATUS xsi:nil=\"true\" />\n" +
//				"        <NOTICE_DATE xsi:nil=\"true\" />\n" +
//				"        <NUMBER_ID>084550</NUMBER_ID>\n" +
//				"        <NAME>刘柠</NAME>\n" +
//				"        <CARD_NO>D20111110</CARD_NO>\n" +
//				"        <ID_CARD>350426199009203039</ID_CARD>\n" +
//				"        <RES_ID>6b8c2b58d4254bc9b1c945cb8c90cb9e</RES_ID>\n" +
//				"        <UPDATE_TIME xsi:nil=\"true\" />\n" +
//				"        <CREATE_TIME xsi:nil=\"true\" />\n" +
//				"        <UPLOAD_STATUS xsi:nil=\"true\" />\n" +
//				"        <DATA_STATUS xsi:nil=\"true\" />\n" +
//				"        <IS_CORRECT xsi:nil=\"true\" />\n" +
//				"        <LOCAL_SOURCE xsi:nil=\"true\" />\n" +
//				"        <START_TIME_RATE xsi:nil=\"true\" />\n" +
//				"        <END_TIME_RATE xsi:nil=\"true\" />\n" +
//				"        <BARCODE>0052248552</BARCODE>\n" +
//				"     </V_RESERVATION_IMMUNE>\n" +
//				"</ArrayOfV_RESERVATION_IMMUNE>";
		
		
		
@@ -542,105 +540,105 @@ public class ImmuneService {
	 * @throws Exception
	 */
	public JSONObject GetOrgScheduleList(String orgCode) throws Exception{
//		String url = jwUrl + "/third/guahao/imm/GetOrgScheduleList";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("OrgCode", orgCode));
//		params.add(new BasicNameValuePair("StartTime", DateUtil.getStringDateShort()));//现在的时间
//
//		Date endDate = DateUtil.getPreDays(new Date(),7);
//		params.add(new BasicNameValuePair("EndTime", DateUtil.dateToStrShort(endDate)));//现在的时间往后延7天
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String xml = data.getString("data");
		String url = jwUrl + "/third/guahao/imm/GetOrgScheduleList";
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("OrgCode", orgCode));
		params.add(new BasicNameValuePair("StartTime", DateUtil.getStringDateShort()));//现在的时间
		Date endDate = DateUtil.getPreDays(new Date(),7);
		params.add(new BasicNameValuePair("EndTime", DateUtil.dateToStrShort(endDate)));//现在的时间往后延7天
		String response = httpClientUtil.post(url, params, "UTF-8");
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String xml = data.getString("data");
		
		int status = 200;
		String xml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
				"<ArrayOfViewImmuneModel xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
				"\t<ViewImmuneModel>\n" +
				"\t\t<Org>\n" +
				"\t\t\t<ORG_ID>106</ORG_ID>\n" +
				"\t\t\t<CODE>350211B1009</CODE>\n" +
				"\t\t\t<NAME>思明区鹭江街道社区卫生服务中心</NAME>\n" +
				"\t\t\t<ADDRESS /><REMARK />\n" +
				"\t\t\t<SHORT_NAME>思明区鹭江街道社区卫生服务中心</SHORT_NAME>\n" +
				"\t\t\t<RESERVATION_TELEPHONE />\n" +
				"\t\t\t<NUMBER_RELEASE_TIME xsi:nil=\"true\" />\n" +
				"\t\t\t<NUMBER_RELEASE_DAY xsi:nil=\"true\" />\n" +
				"\t\t\t<AVG_SCORE>10</AVG_SCORE>\n" +
				"\t\t\t<PHONE_INTRODUCTION />\n" +
				"\t\t\t<STATUS xsi:nil=\"true\" />\n" +
				"\t\t\t<SORT>0</SORT>\n" +
				"\t\t\t<ORG_TYPE xsi:nil=\"true\" />\n" +
				"\t\t\t<ZONE_CODE>350203</ZONE_CODE>\n" +
				"\t\t\t<UPDATE_DATE xsi:nil=\"true\" />\n" +
				"\t\t\t<ORG_IMMUNE xsi:nil=\"true\" />\n" +
				"\t\t</Org>\n" +
				"\t\t<DateNumbers>\n" +
				"\t\t\t<DateNumber>\n" +
				"\t\t\t\t<SECTIONLIST />\n" +
				"\t\t\t\t<ID>8adf96c561193b5e0161196985600086</ID>\n" +
				"\t\t\t\t<DATE>2018-01-29T00:00:00</DATE>\n" +
				"\t\t\t\t<TIME>AM</TIME>\n" +
				"\t\t\t\t<MAX>43</MAX>\n" +
				"\t\t\t\t<USED>1</USED>\n" +
				"\t\t\t\t<FEE>0</FEE>\n" +
				"\t\t\t\t<STATUS>1</STATUS>\n" +
				"\t\t\t</DateNumber>\n" +
				"\t\t\t<DateNumber>\n" +
				"\t\t\t\t<SECTIONLIST />\n" +
				"\t\t\t\t<ID>8adf96c561193b5e01611969856a0101</ID>\n" +
				"\t\t\t\t<DATE>2018-01-29T00:00:00</DATE>\n" +
				"\t\t\t\t<TIME>PM</TIME>\n" +
				"\t\t\t\t<MAX>41</MAX>\n" +
				"\t\t\t\t<USED>1</USED>\n" +
				"\t\t\t\t<FEE>0</FEE>\n" +
				"\t\t\t\t<STATUS>1</STATUS>\n" +
				"\t\t\t</DateNumber>\n" +
				"\t\t\t<DateNumber>\n" +
				"\t\t\t\t<SECTIONLIST />\n" +
				"\t\t\t\t<ID>8adf96c5611b73ac01611e8fd97c0e82</ID>\n" +
				"\t\t\t\t<DATE>2018-01-30T00:00:00</DATE>\n" +
				"\t\t\t\t<TIME>AM</TIME>\n" +
				"\t\t\t\t<MAX>43</MAX>\n" +
				"\t\t\t\t<USED>1</USED>\n" +
				"\t\t\t\t<FEE>0</FEE>\n" +
				"\t\t\t\t<STATUS>1</STATUS>\n" +
				"\t\t\t</DateNumber>\n" +
				"\t\t\t<DateNumber>\n" +
				"\t\t\t\t<SECTIONLIST />\n" +
				"\t\t\t\t<ID>8adf96c5611b73ac01611e8fd9830efd</ID>\n" +
				"\t\t\t\t<DATE>2018-01-30T00:00:00</DATE>\n" +
				"\t\t\t\t<TIME>PM</TIME>\n" +
				"\t\t\t\t<MAX>41</MAX>\n" +
				"\t\t\t\t<USED>1</USED>\n" +
				"\t\t\t\t<FEE>0</FEE>\n" +
				"\t\t\t\t<STATUS>1</STATUS>\n" +
				"\t\t\t</DateNumber>\n" +
				"\t\t\t<DateNumber>\n" +
				"\t\t\t\t<SECTIONLIST />\n" +
				"\t\t\t\t<ID>8adf96c5611b73ac01611e8fd97c0e82</ID>\n" +
				"\t\t\t\t<DATE>2018-01-31T00:00:00</DATE>\n" +
				"\t\t\t\t<TIME>AM</TIME>\n" +
				"\t\t\t\t<MAX>43</MAX>\n" +
				"\t\t\t\t<USED>1</USED>\n" +
				"\t\t\t\t<FEE>0</FEE>\n" +
				"\t\t\t\t<STATUS>1</STATUS>\n" +
				"\t\t\t</DateNumber>\n" +
				"\t\t\t<DateNumber>\n" +
				"\t\t\t\t<SECTIONLIST />\n" +
				"\t\t\t\t<ID>8adf96c5611b73ac01611e8fd9830efd</ID>\n" +
				"\t\t\t\t<DATE>2018-01-31T00:00:00</DATE>\n" +
				"\t\t\t\t<TIME>PM</TIME>\n" +
				"\t\t\t\t<MAX>41</MAX>\n" +
				"\t\t\t\t<USED>1</USED>\n" +
				"\t\t\t\t<FEE>0</FEE>\n" +
				"\t\t\t\t<STATUS>1</STATUS>\n" +
				"\t\t\t</DateNumber>\n" +
				"\t\t</DateNumbers>\n" +
				"\t</ViewImmuneModel>\n" +
				"</ArrayOfViewImmuneModel>";
//		int status = 200;
//		String xml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
//				"<ArrayOfViewImmuneModel xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">" +
//				"\t<ViewImmuneModel>\n" +
//				"\t\t<Org>\n" +
//				"\t\t\t<ORG_ID>106</ORG_ID>\n" +
//				"\t\t\t<CODE>350211B1009</CODE>\n" +
//				"\t\t\t<NAME>思明区鹭江街道社区卫生服务中心</NAME>\n" +
//				"\t\t\t<ADDRESS /><REMARK />\n" +
//				"\t\t\t<SHORT_NAME>思明区鹭江街道社区卫生服务中心</SHORT_NAME>\n" +
//				"\t\t\t<RESERVATION_TELEPHONE />\n" +
//				"\t\t\t<NUMBER_RELEASE_TIME xsi:nil=\"true\" />\n" +
//				"\t\t\t<NUMBER_RELEASE_DAY xsi:nil=\"true\" />\n" +
//				"\t\t\t<AVG_SCORE>10</AVG_SCORE>\n" +
//				"\t\t\t<PHONE_INTRODUCTION />\n" +
//				"\t\t\t<STATUS xsi:nil=\"true\" />\n" +
//				"\t\t\t<SORT>0</SORT>\n" +
//				"\t\t\t<ORG_TYPE xsi:nil=\"true\" />\n" +
//				"\t\t\t<ZONE_CODE>350203</ZONE_CODE>\n" +
//				"\t\t\t<UPDATE_DATE xsi:nil=\"true\" />\n" +
//				"\t\t\t<ORG_IMMUNE xsi:nil=\"true\" />\n" +
//				"\t\t</Org>\n" +
//				"\t\t<DateNumbers>\n" +
//				"\t\t\t<DateNumber>\n" +
//				"\t\t\t\t<SECTIONLIST />\n" +
//				"\t\t\t\t<ID>8adf96c561193b5e0161196985600086</ID>\n" +
//				"\t\t\t\t<DATE>2018-01-29T00:00:00</DATE>\n" +
//				"\t\t\t\t<TIME>AM</TIME>\n" +
//				"\t\t\t\t<MAX>43</MAX>\n" +
//				"\t\t\t\t<USED>1</USED>\n" +
//				"\t\t\t\t<FEE>0</FEE>\n" +
//				"\t\t\t\t<STATUS>1</STATUS>\n" +
//				"\t\t\t</DateNumber>\n" +
//				"\t\t\t<DateNumber>\n" +
//				"\t\t\t\t<SECTIONLIST />\n" +
//				"\t\t\t\t<ID>8adf96c561193b5e01611969856a0101</ID>\n" +
//				"\t\t\t\t<DATE>2018-01-29T00:00:00</DATE>\n" +
//				"\t\t\t\t<TIME>PM</TIME>\n" +
//				"\t\t\t\t<MAX>41</MAX>\n" +
//				"\t\t\t\t<USED>1</USED>\n" +
//				"\t\t\t\t<FEE>0</FEE>\n" +
//				"\t\t\t\t<STATUS>1</STATUS>\n" +
//				"\t\t\t</DateNumber>\n" +
//				"\t\t\t<DateNumber>\n" +
//				"\t\t\t\t<SECTIONLIST />\n" +
//				"\t\t\t\t<ID>8adf96c5611b73ac01611e8fd97c0e82</ID>\n" +
//				"\t\t\t\t<DATE>2018-01-30T00:00:00</DATE>\n" +
//				"\t\t\t\t<TIME>AM</TIME>\n" +
//				"\t\t\t\t<MAX>43</MAX>\n" +
//				"\t\t\t\t<USED>1</USED>\n" +
//				"\t\t\t\t<FEE>0</FEE>\n" +
//				"\t\t\t\t<STATUS>1</STATUS>\n" +
//				"\t\t\t</DateNumber>\n" +
//				"\t\t\t<DateNumber>\n" +
//				"\t\t\t\t<SECTIONLIST />\n" +
//				"\t\t\t\t<ID>8adf96c5611b73ac01611e8fd9830efd</ID>\n" +
//				"\t\t\t\t<DATE>2018-01-30T00:00:00</DATE>\n" +
//				"\t\t\t\t<TIME>PM</TIME>\n" +
//				"\t\t\t\t<MAX>41</MAX>\n" +
//				"\t\t\t\t<USED>1</USED>\n" +
//				"\t\t\t\t<FEE>0</FEE>\n" +
//				"\t\t\t\t<STATUS>1</STATUS>\n" +
//				"\t\t\t</DateNumber>\n" +
//				"\t\t\t<DateNumber>\n" +
//				"\t\t\t\t<SECTIONLIST />\n" +
//				"\t\t\t\t<ID>8adf96c5611b73ac01611e8fd97c0e82</ID>\n" +
//				"\t\t\t\t<DATE>2018-01-31T00:00:00</DATE>\n" +
//				"\t\t\t\t<TIME>AM</TIME>\n" +
//				"\t\t\t\t<MAX>43</MAX>\n" +
//				"\t\t\t\t<USED>1</USED>\n" +
//				"\t\t\t\t<FEE>0</FEE>\n" +
//				"\t\t\t\t<STATUS>1</STATUS>\n" +
//				"\t\t\t</DateNumber>\n" +
//				"\t\t\t<DateNumber>\n" +
//				"\t\t\t\t<SECTIONLIST />\n" +
//				"\t\t\t\t<ID>8adf96c5611b73ac01611e8fd9830efd</ID>\n" +
//				"\t\t\t\t<DATE>2018-01-31T00:00:00</DATE>\n" +
//				"\t\t\t\t<TIME>PM</TIME>\n" +
//				"\t\t\t\t<MAX>41</MAX>\n" +
//				"\t\t\t\t<USED>1</USED>\n" +
//				"\t\t\t\t<FEE>0</FEE>\n" +
//				"\t\t\t\t<STATUS>1</STATUS>\n" +
//				"\t\t\t</DateNumber>\n" +
//				"\t\t</DateNumbers>\n" +
//				"\t</ViewImmuneModel>\n" +
//				"</ArrayOfViewImmuneModel>";
		
		
		
@@ -723,73 +721,73 @@ public class ImmuneService {
	 * @throws Exception
	 */
	public JSONArray GetOrgNumberList(String orgId, String scheduleId,String amorpm) throws Exception{
//		String url = jwUrl + "/third/guahao/imm/GetOrgNumberList";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("orgId", orgId));
//		params.add(new BasicNameValuePair("ScheduleId", scheduleId);//现在的时间
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String xml = data.getString("data");
		String url = jwUrl + "/third/guahao/imm/GetOrgNumberList";
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("orgId", orgId));
		params.add(new BasicNameValuePair("ScheduleId", scheduleId));//现在的时间
		String response = httpClientUtil.post(url, params, "UTF-8");
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String xml = data.getString("data");
		
		int status = 200;
		String xml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
				"<ArrayOfV_NUMBER_IMMUNE\n" +
				"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
				"    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
				"    <V_NUMBER_IMMUNE>\n" +
				"        <ORG_ID>501</ORG_ID>\n" +
				"        <START_TIME>2017-08-24T08:00:00</START_TIME>\n" +
				"        <END_TIME>2017-08-24T08:08:00</END_TIME>\n" +
				"        <SCHEDULE_ID>350211B10392017082401</SCHEDULE_ID>\n" +
				"        <NUMBER_ID>081000</NUMBER_ID>\n" +
				"        <UPDATE_TIME>2017-08-14T10:04:41</UPDATE_TIME>\n" +
				"        <LIMIT>1</LIMIT>\n" +
				"        <USED>0</USED>\n" +
				"        <CREATE_TIME>2017-08-14T10:04:41</CREATE_TIME>\n" +
				"        <UPLOAD_STATUS>0</UPLOAD_STATUS>\n" +
				"        <DATA_STATUS>1</DATA_STATUS>\n" +
				"        <IS_CORRECT>0</IS_CORRECT>\n" +
				"        <DELAY>0</DELAY>\n" +
				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
				"        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
				"    </V_NUMBER_IMMUNE>\n" +
				"    <V_NUMBER_IMMUNE>\n" +
				"        <ORG_ID>501</ORG_ID>\n" +
				"        <START_TIME>2017-08-24T09:00:00</START_TIME>\n" +
				"        <END_TIME>2017-08-24T09:08:00</END_TIME>\n" +
				"        <SCHEDULE_ID>350211B10392017082401</SCHEDULE_ID>\n" +
				"        <NUMBER_ID>081000</NUMBER_ID>\n" +
				"        <UPDATE_TIME>2017-08-14T10:04:41</UPDATE_TIME>\n" +
				"        <LIMIT>1</LIMIT>\n" +
				"        <USED>0</USED>\n" +
				"        <CREATE_TIME>2017-08-14T10:04:41</CREATE_TIME>\n" +
				"        <UPLOAD_STATUS>0</UPLOAD_STATUS>\n" +
				"        <DATA_STATUS>1</DATA_STATUS>\n" +
				"        <IS_CORRECT>0</IS_CORRECT>\n" +
				"        <DELAY>0</DELAY>\n" +
				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
				"        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
				"    </V_NUMBER_IMMUNE>\n" +
				"    <V_NUMBER_IMMUNE>\n" +
				"        <ORG_ID>501</ORG_ID>\n" +
				"        <START_TIME>2017-08-24T10:00:00</START_TIME>\n" +
				"        <END_TIME>2017-08-24T10:08:00</END_TIME>\n" +
				"        <SCHEDULE_ID>350211B10392017082401</SCHEDULE_ID>\n" +
				"        <NUMBER_ID>081000</NUMBER_ID>\n" +
				"        <UPDATE_TIME>2017-08-14T10:04:41</UPDATE_TIME>\n" +
				"        <LIMIT>1</LIMIT>\n" +
				"        <USED>0</USED>\n" +
				"        <CREATE_TIME>2017-08-14T10:04:41</CREATE_TIME>\n" +
				"        <UPLOAD_STATUS>0</UPLOAD_STATUS>\n" +
				"        <DATA_STATUS>1</DATA_STATUS>\n" +
				"        <IS_CORRECT>0</IS_CORRECT>\n" +
				"        <DELAY>0</DELAY>\n" +
				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
				"        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
				"    </V_NUMBER_IMMUNE>\n" +
				"</ArrayOfV_NUMBER_IMMUNE>";
//		int status = 200;
//		String xml = "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
//				"<ArrayOfV_NUMBER_IMMUNE\n" +
//				"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
//				"    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
//				"    <V_NUMBER_IMMUNE>\n" +
//				"        <ORG_ID>501</ORG_ID>\n" +
//				"        <START_TIME>2017-08-24T08:00:00</START_TIME>\n" +
//				"        <END_TIME>2017-08-24T08:08:00</END_TIME>\n" +
//				"        <SCHEDULE_ID>350211B10392017082401</SCHEDULE_ID>\n" +
//				"        <NUMBER_ID>081000</NUMBER_ID>\n" +
//				"        <UPDATE_TIME>2017-08-14T10:04:41</UPDATE_TIME>\n" +
//				"        <LIMIT>1</LIMIT>\n" +
//				"        <USED>0</USED>\n" +
//				"        <CREATE_TIME>2017-08-14T10:04:41</CREATE_TIME>\n" +
//				"        <UPLOAD_STATUS>0</UPLOAD_STATUS>\n" +
//				"        <DATA_STATUS>1</DATA_STATUS>\n" +
//				"        <IS_CORRECT>0</IS_CORRECT>\n" +
//				"        <DELAY>0</DELAY>\n" +
//				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
//				"        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
//				"    </V_NUMBER_IMMUNE>\n" +
//				"    <V_NUMBER_IMMUNE>\n" +
//				"        <ORG_ID>501</ORG_ID>\n" +
//				"        <START_TIME>2017-08-24T09:00:00</START_TIME>\n" +
//				"        <END_TIME>2017-08-24T09:08:00</END_TIME>\n" +
//				"        <SCHEDULE_ID>350211B10392017082401</SCHEDULE_ID>\n" +
//				"        <NUMBER_ID>081000</NUMBER_ID>\n" +
//				"        <UPDATE_TIME>2017-08-14T10:04:41</UPDATE_TIME>\n" +
//				"        <LIMIT>1</LIMIT>\n" +
//				"        <USED>0</USED>\n" +
//				"        <CREATE_TIME>2017-08-14T10:04:41</CREATE_TIME>\n" +
//				"        <UPLOAD_STATUS>0</UPLOAD_STATUS>\n" +
//				"        <DATA_STATUS>1</DATA_STATUS>\n" +
//				"        <IS_CORRECT>0</IS_CORRECT>\n" +
//				"        <DELAY>0</DELAY>\n" +
//				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
//				"        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
//				"    </V_NUMBER_IMMUNE>\n" +
//				"    <V_NUMBER_IMMUNE>\n" +
//				"        <ORG_ID>501</ORG_ID>\n" +
//				"        <START_TIME>2017-08-24T10:00:00</START_TIME>\n" +
//				"        <END_TIME>2017-08-24T10:08:00</END_TIME>\n" +
//				"        <SCHEDULE_ID>350211B10392017082401</SCHEDULE_ID>\n" +
//				"        <NUMBER_ID>081000</NUMBER_ID>\n" +
//				"        <UPDATE_TIME>2017-08-14T10:04:41</UPDATE_TIME>\n" +
//				"        <LIMIT>1</LIMIT>\n" +
//				"        <USED>0</USED>\n" +
//				"        <CREATE_TIME>2017-08-14T10:04:41</CREATE_TIME>\n" +
//				"        <UPLOAD_STATUS>0</UPLOAD_STATUS>\n" +
//				"        <DATA_STATUS>1</DATA_STATUS>\n" +
//				"        <IS_CORRECT>0</IS_CORRECT>\n" +
//				"        <DELAY>0</DELAY>\n" +
//				"        <CANCEL_DATE xsi:nil=\"true\" />\n" +
//				"        <PLATFORM_FLAG>0</PLATFORM_FLAG>\n" +
//				"    </V_NUMBER_IMMUNE>\n" +
//				"</ArrayOfV_NUMBER_IMMUNE>";
		
		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
		JSONArray result = new JSONArray();

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

@@ -257,6 +257,33 @@ public class CommonUtil {
        }
    }
    /**
     * 校验图片本地路径掺杂网络路径，统一返回网路路径
     *
     * @param images
     * @throws Exception
     */
    public  String validateImages(String images) throws Exception {
        String imagePath = "";
        String imageUrls = "";
        String imageRow = "";
        String[] imgs = images.split(",");
        for (String image : imgs) {
            if (image.contains("group1")) {
                imageUrls += image + ",";
            } else {
                try {
                    imageRow += copyTempImage(image) + ",";
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        }
        imagePath += imageUrls + imageRow;
        imagePath = imagePath.substring(0, imagePath.length() - 1);
        return imagePath;
    }
    public void changeToMp3(String sourcePath, String targetPath) {
        File source = new File(sourcePath);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthGuidanceController.java

@@ -13,12 +13,15 @@ import com.yihu.wlyy.service.template.DoctorGuidanceTempService;
import com.yihu.wlyy.service.template.DoctorTeamGuidanceService;
import com.yihu.wlyy.util.CommonUtil;
import com.yihu.wlyy.web.WeixinBaseController;
import com.yihu.wlyy.web.third.ylzpay.ThirdOnepayController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
@@ -37,6 +40,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Api(description = "健康指导")
public class DoctorHealthGuidanceController extends WeixinBaseController {
    private static final Logger logger = LoggerFactory.getLogger(DoctorHealthGuidanceController.class);
    @Autowired
    private PatientHealthGuidanceService patientHealthGuidanceService;
@@ -176,8 +181,9 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
					images = CommonUtil.copyTempImage(images);
				}*/
                if (StringUtils.isNotEmpty(images)) {
                    images = doctorTeamGuidanceService.validateImages(images);
                    images = CommonUtil.validateImages(images);
                }
                logger.info("========================================> "+images);
                guidance.setImages(images);
                // 保存到居民端健康指导
@@ -202,7 +208,7 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
                guidance.setPatient(patient);
                Doctor doctor = doctorService.findDoctorByCode(getUID());
                if (StringUtils.isNotEmpty(images)) {
                    images = doctorTeamGuidanceService.validateImages(images);
                    images = CommonUtil.validateImages(images);
                }
                /*if (images == null || "".equals(images)) {
                    images = null;
@@ -224,6 +230,7 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
//                    images = imageUrls + imageRow;
//                    images = images.substring(0, images.length() - 1);
//                }
                logger.info("========================================> "+images);
                guidance.setImages(images);
                // 保存