job

business/base-service/src/main/java/com/yihu/jw/hospital/appointment/dao/SpecialDiseaseDao.java

@@ -0,0 +1,18 @@
package com.yihu.jw.hospital.appointment.dao;
import com.yihu.jw.entity.hospital.appointment.WlyyAppointmentDO;
import com.yihu.jw.entity.hospital.appointment.WlyySpecialDiseaseDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/11/4.
 */
public interface SpecialDiseaseDao extends PagingAndSortingRepository<WlyySpecialDiseaseDO, String>, JpaSpecificationExecutor<WlyySpecialDiseaseDO> {
    @Query("from WlyySpecialDiseaseDO a order by a.sort asc")
    List<WlyySpecialDiseaseDO> findAllOrderBySortASC();
}

business/base-service/src/main/java/com/yihu/jw/hospital/appointment/service/AppointmentService.java

@@ -88,6 +88,14 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
    public JSONArray getAppointmentList(String idcard,String doctor,String doctorName,String dept,String startDate,String endDate,String chargeType)throws Exception{
        logger.info("getAppointmentList :");
        if(StringUtils.isBlank(startDate)){
            throw new RuntimeException("startDate is not null");
        }
        if(StringUtils.isBlank(endDate)){
            throw new RuntimeException("endDate is not null");
        }
        String doctorMappingId = null;
        if(StringUtils.isNotBlank(doctor)){
            DoctorMappingDO doctorMappingDO = doctorMappingService.findMappingCode(doctor,"350211A1002");
@@ -132,10 +140,20 @@ public class AppointmentService extends BaseJpaService<WlyyAppointmentDO, WlyyAp
        net.sf.json.JSONObject res = registerService.BS10048(registerAmVO,demoFlag);
        logger.info(res.toString());
        if(res!=null){
            logger.info(res.toString());
            String code = res.getString("code");
            if(StringUtils.isNotBlank(code)&&"-1".equals(code)){
                wlyyAppointmentDO.setStatus(1);
            }else {
                wlyyAppointmentDO.setStatus(0);
            }
        }else{
            wlyyAppointmentDO.setStatus(0);
        }
        wlyyAppointmentDO.setCreateTime(new Date());
        wlyyAppointmentDO.setStatus(2);
        wlyyAppointmentDO.setType(1);
        wlyyAppointmentDO.setHttpLog(res.toString());
        wlyyAppointmentDao.save(wlyyAppointmentDO);

business/base-service/src/main/java/com/yihu/jw/hospital/appointment/service/SpecialDiseaseService.java

@@ -0,0 +1,25 @@
package com.yihu.jw.hospital.appointment.service;
import com.yihu.jw.entity.hospital.appointment.WlyySpecialDiseaseDO;
import com.yihu.jw.hospital.appointment.dao.SpecialDiseaseDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
 * Created by Trick on 2019/11/4.
 */
@Service
@Transactional
public class SpecialDiseaseService extends BaseJpaService<WlyySpecialDiseaseDO, SpecialDiseaseDao> {
    @Autowired
    private SpecialDiseaseDao specialDiseaseDao;
    public List<WlyySpecialDiseaseDO> findAllSpecialDisease(){
        return specialDiseaseDao.findAllOrderBySortASC();
    }
}

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

@@ -167,11 +167,8 @@ public class RegisterService {
            if(StringUtils.isNotBlank(unit_code)){
                sbs.append(" and unit_code = '"+unit_code+"' ");
            }
            if(StringUtils.isNotBlank(startDate)){
                sbs.append(" and request_day >= '"+startDate+"' ");
            }
            if(StringUtils.isNotBlank(endDate)){
                sbs.append(" and request_day <= '"+endDate+"' ");
            if(StringUtils.isNotBlank(startDate)&&StringUtils.isNotBlank(endDate)){
                sbs.append(" and (request_day between '"+startDate+"' and '"+endDate+"' )");
            }
            if(StringUtils.isNotBlank(reg_type)){
                sbs.append(" and reg_type = '"+reg_type+"' ");
@@ -179,8 +176,9 @@ public class RegisterService {
            sbs.append("</Msg>");
            sbs.append("<startNum>1</startNum></MsgInfo></ESBEntry>");
            resp = MqSdkUtil.putReqAndGetRespByQueryStr(sbs.toString(), fid);
            logger.info(fid+" xmlresp:"+resp);
            resp = MqSdkUtil.xml2jsonArrayRootRow(resp);
            //logger.info(fid+" resp:"+resp);
            logger.info(fid+" jsonresp:"+resp);
        }
        return ConvertUtil.convertListEnvelopInBodyRow(resp);
    }
@@ -241,7 +239,7 @@ public class RegisterService {
            sbs.append("<ESBEntry><AccessControl><Fid>" + fid + "</Fid><UserName>"+mqUser+"</UserName><Password>"+mqPwd+"</Password></AccessControl>");
            //MessageHeader ：固定值 消费方系统编号 S60,提供方系统编号 S01
            sbs.append("<MessageHeader><Fid>" + fid + "</Fid><MsgDate>" + DateUtil.dateToStr(new Date(), DateUtil.YYYY_MM_DD_HH_MM_SS) + "</MsgDate><SourceSysCode>"+sourceSysCode+"</SourceSysCode><TargetSysCode>"+targetSysCode+"</TargetSysCode></MessageHeader>");
            sbs.append("</Msg>");
            sbs.append("<Msg/>");
            //查询信息拼接
            sbs.append("<MsgInfo><endNum>20000</endNum>");
            sbs.append(" <query item=\"DeptCode\" value=\""+registerAmVO.getDept()+"\"/>");

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/appointment/WlyySpecialDiseaseDO.java

@@ -0,0 +1,42 @@
package com.yihu.jw.entity.hospital.appointment;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2019/11/4.
 */
@Entity
@Table(name = "wlyy_special_disease")
public class WlyySpecialDiseaseDO extends UuidIdentityEntity {
    private String name;
    private String code;
    private Integer sort;
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
}

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

@@ -30,6 +30,7 @@ public class BaseHospitalRequestMapping {
        public static final String makeAppointment = "/makeAppointment";
        public static final String cancelAppointment = "/cancelAppointment";
        public static final String getDoctorByMappingCode = "/getDoctorByMappingCode";
        public static final String findAllSpecialDisease = "/findAllSpecialDisease";
    }

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

@@ -1,6 +1,7 @@
package com.yihu.jw.hospital.endpoint.appointment;
import com.yihu.jw.hospital.appointment.service.AppointmentService;
import com.yihu.jw.hospital.appointment.service.SpecialDiseaseService;
import com.yihu.jw.restmodel.hospital.prescription.WlyyOutpatientVO;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -24,6 +25,8 @@ public class AppointmentEndPoint extends EnvelopRestEndpoint {
    @Autowired
    private AppointmentService appointmentService;
    @Autowired
    private SpecialDiseaseService specialDiseaseService;
    @GetMapping(value = BaseHospitalRequestMapping.Appointment.getDoctorSchedule)
    @ApiOperation(value = "获取医生号源")
@@ -96,4 +99,10 @@ public class AppointmentEndPoint extends EnvelopRestEndpoint {
                                        @RequestParam(value = "mappingCode",required = false) String mappingCode) throws Exception {
        return success(appointmentService.getDoctorByMappingCode(mappingCode));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Appointment.findAllSpecialDisease)
    @ApiOperation(value = "获取专病字典")
    public ListEnvelop findAllSpecialDisease() throws Exception {
        return success(specialDiseaseService.findAllSpecialDisease());
    }
}