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/YkyyEntranceService.java

@@ -202,6 +202,151 @@ public class YkyyEntranceService {
        return "success";
    }
    /**
     * 检验信息列表
     * @param patient
     * @param page
     * @param size
     * @return
     * @throws Exception
     */
    public JSONArray vlisReportMasterlist(String patient,Integer page,Integer size) throws Exception{
        PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(patient);
        if(patientMappingDO==null){
            return new JSONArray();
        }
        String sql ="select * from VLIS_REPORT_MASTER where PATIENT_ID = '"+patientMappingDO.getMappingCode()+"' order by REPORT_TIME desc";
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        params.put("size",size);
        params.put("page",page);
        logger.info("vpacsReportList："+sql);
        HttpResponse response = HttpUtils.doGet(url,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if(status!=null&&status == 200){
            return rs.getJSONArray("detailModelList");
        }
        return new JSONArray();
    }
    /**
     * 检验信息明细
     * @param REPORT_ID
     * @return
     * @throws Exception
     */
    public JSONObject vlisReportMasterDetail(String REPORT_ID) throws Exception{
        String sql ="select * from VLIS_REPORT_MASTER where REPORT_ID = '"+REPORT_ID+"'";
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        logger.info("vlisReportMasterDetail："+sql);
        HttpResponse response = HttpUtils.doGet(url,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        JSONObject res = new JSONObject();
        if(status!=null&&status == 200){
            res = rs.getJSONArray("detailModelList").getJSONObject(0);
        }
        //LIS 常规报告细视图
        String detail1 = "select * from VLIS_REPORT_DETAIL where REPORT_ID = '"+REPORT_ID+"'";
        Map<String,Object> detailParams1 = new HashedMap();
        detailParams1.put("sql",detail1);
        logger.info("VLIS_REPORT_DETAIL："+detail1);
        HttpResponse detailresponse1 = HttpUtils.doGet(url,detailParams1);
        String detailcontent1 = detailresponse1.getContent();
        logger.info("response:"+detailcontent1);
        JSONObject detailrs1 = JSON.parseObject(detailcontent1);
        if(detailrs1.getInteger("status")!=null&&detailrs1.getInteger("status") == 200){
            res.put("detail1",detailrs1.getJSONArray("detailModelList"));
        }
        //LIS 药敏报告细视图
        String detail2 = "select * from VLIS_REPORT_DETAIL2 where REPORT_ID = '"+REPORT_ID+"'";
        Map<String,Object> detailParams2 = new HashedMap();
        detailParams2.put("sql",detail2);
        logger.info("VLIS_REPORT_DETAIL2："+detail2);
        HttpResponse detailresponse2 = HttpUtils.doGet(url,detailParams2);
        String detailcontent2 = detailresponse2.getContent();
        logger.info("response:"+detailcontent2);
        JSONObject detailrs2 = JSON.parseObject(detailcontent2);
        if(detailrs2.getInteger("status")!=null&&detailrs2.getInteger("status") == 200){
            res.put("detail2",detailrs2.getJSONArray("detailModelList"));
        }
        //LIS 细菌培养说明细视图
/*        String detail3 = "select * from VLIS_REPORT_DETAIL3 where REPORT_ID = '"+REPORT_ID+"'";
        Map<String,Object> detailParams3 = new HashedMap();
        detailParams3.put("sql",detail3);
        logger.info("VLIS_REPORT_DETAIL："+detail3);
        HttpResponse detailresponse3 = HttpUtils.doGet(url,detailParams3);
        String detailcontent3 = detailresponse3.getContent();
        logger.info("response:"+detailcontent3);
        JSONObject detailrs3 = JSON.parseObject(detailcontent3);
        if(detailrs3.getInteger("status")!=null&&detailrs3.getInteger("status") == 200){
            res.put("detail3",detailrs3.getJSONArray("detailModelList"));
        }*/
        return res;
    }
    /**
     * 检查信息列表
     * @param patient
     * @param page
     * @param size
     * @return
     * @throws Exception
     */
    public JSONArray vpacsReportList(String patient,Integer page,Integer size) throws Exception{
        PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(patient);
        if(patientMappingDO==null){
            return null;
        }
        String sql ="select * from VPACS_REPORT where PATIENT_ID = '"+patientMappingDO.getMappingCode()+"'";
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        params.put("size",size);
        params.put("page",page);
        logger.info("vpacsReportList："+sql);
        HttpResponse response = HttpUtils.doGet(url,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if(status!=null&&status == 200){
            return rs.getJSONArray("detailModelList");
        }
        return new JSONArray();
    }
    /**
     * 检查信息明细
     * @param REPORT_ID
     * @return
     * @throws Exception
     */
    public JSONObject vpacsReportDetail(String REPORT_ID) throws Exception{
        String sql ="select * from VPACS_REPORT where REPORT_ID = '"+REPORT_ID+"'";
        Map<String,Object> params = new HashedMap();
        params.put("sql",sql);
        logger.info("vpacsReportDetail："+sql);
        HttpResponse response = HttpUtils.doGet(url,params);
        String content = response.getContent();
        logger.info("response:"+content);
        JSONObject rs = JSON.parseObject(content);
        Integer status = rs.getInteger("status");
        if(status!=null&&status == 200){
            return rs.getJSONArray("detailModelList").getJSONObject(0);
        }
        return new JSONObject();
    }
    /**
     * 患者门诊就诊记录

common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/bank/HealthBankMapping.java

@@ -66,6 +66,7 @@ public class HealthBankMapping {
        public static final String weekReward = "/weekReward";
        public static final String selectByDate = "/selectByDate";
        public static final String doctorDescreaseIntegrate = "/doctorDescreaseIntegrate";
        public static final String doctorIncreaseIntegrate = "/doctorIncreaseIntegrate";
        public static final String selectAccountByPatient="/selectAccountByPatient";
        public static final String selectByActivityRule = "/selectByActivityRule";
        public static final String patientGetInteger = "/patientGetInteger";

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

@@ -9,6 +9,7 @@ import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.service.*;
import com.yihu.jw.hospital.prescription.service.entrance.DoctorPreSignService;
import com.yihu.jw.hospital.prescription.service.entrance.XzzxEntranceService;
import com.yihu.jw.hospital.prescription.service.entrance.YkyyEntranceService;
import com.yihu.jw.hospital.service.SystemMessage.HospitalSystemMessageService;
import com.yihu.jw.im.service.ImService;
import com.yihu.jw.restmodel.hospital.prescription.WlyyOutpatientVO;
@@ -47,7 +48,8 @@ public class YkyyPrescriptionEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private YkyyPrescriptionService prescriptionService;
    @Autowired
    private YkyyEntranceService ykyyEntranceService;
    @Value("${demo.flag}")
    private boolean demoFlag;
@@ -55,6 +57,54 @@ public class YkyyPrescriptionEndpoint extends EnvelopRestEndpoint {
    @Value("${wechat.id}")
    private String wxId;
    @GetMapping(value = "vlisReportMasterlist")
    @ApiOperation(value = "检验信息列表")
    public ListEnvelop vlisReportMasterlist(@ApiParam(name = "patient", value = "居民id")
                                          @RequestParam(value = "patient",required = true) String patient,
                                          @ApiParam(name = "page", value = "第几页")
                                          @RequestParam(value = "page",required = false) Integer page,
                                          @ApiParam(name = "size", value = "页面大小")
                                          @RequestParam(value = "size",required = false) Integer size) throws Exception{
        if(page==null){
            page = 1;
        }
        if(size==null){
            size = 10;
        }
        return success(ykyyEntranceService.vlisReportMasterlist(patient, page, size));
    }
    @GetMapping(value = "vlisReportMasterDetail")
    @ApiOperation(value = "检验信息明细")
    public ObjEnvelop vlisReportMasterDetail(@ApiParam(name = "reportId", value = "报告id")
                                         @RequestParam(value = "reportId",required = true) String reportId)throws Exception{
        return success(ykyyEntranceService.vlisReportMasterDetail(reportId));
    }
    @GetMapping(value = "vpacsReportDetail")
    @ApiOperation(value = "检查信息明细")
    public ObjEnvelop vpacsReportDetail(@ApiParam(name = "reportId", value = "报告id")
                                             @RequestParam(value = "reportId",required = true) String reportId)throws Exception{
        return success(ykyyEntranceService.vpacsReportDetail(reportId));
    }
    @GetMapping(value = "vpacsReportList")
    @ApiOperation(value = "检查信息列表")
    public ListEnvelop vpacsReportList(@ApiParam(name = "patient", value = "居民id")
                                            @RequestParam(value = "patient",required = true) String patient,
                                            @ApiParam(name = "page", value = "第几页")
                                            @RequestParam(value = "page",required = false) Integer page,
                                            @ApiParam(name = "size", value = "页面大小")
                                            @RequestParam(value = "size",required = false) Integer size) throws Exception{
        if(page==null){
            page = 1;
        }
        if(size==null){
            size = 10;
        }
        return success(ykyyEntranceService.vpacsReportList(patient, page, size));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findOutpatientList)
    @ApiOperation(value = " 查询某个时间段的患者门诊就诊记录")
    public ListEnvelop findOutpatientList(@ApiParam(name = "patient", value = "居民id")

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/CreditsDetailController.java

@@ -274,7 +274,44 @@ public class CreditsDetailController extends EnvelopRestEndpoint {
                                                                 @ApiParam(name = "doctorId",value = "医生code")
                                                                     @RequestParam(value = "doctorId",required = false)String doctorId){
        try {
            return service.doctorDescreaseIntegrate(ruleId,patientId,doctorId,hospital,hospitalName,integrate,reason);
            return service.doctorDescreaseIntegrate(ruleId,patientId,doctorId,hospital,hospitalName,integrate,reason,null);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return MixEnvelop.getError(e.getMessage());
        }
    }
    /**
     * 医生手动加积分
     * @param ruleId
     * @param patientId
     * @param hospital
     * @param hospitalName
     * @param integrate
     * @param reason
     * @param doctorId
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.doctorIncreaseIntegrate)
    @ApiOperation(value = "医生手动加积分")
    public MixEnvelop<Boolean, Boolean> doctorIncreaseIntegrate(@ApiParam(name = "ruleId",value = "规则id")
                                                                 @RequestParam(value = "ruleId",required = false)String ruleId,
                                                                 @ApiParam(name = "patientId",value = "居民id")
                                                                 @RequestParam(value = "patientId",required = false)String patientId,
                                                                 @ApiParam(name = "hospital",value = "机构code")
                                                                 @RequestParam(value = "hospital",required = false)String hospital,
                                                                 @ApiParam(name = "hospitalName",value = "机构名称")
                                                                 @RequestParam(value = "hospitalName",required = false)String hospitalName,
                                                                 @ApiParam(name = "integrate",value = "增加的积分")
                                                                 @RequestParam(value = "integrate",required = false)Integer integrate,
                                                                 @ApiParam(name = "reason",value = "增加的原因")
                                                                 @RequestParam(value = "reason",required = false)String reason,
                                                                 @ApiParam(name = "doctorId",value = "医生code")
                                                                 @RequestParam(value = "doctorId",required = false)String doctorId){
        try {
            return service.doctorDescreaseIntegrate(ruleId,patientId,doctorId,hospital,hospitalName,integrate,reason,"add");
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java

@@ -988,7 +988,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
    }
    public MixEnvelop doctorDescreaseIntegrate(String ruleId,String patientId,String doctorId,String hospital,String hospitalName,Integer integrate,String reason) throws Exception {
    public MixEnvelop doctorDescreaseIntegrate(String ruleId,String patientId,String doctorId,String hospital,String hospitalName,Integer integrate,String reason,String type) throws Exception {
       MixEnvelop envelop = new MixEnvelop<>();
       envelop.setObj(true);
       TaskDO taskDO =  taskDao.selectByTaskRuleId(ruleId);
@@ -1023,13 +1023,14 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
           taskPatientDetailDO.setStatus(1);
           taskPatientDetailDao.save(taskPatientDetailDO);
       }
       if (accountDO.getTotal().compareTo(integrate)>=0){
       if("add".equals(type)){
           CreditsDetailDO creditsDetailDO = new CreditsDetailDO();
           creditsDetailDO.setAccountId(accountDO.getId());
           creditsDetailDO.setIdCard(accountDO.getIdCard());
           creditsDetailDO.setSaasId("dev");
           creditsDetailDO.setTradeType("ACTIVITY_TASK");
           creditsDetailDO.setTradeDirection(-1);
           creditsDetailDO.setTradeDirection(1);
           creditsDetailDO.setIntegrate(integrate);
           creditsDetailDO.setDescription(reason);
           creditsDetailDO.setStatus(1);
@@ -1041,11 +1042,33 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
           creditsDetailDO.setPatientId(patientId);
           creditsDetailDO.setHospitalName(hospitalName);
           credittsLogDetailDao.save(creditsDetailDO);
           accountDO.setTotal(accountDO.getTotal()-integrate);
           accountDO.setTotal(accountDO.getTotal()+integrate);
           accountDao.save(accountDO);
       }else {
           envelop.setMessage("积分不足！");
           throw new Exception("积分不足！");
       }else{
           if (accountDO.getTotal().compareTo(integrate)>=0){
               CreditsDetailDO creditsDetailDO = new CreditsDetailDO();
               creditsDetailDO.setAccountId(accountDO.getId());
               creditsDetailDO.setIdCard(accountDO.getIdCard());
               creditsDetailDO.setSaasId("dev");
               creditsDetailDO.setTradeType("ACTIVITY_TASK");
               creditsDetailDO.setTradeDirection(-1);
               creditsDetailDO.setIntegrate(integrate);
               creditsDetailDO.setDescription(reason);
               creditsDetailDO.setStatus(1);
               creditsDetailDO.setHospital(hospital);
               creditsDetailDO.setHospitalName(hospitalName);
               creditsDetailDO.setCreateTime(new Date());
               creditsDetailDO.setUpdateTime(new Date());
               creditsDetailDO.setTransactionId(taskDO.getId());
               creditsDetailDO.setPatientId(patientId);
               creditsDetailDO.setHospitalName(hospitalName);
               credittsLogDetailDao.save(creditsDetailDO);
               accountDO.setTotal(accountDO.getTotal()-integrate);
               accountDao.save(accountDO);
           }else {
               envelop.setMessage("积分不足！");
               throw new Exception("积分不足！");
           }
       }
       return envelop;
    }