Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

@@ -2124,14 +2124,15 @@ public class XzzxEntranceService{
            String obj = object.getString("obj");
            JSONArray array = JSONArray.parseArray(obj).getJSONArray(0);
            for (int i=0;i<array.size();i++){
                JSONObject jsonObject = array.getJSONObject(0);
                JSONObject jsonObject = array.getJSONObject(i);
                String cardType = jsonObject.getString("CARD_TYPE");
                WlyyHospitalSysDictDO hospitalSysDictDO = wlyyHospitalSysDictDao.findByHospitalAndDictCode("350211A5010",jsonObject.getString("CARD_TYPE"));
                if (hospitalSysDictDO!=null){
                    jsonObject.put("CARD_TYPE",hospitalSysDictDO.getDictValue());
                    jsonObject.put("CARD_TYPE_HIS",jsonObject.getString("CARD_TYPE"));
                    jsonObject.put("CARD_TYPE_HIS",cardType);
                }else {
                    jsonObject.put("CARD_TYPE",null);
                    jsonObject.put("CARD_TYPE_HIS",jsonObject.getString("CARD_TYPE"));
                    jsonObject.put("CARD_TYPE_HIS",cardType);
                }
            }
            /*if (array!=null&&array.size()!=0){

server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthYlzConfigService.java

@@ -12,6 +12,7 @@ import com.yihu.jw.security.dao.patient.WlyyPatientFamilyMemberDao;
import com.yihu.jw.security.utils.ByteToInputStream;
import com.yihu.jw.security.utils.DateUtil;
import com.yihu.jw.security.utils.QrcodeUtil;
import com.yihu.jw.util.idcard.IdCardUtil;
import com.yihu.utils.security.MD5;
import com.ylzinfo.ehc.EhcHandler;
import com.ylzinfo.ehc.common.utils.DateUtils;
@@ -232,6 +233,7 @@ public class OauthYlzConfigService {
                        patient.setDel("1");
                        patient.setEnabled(1);
                        patient.setLocked(0);
                        patient.setSex(Integer.parseInt(IdCardUtil.getSexForIdcard_new(idcard)));
                        patient.setCreateTime(new Date());
                        patient.setUpdateTime(new Date());
                        patient.setBirthday(DateUtil.strToDate(biz.getString("birthday"),"yyyyMMdd"));

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -208,6 +208,10 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
			}else{
				consult.setType(9);//图文复诊
			}
			WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientCode);
			if (outpatientDO.getStatus().equalsIgnoreCase("-1")){
				return failed("患者已取消！");
			}
			
			
			//咨询类型（1、图文；2、视频,3、图文+视频）
@@ -216,7 +220,6 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		
			JSONObject result = new JSONObject();
			synchronized (outpatientCode.intern()){
				
				if(!"xm_ykyy_wx".equals(wxId)){//中山医院-心脏中心需要挂号
					//1.调用挂号接口
					logger.info("调用挂号接口====START");
@@ -336,6 +339,11 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		consult.setHealthindexType(type);
//			int res = 0;
		WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientCode);
		if (outpatientDO.getStatus().equalsIgnoreCase("-1")){
			return failed("患者已取消！");
		}
		JSONObject result = new JSONObject();
		synchronized (outpatientCode.intern()){