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

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

@@ -584,7 +584,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    }
    public JSONObject checkOutpatient(String patient,String cardNo)throws Exception{
    public JSONObject checkOutpatient(String patient)throws Exception{
        //-1卡余额不足，,-2 存在未结束的诊断热 1成功
        JSONObject rs = new JSONObject();
        //1.余额判断改到前端判断
@@ -1361,13 +1361,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    public Map<String,Object> findDoctorInfo(String doctor){
        BaseDoctorDO doctorDO = baseDoctorDao.findOne(doctor);
        Map<String,Object> rs = new HashedMap();
        rs.put("doctor",doctor);
        rs.put("doctor",doctorDO.getName());
        rs.put("job",doctorDO.getJobTitleCode());
        rs.put("jobName",doctorDO.getJobTitleName());
        rs.put("chargeType",doctorDO.getChargeType());
        rs.put("photo",doctorDO.getPhoto());
        if(doctorDO!=null){
            rs.put("doctor",doctor);
            rs.put("doctor",doctorDO.getName());
            rs.put("job",doctorDO.getJobTitleCode());
            rs.put("jobName",doctorDO.getJobTitleName());
            rs.put("chargeType",doctorDO.getChargeType());
            rs.put("photo",doctorDO.getPhoto());
        }
        return rs;
    }

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

@@ -168,7 +168,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.checkOutpatient)
    @ApiOperation(value = "判断是否可用发起门诊", notes = "判断是否可用发起门诊")
    public ObjEnvelop checkOutpatient(@ApiParam(name = "patient", value = "续方明细")
                                      @RequestParam(value = "patient", required = true)String patient){
                                      @RequestParam(value = "patient", required = true)String patient)throws Exception{
        return success(prescriptionService.checkOutpatient(patient));
    }