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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/imm/ChildFamilyImmuneDao.java

@@ -16,4 +16,7 @@ public interface ChildFamilyImmuneDao extends PagingAndSortingRepository<ChildFa
	
	@Query("select p from ChildFamilyImmune p where p.familyCode = ?1 and p.del = 0")
	List<ChildFamilyImmune> findByFamilyCode(String familycode);
	
	@Query("select p from ChildFamilyImmune p where p.childCode = ?1 and p.familyCode = ?2 and p.del = 0")
	ChildFamilyImmune findByfaAndChildCodeAndFamilyCode(String childcode,String familycode);
}

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

@@ -43,7 +43,22 @@ public class ChildFamilyImmuneService extends BaseService {
	 */
	@Transactional
	public void addFamilyMembers(ChildInfo childInfo, String uid, String idcard, String ssc,Integer relation) throws Exception {
		
		ChildFamilyImmune childFamilyImmune = new ChildFamilyImmune();
		if(childInfo.getId() == null
				|| StringUtils.isBlank(childInfo.getIdcard())
					|| StringUtils.isBlank(childInfo.getSsc())){
			childInfo.setIdcard(idcard);
			childInfo.setSsc(ssc);
			childInfoDao.save(childInfo);
		}else{
			childFamilyImmune = childFamilyImmuneDao.findByfaAndChildCodeAndFamilyCode(childInfo.getCode(),uid);
			
			if(childFamilyImmune != null){
				throw new Exception("您已绑定过该新生儿，无法重复绑定");
			}
		}
		
		childFamilyImmune.setCode(UUID.randomUUID().toString());
		childFamilyImmune.setChildCode(childInfo.getCode());
		childFamilyImmune.setFamilyCode(uid);
@@ -51,13 +66,6 @@ public class ChildFamilyImmuneService extends BaseService {
		childFamilyImmune.setCreate_time(new Date());
		childFamilyImmune.setRelation(relation);
		
		if(childInfo.getId() == 0
				|| StringUtils.isBlank(childInfo.getIdcard())
					|| StringUtils.isBlank(childInfo.getSsc())){
			childInfo.setIdcard(idcard);
			childInfo.setSsc(ssc);
			childInfoDao.save(childInfo);
		}
		childFamilyImmuneDao.save(childFamilyImmune);
	}
	

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

@@ -34,9 +34,11 @@ public class ChildInfoService extends BaseService {
		ChildInfo childInfo = childInfoDao.findByBarcode(barCode);
		//2.如果本地数据库无记录则请求基卫接口查询
		if(childInfo == null){
		    String re = immuneService.GetChildrenInfo(barCode);
			JSONObject data = JSONObject.parseObject(re);
			int status = data.getInteger("status");
//		    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");
			if(200 == status){
				childInfo = new ChildInfo();
				childInfo.setCode(UUID.randomUUID().toString());
@@ -47,6 +49,7 @@ public class ChildInfoService extends BaseService {
				childInfo.setDeliverJworgcode(data.getString("deptNum"));
				childInfo.setDel(0);
				childInfo.setCreate_time(new Date());
				childInfo.setBarcode(barCode);
			}else{
				throw new Exception("获取新生儿信息失败！");
			}

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

@@ -68,16 +68,24 @@ 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<>();
//		params.add(new BasicNameValuePair("Condition", ""));
//
//		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<>();
		params.add(new BasicNameValuePair("Condition", ""));
		
		String response = httpClientUtil.post(url, params, "UTF-8");
		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>";
		
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String xml = data.getString("data");
		if(200 == status && StringUtils.isNotBlank(xml)){
			Document document = DocumentHelper.parseText(xml);
			Element root = document.getRootElement();
@@ -113,86 +121,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>350211A1025</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>";
		
		
		
@@ -376,79 +384,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>";
		
		
		

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

@@ -569,7 +569,7 @@ public class FileUploadController extends BaseController {
                JSONObject json = new JSONObject();
                json.put("status", 200);
                json.put("msg", "上传成功");
                json.put("urls", urls);
                json.put("data", urls);
                logger.info("图片上传：" + json.toString());
                return json.toString();
            } catch (Exception e) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -502,10 +502,12 @@ public class FamilyMemberController extends WeixinBaseController {
            }
    
            childFamilyImmuneService.addFamilyMembers(childInfo,getRepUID(),idcard,ssc,relation);
//            childFamilyImmuneService.addFamilyMembers(childInfo,"huangwenjie",idcard,ssc,relation);
    
            return write(200,"绑定成功！");
        } catch (Exception e) {
            return error(-1, "绑定失败！");
            error(e);
            return error(-1, e.getMessage());
        }
    }
    
@@ -522,6 +524,7 @@ public class FamilyMemberController extends WeixinBaseController {
            childInfoService.modifyImmuneMenberByBarCode(barCode,ssc,idcard);
            return write(200,"修改成功！");
        } catch (Exception e) {
            error(e);
            return error(-1, "修改失败！");
        }
    }
@@ -535,6 +538,7 @@ public class FamilyMemberController extends WeixinBaseController {
            ChildInfo childInfo = childInfoService.getChildInfoByCode(code);
            return write(200,"查询成功！","data",childInfo);
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }