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

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

@@ -39,7 +39,6 @@ import com.yihu.jw.util.entity.ServiceException;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.network.HttpResponse;
import com.yihu.jw.util.network.HttpUtils;
import lombok.Synchronized;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -677,10 +676,11 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     * @param idNo 身份证
     * @param gend 性别 1男 2女
     * @param phone 手机号
     * @param cardType 01社保卡 其他自费
     * @return
     * @throws Exception
     */
    public JSONObject buildAccountToHospital(String operatorName,String userName,String idNo,String gend,String phone,String cardNo) throws Exception {
    public JSONObject buildAccountToHospital(String operatorName,String userName,String idNo,String gend,String phone,String cardNo,String cardType) throws Exception {
        String url = entranceUrl +"buildAccount";
        JSONObject object = new JSONObject();
        Map<String,Object> params = new HashedMap();

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

@@ -18,7 +18,6 @@ import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalIcdDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalMxDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationDO;
import com.yihu.jw.entity.hospital.healthCare.YlzMedicalRelationInvoiceDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
@@ -2091,7 +2090,7 @@ public class DsyyEntranceService {
     * @return
     * @throws Exception
     */
    public String buildAccount(String userName,String idNo,String gend,String phone,String cardNo) throws  Exception{
    public String buildAccount(String userName,String idNo,String gend,String phone,String cardNo,String cardType) throws  Exception{
        String api = "build_account";
        String msgHeader ="<?xml version=\"1.0\" encoding=\"utf-8\"?> " +
                "<root> " +
@@ -2122,6 +2121,9 @@ public class DsyyEntranceService {
        if (StringUtils.isNoneBlank(phone)){
            object.put("phone",phone);
        }
        if (StringUtils.isNoneBlank(cardType)){
            object.put("cardType",cardType);
        }
        if (!StringUtils.isNoneBlank(cardNo)){
            object.put("certType","6");
        }

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/DsyyController.java

@@ -254,11 +254,13 @@ public class DsyyController extends EnvelopRestEndpoint {
                                    @RequestParam(value = "idNo",required = false)String idNo,
                                   @ApiParam(name = "gend", value = "性别 1男 2女", required = false)
                                       @RequestParam(value = "gend",required = false)String gend,
                                   @ApiParam(name = "cardType", value = "卡类型(01社保卡 其他自费)", required = false)
                                       @RequestParam(value = "cardType",required = false)String cardType,
                                   @ApiParam(name = "phone", value = "电话号码", required = false)
                                       @RequestParam(value = "phone",required = false)String phone,
                                   @ApiParam(name = "cardNo", value = "卡号", required = false)
                                       @RequestParam(value = "cardNo",required = false)String cardNo) throws Exception {
        return success("请求成功",dsyyEntranceService.buildAccount(userName,idNo,gend,phone,cardNo));
        return success("请求成功",dsyyEntranceService.buildAccount(userName,idNo,gend,phone,cardNo,cardType));
    }
    /**

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

@@ -435,6 +435,8 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                                   @RequestParam(value = "idNo",required = false)String idNo,
                                   @ApiParam(name = "gend", value = "性别 1男 2女", required = false)
                                   @RequestParam(value = "gend",required = false)String gend,
                                   @ApiParam(name = "cardType", value = "卡类型(01社保卡 其他自费)", required = false)
                                       @RequestParam(value = "cardType",required = false)String cardType,
                                   @ApiParam(name = "phone", value = "电话号码", required = false)
                                   @RequestParam(value = "phone",required = false)String phone,
                                   @ApiParam(name = "cardNo", value = "卡号", required = false)
@@ -445,7 +447,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            if(patientDO!=null){
                operatorName = patientDO.getName();
            }
            JSONObject obj = dsyyPrescriptionService.buildAccountToHospital(operatorName,userName,idNo,gend,phone,cardNo);
            JSONObject obj = dsyyPrescriptionService.buildAccountToHospital(operatorName,userName,idNo,gend,phone,cardNo,cardType);
            return ObjEnvelop.getSuccess("ok",obj);
        }catch (Exception e){
            e.printStackTrace();
@@ -510,7 +512,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                    if(patientDO!=null){
                        operatorName = patientDO.getName();
                    }
                    JSONObject object = dsyyPrescriptionService.buildAccountToHospital(operatorName,familyName,idCard, IdCardUtil.getSexForIdcard_new(idCard),username,medicare);
                    JSONObject object = dsyyPrescriptionService.buildAccountToHospital(operatorName,familyName,idCard, IdCardUtil.getSexForIdcard_new(idCard),username,medicare,"01");
                    if(!"00".equals(object.getString("retCode"))){
                        mixEnvelop.setStatus(408);
                        mixEnvelop.setMessage(object.getString("retMsg"));