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

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -154,6 +154,7 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/baseDrug";
        public static final String DOCINFO  = "/docInfo";
        public static final String CREATE  = "/create";
        public static final String getDrugDetailListById  = "/getDrugDetailListById";
        public static final String getOrgListByTown  = "/getOrgListByTown";
        public static final String enableOrDis  = "/enableOrDis";
        public static final String docFullInfo  = "/docFullInfo";

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDrugsEndpoint.java

@@ -8,7 +8,9 @@ import com.yihu.jw.base.service.a3service.MedicineOrderService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.Mediicinestockoutdetail;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -110,6 +112,18 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
    @GetMapping(value = BaseRequestMapping.BaseDrug.getDrugDetailListById)
    @ApiOperation(value = "获取药品信息" , notes="获取药品信息")
    public Envelop getoutdetail(
            @ApiParam(name = "drugId", value = "药品id", required = true)
            @RequestParam(value = "drugId") String drugId) throws Exception {
        JSONObject jsonObject = drugsService.getOneDrugInfo(drugId);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("msg"));
    }
    @GetMapping(value = "/excelControl/exportExcel")
    @ApiOperation("导出列表")
    @ResponseBody

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineDrugsService.java

@@ -9,6 +9,12 @@ import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.team.BaseTeamDO;
import com.yihu.jw.entity.base.team.BaseTeamMemberDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -255,4 +261,26 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    public JSONObject getOneDrugInfo(String drugId) throws Exception{
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(drugId)){
            result.put("msg","parameter drugId is null ");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        Mediicinedrugs drug = drugsDao.findOne(drugId);
        if(null == drug){
            result.put("msg","药品不存在:" + drugId);
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("drug",drug);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",jsonObject);
        return result;
    }
}