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/consult/dao/HospitalWaitingRoomDao.java

@@ -4,8 +4,12 @@ import com.yihu.jw.entity.hospital.consult.WlyyHospitalWaitingRoomDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/5/23.
 */
public interface HospitalWaitingRoomDao extends PagingAndSortingRepository<WlyyHospitalWaitingRoomDO, String>, JpaSpecificationExecutor<WlyyHospitalWaitingRoomDO> {
    List<WlyyHospitalWaitingRoomDO> findByOutpatientId(String outpatientId);
}

business/base-service/src/main/java/com/yihu/jw/hospital/doctor/dao/PatientRegisterTimeDao.java

@@ -12,4 +12,5 @@ import java.util.List;
public interface PatientRegisterTimeDao extends PagingAndSortingRepository<WlyyPatientRegisterTimeDO, String>, JpaSpecificationExecutor<WlyyPatientRegisterTimeDO> {
    List<WlyyPatientRegisterTimeDO> findByDoctorAndWorkId(String doctor,String workId);
    List<WlyyPatientRegisterTimeDO> findByOutpatientId(String outpatientId);
}

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

@@ -82,7 +82,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    @Autowired
    private DoctorClinicRoomConsultDao doctorClinicRoomConsultDao;
    @Autowired
    private HospitalWaitingRoomDao HospitalWaitingRoomDao;
    private HospitalWaitingRoomDao hospitalWaitingRoomDao;
    @Autowired
    private DictHospitalDeptDao dictHospitalDeptDao;
    @Autowired
@@ -534,7 +534,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        waitingRoom.setOutpatientId(outpatientDO.getId());
        waitingRoom.setCreateTime(new Date());
        HospitalWaitingRoomDao.save(waitingRoom);
        hospitalWaitingRoomDao.save(waitingRoom);
        return true;
    }
@@ -625,7 +625,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            for(int i=0;i<rs.size();i++){
                String id = rs.get(i).getCode();
                if(dept.equals(id)){
                    Collections.swap(list,0,i);
                    Collections.swap(rs,0,i);
                }
            }
        }
