Merge branch 'dev' of trick9191/wlyy2.0 into dev

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

@@ -1568,7 +1568,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        json.put("cardNo",outpatientDO.getCardNo());
        json.put("doctor",doctorMappingDO.getMappingCode());
        json.put("dept",inspectionDO.getDept());
        json.put("dept",outpatientDO.getDept());
        json.put("frequency",inspectionDO.getFrequency()); //组号
        json.put("quantity",inspectionDO.getQuantity()); //数量

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -324,4 +324,18 @@ public class WlyyBusinessService {
        }
        return null;
    }
    public String makeBase64Qrcode(String doctor){
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
        Map<String,String> mapParams = new HashedMap();
        mapParams.put("doctor",doctorDO.getId()+"_"+doctorDO.getName());
        JSONObject re = wlyyHttpService.sendWlyyMes("makeBase64Qrcode",null,mapParams);
        if(re!=null){
            return re.getString("data");
        }
        return null;
    }
}

business/base-service/src/mqConfig/mqdata/BS15017.json

@@ -3,7 +3,7 @@
	"MsgInfo": {
		"Msg": {
			"CARD_NO": "D26818411",
			"ZHYE": "30.00",
			"ZHYE": "0.00",
			"YEXZ_FLAG": "1"
		},
		"MsgCount": "1",

business/base-service/src/mqConfig/mqdata/BS15018.json

@@ -1,14 +1,14 @@
{
	"code": "1",
	"MsgInfo": [{
		"MsgInfo": [{
		"PAT_NO": "P5616242-0",
		"CARD_NO": "D40136791",
		"CARD_STAT": "旧卡停用",
		"CARD_STAT": "激活",
		"OP_DATE": "2011-09-27 15:35:57",
		"CARD_TYPE": "2",
		"CARD_TYPE_NAME": "社保卡",
		"social_no": "350211198411053024"
	},
		},
	{
		"PAT_NO": "P5616242-0",
		"CARD_NO": "DA1872143",

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -274,6 +274,11 @@ public class BaseHospitalRequestMapping {
         *  厦门I健康获取居民身份证
         */
        public static final String findPatientListBySscOrIdCard = "/findPatientListBySscOrIdCard";
        /**
         * 获取Base64医生头像
         */
        public static final String makeBase64Qrcode = "/makeBase64Qrcode";
        //=================end=======================================
        /**

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

@@ -782,4 +782,11 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        return failed("身份证或医保卡格式有误");
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.makeBase64Qrcode)
    @ApiOperation(value = "获取医生二维码")
    public ObjEnvelop makeBase64Qrcode(@ApiParam(name = "doctor", value = "医生ID")
                                    @RequestParam(value = "doctor",required = true) String doctor)throws Exception{
        return success("获取医生二维码成功",wlyyBusinessService.makeBase64Qrcode(doctor));
    }
}