@@ -638,7 +638,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @param dept
     * @return
     */
    public List<Map<String,Object>> findDoctorByHospitalAndDept(String orgCode,String chargeType,String dept,String doctorCode){
    public List<Map<String,Object>> findDoctorByHospitalAndDept(String orgCode,String dept,String chargeType,String doctorCode){
        String sql ="SELECT " +
                " d.id, " +
                " d.photo, " +
@@ -1357,4 +1357,56 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return rs.size();
    }
    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());
        return rs;
    }
    public Map<String,Object> cancelOutPatient(String outPatientId,String cancelType,String cancelValue,String cancelRemark){
        Map<String,Object> rs = new HashedMap();
        //判断医生是否接诊
        List<WlyyHospitalWaitingRoomDO> roomDOs =hospitalWaitingRoomDao.findByOutpatientId(outPatientId);
        if(roomDOs!=null&&roomDOs.size()>0){
            for(WlyyHospitalWaitingRoomDO roomDO:roomDOs){
                if(roomDO.getVisitStatus()==2){
                    rs.put("code",-1);
                    rs.put("mes","医生已经接诊，无法取消");
                    return rs;
                }else{
                    roomDO.setVisitStatus(-1);
                    hospitalWaitingRoomDao.save(roomDO);
                }
            }
        }
        //更改门诊状态
        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(outPatientId);
        wlyyOutpatientDO.setStatus("-1");
        wlyyOutpatientDO.setPatientCancelRemark(cancelRemark);
        wlyyOutpatientDO.setPatientCancelType(cancelType);
        wlyyOutpatientDO.setPatientCancelValue(cancelValue);
        outpatientDao.save(wlyyOutpatientDO);
        //删除门诊号源
        List<WlyyPatientRegisterTimeDO> list = patientRegisterTimeDao.findByOutpatientId(wlyyOutpatientDO.getId());
        patientRegisterTimeDao.delete(list);
        rs.put("code",1);
        rs.put("mes","取消成功");
        return  rs;
    }
    public List<WlyyHospitalSysDictDO> findCancelReasonList(){
        return sysDictDao.findByDictName("PatientCancel");
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/consult/WlyyHospitalWaitingRoomDO.java

@@ -65,7 +65,7 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntity {
    private String doctorName;
    /**
	 * 0离线 1在线(候诊) 2已诊
	 * -1取消,0离线 1在线(候诊) 2已诊
	 */
	private Integer visitStatus;

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientDO.java

@@ -155,6 +155,20 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date conDate;
    /**
     * 患者取消类型
     */
    private String patientCancelType;
    /**
     * 患者取消类型名称
     */
    private String patientCancelValue;
    /**
     * 患者取消类型详细说明
     */
    private String patientCancelRemark;
    /**
	 * -1 取消；0 候诊中 ；1 就诊中 ；2 已诊
	 */
@@ -395,4 +409,31 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    public void setConNo(String conNo) {
        this.conNo = conNo;
    }
    @Column(name="patient_cancel_type")
    public String getPatientCancelType() {
        return patientCancelType;
    }
    public void setPatientCancelType(String patientCancelType) {
        this.patientCancelType = patientCancelType;
    }
    @Column(name="patient_cancel_value")
    public String getPatientCancelValue() {
        return patientCancelValue;
    }
    public void setPatientCancelValue(String patientCancelValue) {
        this.patientCancelValue = patientCancelValue;
    }
    @Column(name="patient_cancel_remark")
    public String getPatientCancelRemark() {
        return patientCancelRemark;
    }
    public void setPatientCancelRemark(String patientCancelRemark) {
        this.patientCancelRemark = patientCancelRemark;
    }
}

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

@@ -138,6 +138,21 @@ public class BaseHospitalRequestMapping {
         * 获取具体号源
         */
        public static final String findWorkTimeInfo="/findWorkTimeInfo";
        /**
         * 获取获取医生信息
         */
        public static final String findDoctorInfo="/findDoctorInfo";
        /**
         * 取消门诊
         */
        public static final String cancelOutPatient="/cancelOutPatient";
        /**
         * 居民取消原因字典
         */
        public static final String findCancelReasonList="/findCancelReasonList";
        //=================end=======================================
        /**

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

@@ -183,12 +183,12 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop findDeptByHospital(@ApiParam(name = "orgCode", value = "机构code")
                                          @RequestParam(value = "orgCode", required = true)String orgCode,
                                          @ApiParam(name = "dept", value = "需要置顶部门")
                                          @RequestParam(value = "dept", required = true)String dept) {
                                          @RequestParam(value = "dept", required = false)String dept) {
        return success(prescriptionService.findDeptByHospital(orgCode,dept));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorByHospitalAndDept)
    @ApiOperation(value = "查询部门下医生", notes = "查询机构底下部门")
    @ApiOperation(value = "查询部门下医生", notes = "查询部门下医生")
    public ListEnvelop findDoctorByHospitalAndDept(@ApiParam(name = "orgCode", value = "机构code")
                                                   @RequestParam(value = "orgCode", required = true)String orgCode,
                                                   @ApiParam(name = "dept", value = "部门code")
@@ -196,7 +196,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                                   @ApiParam(name = "chargeType", value = "号别")
                                                   @RequestParam(value = "chargeType", required = false)String chargeType,
                                                   @ApiParam(name = "doctorCode", value = "需要置顶医生")
                                                   @RequestParam(value = "doctorCode", required = true)String doctorCode) {
                                                   @RequestParam(value = "doctorCode", required = false)String doctorCode) {
        return success(prescriptionService.findDoctorByHospitalAndDept(orgCode,dept,chargeType,doctorCode));
    }
@@ -347,6 +347,34 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                        @RequestParam(value = "id", required = false)String id) {
        return success(prescriptionService.findWorkTimeInfo(id));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findDoctorInfo)
    @ApiOperation(value = "获取医生信息", notes = "获取医生信息")
    public ObjEnvelop findDoctorInfo(@ApiParam(name = "doctor", value = "医生code")
                                     @RequestParam(value = "doctor", required = false)String doctor){
        return success(prescriptionService.findDoctorInfo(doctor));
    }
    @PostMapping(value = BaseHospitalRequestMapping.Prescription.cancelOutPatient)
    @ApiOperation(value = "取消复诊", notes = "取消复诊")
    public ObjEnvelop cancelOutPatient(@ApiParam(name = "outPatientId", value = "门诊记录")
                                       @RequestParam(value = "outPatientId", required = false)String outPatientId,
                                       @ApiParam(name = "cancelType", value = "取消原因类型")
                                       @RequestParam(value = "cancelType", required = false)String cancelType,
                                       @ApiParam(name = "cancelValue", value = "取消原因名称")
                                       @RequestParam(value = "cancelValue", required = false)String cancelValue,
                                       @ApiParam(name = "cancelRemark", value = "取消原因详细说明")
                                       @RequestParam(value = "cancelRemark", required = false)String cancelRemark) {
        return success(prescriptionService.cancelOutPatient(outPatientId,cancelType,cancelValue,cancelRemark));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findCancelReasonList)
    @ApiOperation(value = "获取居民取消原因字典", notes = "获取居民取消原因字典")
    public ListEnvelop findCancelReasonList(){
        return success(prescriptionService.findCancelReasonList());
    }
    //===========