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

@@ -0,0 +1,16 @@
package com.yihu.jw.hospital.consult.dao;
import com.yihu.jw.entity.hospital.consult.WlyyDoctorClinicRoomDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
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 DoctorClinicRoomConsultDao extends PagingAndSortingRepository<WlyyDoctorClinicRoomDO, String>, JpaSpecificationExecutor<WlyyDoctorClinicRoomDO> {
    List<WlyyDoctorClinicRoomDO> findByDoctorAndStatus(String doctor,Integer status);
}

business/base-service/src/main/java/com/yihu/jw/hospital/consult/dao/HospitalWaitingRoomDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.hospital.consult.dao;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalWaitingRoomDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/23.
 */
public interface HospitalWaitingRoomDao extends PagingAndSortingRepository<WlyyHospitalWaitingRoomDO, String>, JpaSpecificationExecutor<WlyyHospitalWaitingRoomDO> {
}

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

@@ -2,11 +2,16 @@ package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
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/5/17.
 */
public interface PrescriptionDao extends PagingAndSortingRepository<WlyyPrescriptionDO, String>, JpaSpecificationExecutor<WlyyPrescriptionDO> {
    @Query("select a from WlyyPrescriptionDO a where a.patientCode = ?1 and a.status >= 0 ")
    List<WlyyPrescriptionDO> findByPatientCode(String patientCode);
}

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

@@ -4,8 +4,12 @@ import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDiagnosisDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionDiagnosisDao extends PagingAndSortingRepository<WlyyPrescriptionDiagnosisDO, String>, JpaSpecificationExecutor<WlyyPrescriptionDiagnosisDO> {
    List<WlyyPrescriptionDiagnosisDO> findByPrescriptionId(String prescriptionId);
}

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

@@ -4,8 +4,12 @@ import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionExpressageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionExpressageDao extends PagingAndSortingRepository<WlyyPrescriptionExpressageDO, String>, JpaSpecificationExecutor<WlyyPrescriptionExpressageDO> {
    List<WlyyPrescriptionExpressageDO> findByPrescriptionId(String prescriptionId);
}

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

@@ -1,7 +1,11 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionExpressageLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2019/5/17.
 */
public interface PrescriptionExpressageLogDao {
public interface PrescriptionExpressageLogDao extends PagingAndSortingRepository<WlyyPrescriptionExpressageLogDO, String>, JpaSpecificationExecutor<WlyyPrescriptionExpressageLogDO> {
}

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

@@ -1,11 +1,18 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionInfoDO;
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/5/17.
 */
public interface PrescriptionInfoDao extends PagingAndSortingRepository<WlyyPrescriptionInfoDO, String>, JpaSpecificationExecutor<WlyyPrescriptionInfoDO> {
    List<WlyyPrescriptionInfoDO> findByPrescriptionId(String prescriptionId);
}

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

@@ -1,7 +1,324 @@
package com.yihu.jw.hospital.prescription.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.entity.hospital.consult.WlyyDoctorClinicRoomDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalWaitingRoomDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDiagnosisDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionExpressageDO;
import com.yihu.jw.hospital.consult.dao.DoctorClinicRoomConsultDao;
import com.yihu.jw.hospital.consult.dao.HospitalWaitingRoomDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionDiagnosisDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionExpressageDao;
import com.yihu.jw.hospital.prescription.dao.PrescriptionInfoDao;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.dao.BasePatientMedicareCardDao;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionDiagnosisVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionExpressageVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.*;
/**
 * Created by Trick on 2019/5/17.
 */
public class PrescriptionService {
@Service
public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, PrescriptionDao> {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private BaseDoctorDao baseDoctorDao;
    @Autowired
    private BasePatientDao basePatientDao;
    @Autowired
    private BasePatientMedicareCardDao basePatientMedicareCardDao;
    @Autowired
    private PrescriptionDao prescriptionDao;
    @Autowired
    private PrescriptionDiagnosisDao prescriptionDiagnosisDao;
    @Autowired
    private PrescriptionExpressageDao prescriptionExpressageDao;
    @Autowired
    private PrescriptionInfoDao prescriptionInfoDao;
    @Autowired
    private DoctorClinicRoomConsultDao doctorClinicRoomConsultDao;
    @Autowired
    private HospitalWaitingRoomDao HospitalWaitingRoomDao;
    @Autowired
    private DictHospitalDeptDao dictHospitalDeptDao;
    @Autowired
    private BaseOrgDao baseOrgDao;
    public MixEnvelop findPrescriptionList(String patient, String status,String startTime, String endTime, Integer page, Integer size){
        String totalSql ="SELECT " +
                " count(1) AS total " +
                " FROM " +
                " wlyy_prescription p ";
        totalSql += " WHERE 1=1 ";
        if(StringUtils.isNotBlank(patient)){
            totalSql+=" AND p.patient ='"+patient+"'";
        }
        if(StringUtils.isNotBlank(status)){
            totalSql+=" AND p.status IN ("+status+")";
        }
        if(StringUtils.isNotBlank(startTime)){
            totalSql += " AND create_time >='"+startTime+" 00:00:00'";
        }
        if(StringUtils.isNotBlank(endTime)){
            totalSql += " AND create_time <='"+endTime+" 23:59:59'";
        }
        List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(totalSql);
        Long count = 0L;
        if (rstotal != null && rstotal.size() > 0) {
            count = (Long) rstotal.get(0).get("total");
        }
        String sql ="SELECT " +
                " p.id, " +
                " p.saas_id AS saasId, " +
                " p.recipe_no AS recipeNo, " +
                " p.visit_no AS visitNo, " +
                " p.type AS type, " +
                " p.patient_code AS patientCode, " +
                " p.patient_name AS patientName, " +
                " p.ssc AS ssc, " +
                " p.doctor AS doctor, " +
                " p.doctor_name AS doctorName, " +
                " p.`status` AS `status`, " +
                " p.mk_fail_reason AS mkFailReason, " +
                " p.mk_time AS mk_time, " +
                " p.prescribe_reason AS prescribeReason, " +
                " p.prescribe_time AS prescribeTime, " +
                " p.pay_time AS payTime, " +
                " p.dosage_time AS dosageTime, " +
                " p.finish_time AS finishTime, " +
                " p.create_time AS createTime, " +
                " p.dept AS dept, " +
                " p.dept_name AS deptName, " +
                " p.hospital AS hospital, " +
                " p.hospital_name AS hospitalName, " +
                " p.consult AS consult, " +
                " p.dispensary_type AS dispensaryType, " +
                " p.reason AS reason, " +
                " p.remark AS remark, " +
                " p.cancel_reason AS cancelReason, " +
                " p.ca_cert_data AS caCertData, " +
                " p.ca_message AS caMessage, " +
                " p.digital_sign_no AS digitalSignNo, " +
                " p.original_data_abstract AS originalDataAbstract, " +
                " p.str_original_data AS strOriginalData, " +
                " p.his_dept_code AS hisDeptCode, " +
                " p.his_doctor_code AS hisDoctorCode, " +
                " p.his_gister_type_code AS hisGisterTypeCode, " +
                " p.his_rate_type_code AS hisRateTypeCode, " +
                " p.his_hospital AS hisHospital, " +
                " p.his_register_fee AS hisRegisterFee, " +
                " p.pay_status AS payStatus " +
                " FROM " +
                " wlyy_prescription p " +
                " WHERE 1=1 ";
        if(StringUtils.isNotBlank(patient)){
            sql+=" AND p.patient ='"+patient+"'";
        }
        if(StringUtils.isNotBlank(status)){
            sql+=" AND p.status IN ("+status+")";
        }
        if(StringUtils.isNotBlank(startTime)){
            sql += " AND create_time >='"+startTime+" 00:00:00'";
        }
        if(StringUtils.isNotBlank(endTime)){
            sql += " AND create_time <='"+endTime+" 23:59:59'";
        }
        sql += " LIMIT " + (page - 1) * size + "," + size + "";
        List<WlyyPrescriptionVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WlyyPrescriptionVO.class));
        //设置病种
        if(list!=null&&list.size()>0){
            for(WlyyPrescriptionVO vo:list){
                vo.setDiagnosisVOs(findDiagnosisById(vo.getId()));
            }
        }
        return MixEnvelop.getSuccessListWithPage(BaseHospitalRequestMapping.Prescription.api_success, list, page, size, count);
    }
    public List<WlyyPrescriptionDiagnosisVO> findDiagnosisById(String id){
        List<WlyyPrescriptionDiagnosisDO> list = prescriptionDiagnosisDao.findByPrescriptionId(id);
        List<WlyyPrescriptionDiagnosisVO> rs = new ArrayList<>();
        if(list!=null&&list.size()>0){
            return convertToModels(list,rs,WlyyPrescriptionDiagnosisVO.class);
        }
        return rs;
    }
    public Map<String,Object> findPrescriptionInfo(String prescriptionId){
        //续方信息
        Map<String,Object> rs = new HashedMap();
        WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findOne(prescriptionId);
        rs.put("prescription",convertToModel(wlyyPrescriptionDO,WlyyPrescriptionVO.class));
        //居民详情
        BasePatientDO basePatientDO = basePatientDao.findById(wlyyPrescriptionDO.getPatientCode());
        rs.put("patientName",basePatientDO.getName());
        rs.put("patientId",basePatientDO.getId());
        rs.put("idCard",basePatientDO.getIdcard());
        rs.put("sex", basePatientDO.getSex());
        PatientMedicareCardDO cardDO = basePatientMedicareCardDao.findByTypeAndPatientCodeAndDel(PatientMedicareCardDO.Type.MedicareCard.getType(),wlyyPrescriptionDO.getPatientCode(),"1");
        rs.put("ssc",cardDO);
        rs.put("age",IdCardUtil.getAgeForIdcard(basePatientDO.getIdcard()));
        //物流信息
        List<WlyyPrescriptionExpressageDO> expressageDOs = prescriptionExpressageDao.findByPrescriptionId(wlyyPrescriptionDO.getId());
        if(expressageDOs!=null&&expressageDOs.size()>0){
            rs.put("expressage",convertToModel(expressageDOs.get(0), WlyyPrescriptionExpressageVO.class));
        }else{
            rs.put("expressage",null);
        }
        //诊断信息
        rs.put("diagnosis",findDiagnosisById(wlyyPrescriptionDO.getId()));
        //药品信息
        rs.put("infos",prescriptionInfoDao.findByPrescriptionId(wlyyPrescriptionDO.getId()));
        return rs;
    }
    public Boolean checkPrescription(String patient){
        List<WlyyPrescriptionDO> list = prescriptionDao.findByPatientCode(patient);
        if(list!=null&&list.size()>0){
            return false;
        }
        return true;
    }
    /**
     * 预约
     * @param json
     * @return
     */
    public Boolean appointmentRevisit(JSONObject json){
        //1.创建支付
        //2.支付回调
        paymentCallback(json);
        return true;
    }
    /**
     *
     * @param json
     * @return
     */
    public String paymentCallback(JSONObject json){
        //创建诊室
        createRoom(json);
        return null;
    }
    public Boolean createPrescription(JSONObject json){
        String patient = json.getString("patient");
        String doctor = json.getString("doctor");
        String dept = json.getString("dept");
        String hospital = json.getString("hospital");
        String reservationTime = json.getString("reservationTime");
        Integer consultType = json.getInteger("consultType");
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        PatientMedicareCardDO cardDO = basePatientMedicareCardDao.findByTypeAndPatientCodeAndDel(PatientMedicareCardDO.Type.MedicareCard.getType(),patient,"1");
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findOne(doctor);
        WlyyPrescriptionDO prescription = new WlyyPrescriptionDO();
        prescription.setStatus(0);
        prescription.setPatientCode(patient);
        prescription.setPatientName(basePatientDO.getName());
        prescription.setSsc(cardDO.getCode());
        prescription.setDoctor(doctor);
        prescription.setDoctorName(baseDoctorDO.getName());
        return true;
    }
    public Boolean createRoom(JSONObject json){
        String patient = json.getString("patient");
        String doctor = json.getString("doctor");
        String dept = json.getString("dept");
        String hospital = json.getString("hospital");
        String reservationTime = json.getString("reservationTime");
        Integer consultType = json.getInteger("consultType");
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findOne(doctor);
        List<WlyyDoctorClinicRoomDO> list = doctorClinicRoomConsultDao.findByDoctorAndStatus(doctor,1);
        if(list!=null&&list.size()>0){
            //已经有诊室不做操作
        }else{
            //未有诊室则新增
            WlyyDoctorClinicRoomDO room = new WlyyDoctorClinicRoomDO();
            room.setDoctor(doctor);
            room.setDoctorName(baseDoctorDO.getName());
            room.setClinicName(baseDoctorDO.getName());
            DictHospitalDeptDO deptDO = dictHospitalDeptDao.findByCode(dept);
            room.setDept(dept);
            room.setDept(deptDO.getName());
            BaseOrgDO baseOrgDO = baseOrgDao.findByCode(hospital);
            room.setDept(hospital);
            room.setDept(baseOrgDO.getName());
            room.setClinicStatus(-1);
            room.setDate(new Date());
            room.setStatus(1);
            doctorClinicRoomConsultDao.save(room);
        }
        WlyyHospitalWaitingRoomDO waitingRoom = new WlyyHospitalWaitingRoomDO();
        waitingRoom.setConsultType(1);
        waitingRoom.setPatientId(patient);
        waitingRoom.setPatientName(basePatientDO.getName());
        waitingRoom.setReservationTime(DateUtil.strToDate(reservationTime));
        waitingRoom.setVisitStatus(0);
        waitingRoom.setReservationType(1);
        waitingRoom.setSort(0);
        waitingRoom.setConsultType(consultType);
        HospitalWaitingRoomDao.save(waitingRoom);
        return true;
    }
}

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

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.consult;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_doctor_clinic_room")
public class WlyyDoctorClinicRoomDO extends UuidIdentityEntityWithOperator {
public class WlyyDoctorClinicRoomDO extends UuidIdentityEntity {
    /**
	 * 

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

@@ -51,6 +51,12 @@ public class WlyyHospitalConsultPriceDO extends UuidIdentityEntityWithOperator {
	 */
	private Integer price;
    /**
     * 医院编码
     */
    private String hospital
            ;
	@Column(name = "saas_id")
    public String getSaasId() {
@@ -108,6 +114,11 @@ public class WlyyHospitalConsultPriceDO extends UuidIdentityEntityWithOperator {
        this.price = price;
    }
    @Column(name = "hospital")
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
}

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

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.consult;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_hospital_waiting_room")
public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntityWithOperator {
public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntity {
    /**
	 * 
@@ -62,7 +63,7 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntityWithOperator {
    /**
	 * 咨询类型: 1图文 2视频 3图文+视频
	 */
	private Integer consultTpye;
	private Integer consultType;
	@Column(name = "saas_id")
@@ -129,12 +130,12 @@ public class WlyyHospitalWaitingRoomDO extends UuidIdentityEntityWithOperator {
        this.reservationType = reservationType;
    }
	@Column(name = "consult_tpye")
    public Integer getConsultTpye() {
        return consultTpye;
	@Column(name = "consult_type")
    public Integer getConsultType() {
        return consultType;
    }
    public void setConsultTpye(Integer consultTpye) {
        this.consultTpye = consultTpye;
    public void setConsultType(Integer consultType) {
        this.consultType = consultType;
    }

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

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,54 +17,31 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_diagnosis")
public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntity {
    /**
	 * 
	 */
	private String saasId;
     * 关联处方
     */
    private String prescriptionId;
    /**
	 * 关联处方
	 */
	private String prescriptionId;
     * 诊断结果名称
     */
    private String name;
    /**
	 * 诊断结果名称
	 */
	private String name;
     * 1主诊断 2次诊断
     */
    private Integer type;
    /**
	 * 健康问题名称
	 */
	private String healthProblemName;
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date createTime;
    /**
	 * 健康问题编码
	 */
	private String healthProblem;
    /**
	 * 1主诊断 2次诊断
	 */
	private Integer type;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "prescription_id")
    @Column(name = "prescription_id")
    public String getPrescriptionId() {
        return prescriptionId;
    }
@@ -71,7 +49,7 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntityWithOperator
        this.prescriptionId = prescriptionId;
    }
	@Column(name = "name")
    @Column(name = "name")
    public String getName() {
        return name;
    }
@@ -79,23 +57,7 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntityWithOperator
        this.name = name;
    }
	@Column(name = "health_problem_name")
    public String getHealthProblemName() {
        return healthProblemName;
    }
    public void setHealthProblemName(String healthProblemName) {
        this.healthProblemName = healthProblemName;
    }
	@Column(name = "health_problem")
    public String getHealthProblem() {
        return healthProblem;
    }
    public void setHealthProblem(String healthProblem) {
        this.healthProblem = healthProblem;
    }
	@Column(name = "type")
    @Column(name = "type")
    public Integer getType() {
        return type;
    }
@@ -103,14 +65,11 @@ public class WlyyPrescriptionDiagnosisDO extends UuidIdentityEntityWithOperator
        this.type = type;
    }
	@Column(name = "create_time")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

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

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_expressage")
public class WlyyPrescriptionExpressageDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionExpressageDO extends UuidIdentityEntity {
    /**
	 * 
@@ -134,119 +135,12 @@ public class WlyyPrescriptionExpressageDO extends UuidIdentityEntityWithOperator
	 */
	private String remark;
    /**
	 * 配送机构地址
	 */
	private String expressageHospitalAddress;
    /**
	 * 配送机构code
	 */
	private String expressageHospitalCode;
    /**
	 * 如果配送方式是健管师那么这个字段存服务站名称，如果是快递配送那么是快递公司名称
	 */
	private String expressageHospitalName;
    /**
	 * 配送人名称
	 */
	private String expressageName;
    /**
	 * 配送人code
	 */
	private String expressageCode;
    /**
	 * 开始配送时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date expressageTime;
    /**
	 * 配送人电话
	 */
	private String expressageMobile;
    /**
	 * 1可用 0删除
	 */
	private Integer del;
    /**
	 * 接收人电话
	 */
	private String acceptMobile;
    /**
	 * 接收人code
	 */
	private String acceptCode;
    /**
	 * 接收人名称
	 */
	private String acceptName;
    /**
	 * 接收人所属的机构code
	 */
	private String acceptHospital;
    /**
	 * 接收人所属机构名称
	 */
	private String acceptHospitalName;
    /**
	 * 接受时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date acceptTime;
    /**
	 * 患者填写的需要送达的机构地址
	 */
	private String patientHospitalAddress;
    /**
	 * 患者填写的需要送达的机构名称
	 */
	private String patientHospitalName;
    /**
	 * 患者填写的需要送达的机构code
	 */
	private String patientHospitalCode;
    /**
	 * 接收机构地址
	 */
	private String acceptHospitalAddress;
    /**
	 * 配药机构出药人（健管师或者称工作人员）
	 */
	private String hospitalDoctor;
    /**
	 * 配药机构出药人code
	 */
	private String hospitalDoctorCode;
    /**
	 * 配药机构出药时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date fetchingMedicineTime;
    /**
	 * 
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date deliveryTime;
	@Column(name = "saas_id")
@@ -433,182 +327,12 @@ public class WlyyPrescriptionExpressageDO extends UuidIdentityEntityWithOperator
        this.remark = remark;
    }
	@Column(name = "expressage_hospital_address")
    public String getExpressageHospitalAddress() {
        return expressageHospitalAddress;
    }
    public void setExpressageHospitalAddress(String expressageHospitalAddress) {
        this.expressageHospitalAddress = expressageHospitalAddress;
    }
	@Column(name = "expressage_hospital_code")
    public String getExpressageHospitalCode() {
        return expressageHospitalCode;
    }
    public void setExpressageHospitalCode(String expressageHospitalCode) {
        this.expressageHospitalCode = expressageHospitalCode;
    }
	@Column(name = "expressage_hospital_name")
    public String getExpressageHospitalName() {
        return expressageHospitalName;
    }
    public void setExpressageHospitalName(String expressageHospitalName) {
        this.expressageHospitalName = expressageHospitalName;
    }
	@Column(name = "expressage_name")
    public String getExpressageName() {
        return expressageName;
    }
    public void setExpressageName(String expressageName) {
        this.expressageName = expressageName;
    }
	@Column(name = "expressage_code")
    public String getExpressageCode() {
        return expressageCode;
    }
    public void setExpressageCode(String expressageCode) {
        this.expressageCode = expressageCode;
    }
	@Column(name = "expressage_time")
    public Date getExpressageTime() {
        return expressageTime;
    }
    public void setExpressageTime(Date expressageTime) {
        this.expressageTime = expressageTime;
    }
	@Column(name = "expressage_mobile")
    public String getExpressageMobile() {
        return expressageMobile;
    }
    public void setExpressageMobile(String expressageMobile) {
        this.expressageMobile = expressageMobile;
    }
	@Column(name = "del")
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
	@Column(name = "accept_mobile")
    public String getAcceptMobile() {
        return acceptMobile;
    }
    public void setAcceptMobile(String acceptMobile) {
        this.acceptMobile = acceptMobile;
    }
	@Column(name = "accept_code")
    public String getAcceptCode() {
        return acceptCode;
    }
    public void setAcceptCode(String acceptCode) {
        this.acceptCode = acceptCode;
    }
	@Column(name = "accept_name")
    public String getAcceptName() {
        return acceptName;
    }
    public void setAcceptName(String acceptName) {
        this.acceptName = acceptName;
    }
	@Column(name = "accept_hospital")
    public String getAcceptHospital() {
        return acceptHospital;
    }
    public void setAcceptHospital(String acceptHospital) {
        this.acceptHospital = acceptHospital;
    }
	@Column(name = "accept_hospital_name")
    public String getAcceptHospitalName() {
        return acceptHospitalName;
    }
    public void setAcceptHospitalName(String acceptHospitalName) {
        this.acceptHospitalName = acceptHospitalName;
    }
	@Column(name = "accept_time")
    public Date getAcceptTime() {
        return acceptTime;
    }
    public void setAcceptTime(Date acceptTime) {
        this.acceptTime = acceptTime;
    }
	@Column(name = "patient_hospital_address")
    public String getPatientHospitalAddress() {
        return patientHospitalAddress;
    }
    public void setPatientHospitalAddress(String patientHospitalAddress) {
        this.patientHospitalAddress = patientHospitalAddress;
    }
	@Column(name = "patient_hospital_name")
    public String getPatientHospitalName() {
        return patientHospitalName;
    }
    public void setPatientHospitalName(String patientHospitalName) {
        this.patientHospitalName = patientHospitalName;
    }
	@Column(name = "patient_hospital_code")
    public String getPatientHospitalCode() {
        return patientHospitalCode;
    }
    public void setPatientHospitalCode(String patientHospitalCode) {
        this.patientHospitalCode = patientHospitalCode;
    }
	@Column(name = "accept_hospital_address")
    public String getAcceptHospitalAddress() {
        return acceptHospitalAddress;
    }
    public void setAcceptHospitalAddress(String acceptHospitalAddress) {
        this.acceptHospitalAddress = acceptHospitalAddress;
    }
	@Column(name = "hospital_doctor")
    public String getHospitalDoctor() {
        return hospitalDoctor;
    }
    public void setHospitalDoctor(String hospitalDoctor) {
        this.hospitalDoctor = hospitalDoctor;
    }
	@Column(name = "hospital_doctor_code")
    public String getHospitalDoctorCode() {
        return hospitalDoctorCode;
    }
    public void setHospitalDoctorCode(String hospitalDoctorCode) {
        this.hospitalDoctorCode = hospitalDoctorCode;
    }
	@Column(name = "fetching_medicine_time")
    public Date getFetchingMedicineTime() {
        return fetchingMedicineTime;
    }
    public void setFetchingMedicineTime(Date fetchingMedicineTime) {
        this.fetchingMedicineTime = fetchingMedicineTime;
    }
	@Column(name = "delivery_time")
    public Date getDeliveryTime() {
        return deliveryTime;
    }
    public void setDeliveryTime(Date deliveryTime) {
        this.deliveryTime = deliveryTime;
    }
}

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

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_expressage_log")
public class WlyyPrescriptionExpressageLogDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionExpressageLogDO extends UuidIdentityEntity {
    /**
	 * 

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

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.prescription;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -14,183 +15,70 @@ import javax.persistence.Table;
*/
@Entity
@Table(name = "wlyy_prescription_info")
public class WlyyPrescriptionInfoDO extends UuidIdentityEntityWithOperator {
    /**
	 * 
	 */
	private String saasId;
    /**
	 * 处方code 关联表wlyy_prescription code
	 */
	private String prescriptionId;
    /**
	 * 药品code
	 */
	private String drugCode;
public class WlyyPrescriptionInfoDO extends UuidIdentityEntity {
    /**
	 * 药品名称
	 */
	private String drugName;
     * 处方code 关联表wlyy_prescription code
     */
    private String prescriptionId;
    /**
	 * 科目类别编码
	 */
	private String subjectClass;
     * 药品编号
     */
    private String drugNo;
    /**
	 * 吃药频率
	 */
	private String drugRate;
     * 药品名称
     */
    private String drugName;
    /**
	 * 药品规格
	 */
	private String drugFormat;
     * 库房号
     */
    private String dispDeposite;
    /**
	 * 药品数目
	 */
	private Integer num;
     * 药量
     */
    private String dosage;
    /**
	 * 是否冷藏 1是 0否
	 */
	private Integer isRefrigerate;
     *数量
     */
    private String quantity;
    /**
	 * 药品用法
	 */
	private String direction;
     *单位
     */
    private String unit;
    /**
	 * 药品价格 单位是分
	 */
	private Integer price;
     * 频率
     */
    private String usage;
    /**
	 * 用药频次名称
	 */
	private String drugRateName;
     * 用法
     */
    private String supplyCode;
    /**
	 * 备注
	 */
	private String remark;
     * 天数
     */
    private String days;
    /**
	 * 皮试类型名称
	 */
	private String physicSkinTestName;
     * 组号
     */
    private String frequency;
    /**
	 * 注射地点名称
	 */
	private String physicSkinTest;
     * 1可用 0删除
     */
    private Integer del;
    /**
	 * 注射地点名称
	 */
	private String physicInjectPlaceName;
    /**
	 * 注射地点编码
	 */
	private String physicInjectPlace;
    /**
	 * 总量单位名称
	 */
	private String physicAmountUnitName;
    /**
	 * 总量单位编码
	 */
	private String physicAmountUnit;
    /**
	 * 用药总量
	 */
	private String physicAmount;
    /**
	 * 剂量单位名称
	 */
	private String physicDoseUnitName;
    /**
	 * 剂量单位编码
	 */
	private String physicDoseUnit;
    /**
	 * 用药剂量
	 */
	private String physicDose;
    /**
	 * 用药方法名称
	 */
	private String usageName;
    /**
	 * 
	 */
	private String drugUsage;
    /**
	 * 用药天数
	 */
	private Integer dayCount;
    /**
	 * 成组标志, 0.非成组,1.成组
	 */
	private String bindFlag;
    /**
	 * 自付
	 */
	private Integer charge;
    /**
	 * 金额
	 */
	private Integer cost;
    /**
	 * 数量单位名称
	 */
	private String drugNumUnitName;
    /**
	 * 数量单位编码
	 */
	private String drugNumUnit;
    /**
	 * HIS子处方号
	 */
	private String jwSubCode;
    /**
	 * 1可用 0删除
	 */
	private Integer del;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "prescription_id")
    @Column(name = "prescription_id")
    public String getPrescriptionId() {
        return prescriptionId;
    }
@@ -198,15 +86,15 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntityWithOperator {
        this.prescriptionId = prescriptionId;
    }
	@Column(name = "drug_code")
    public String getDrugCode() {
        return drugCode;
    @Column(name = "drug_no")
    public String getDrugNo() {
        return drugNo;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    public void setDrugNo(String drugNo) {
        this.drugNo = drugNo;
    }
	@Column(name = "drug_name")
    @Column(name = "drug_name")
    public String getDrugName() {
        return drugName;
    }
@@ -214,231 +102,71 @@ public class WlyyPrescriptionInfoDO extends UuidIdentityEntityWithOperator {
        this.drugName = drugName;
    }
	@Column(name = "subject_class")
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
	@Column(name = "drug_rate")
    public String getDrugRate() {
        return drugRate;
    }
    public void setDrugRate(String drugRate) {
        this.drugRate = drugRate;
    }
	@Column(name = "drug_format")
    public String getDrugFormat() {
        return drugFormat;
    }
    public void setDrugFormat(String drugFormat) {
        this.drugFormat = drugFormat;
    }
	@Column(name = "num")
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
	@Column(name = "is_refrigerate")
    public Integer getIsRefrigerate() {
        return isRefrigerate;
    }
    public void setIsRefrigerate(Integer isRefrigerate) {
        this.isRefrigerate = isRefrigerate;
    }
	@Column(name = "direction")
    public String getDirection() {
        return direction;
    }
    public void setDirection(String direction) {
        this.direction = direction;
    }
	@Column(name = "price")
    public Integer getPrice() {
        return price;
    }
    public void setPrice(Integer price) {
        this.price = price;
    }
	@Column(name = "drug_rate_name")
    public String getDrugRateName() {
        return drugRateName;
    }
    public void setDrugRateName(String drugRateName) {
        this.drugRateName = drugRateName;
    }
	@Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
	@Column(name = "physic_skin_test_name")
    public String getPhysicSkinTestName() {
        return physicSkinTestName;
    }
    public void setPhysicSkinTestName(String physicSkinTestName) {
        this.physicSkinTestName = physicSkinTestName;
    }
	@Column(name = "physic_skin_test")
    public String getPhysicSkinTest() {
        return physicSkinTest;
    }
    public void setPhysicSkinTest(String physicSkinTest) {
        this.physicSkinTest = physicSkinTest;
    }
	@Column(name = "physic_inject_place_name")
    public String getPhysicInjectPlaceName() {
        return physicInjectPlaceName;
    }
    public void setPhysicInjectPlaceName(String physicInjectPlaceName) {
        this.physicInjectPlaceName = physicInjectPlaceName;
    }
	@Column(name = "physic_inject_place")
    public String getPhysicInjectPlace() {
        return physicInjectPlace;
    }
    public void setPhysicInjectPlace(String physicInjectPlace) {
        this.physicInjectPlace = physicInjectPlace;
    }
	@Column(name = "physic_amount_unit_name")
    public String getPhysicAmountUnitName() {
        return physicAmountUnitName;
    }
    public void setPhysicAmountUnitName(String physicAmountUnitName) {
        this.physicAmountUnitName = physicAmountUnitName;
    }
	@Column(name = "physic_amount_unit")
    public String getPhysicAmountUnit() {
        return physicAmountUnit;
    }
    public void setPhysicAmountUnit(String physicAmountUnit) {
        this.physicAmountUnit = physicAmountUnit;
    }
	@Column(name = "physic_amount")
    public String getPhysicAmount() {
        return physicAmount;
    }
    public void setPhysicAmount(String physicAmount) {
        this.physicAmount = physicAmount;
    }
	@Column(name = "physic_dose_unit_name")
    public String getPhysicDoseUnitName() {
        return physicDoseUnitName;
    }
    public void setPhysicDoseUnitName(String physicDoseUnitName) {
        this.physicDoseUnitName = physicDoseUnitName;
    }
	@Column(name = "physic_dose_unit")
    public String getPhysicDoseUnit() {
        return physicDoseUnit;
    }
    public void setPhysicDoseUnit(String physicDoseUnit) {
        this.physicDoseUnit = physicDoseUnit;
    }
	@Column(name = "physic_dose")
    public String getPhysicDose() {
        return physicDose;
    }
    public void setPhysicDose(String physicDose) {
        this.physicDose = physicDose;
    }
	@Column(name = "usage_name")
    public String getUsageName() {
        return usageName;
    }
    public void setUsageName(String usageName) {
        this.usageName = usageName;
    }
	@Column(name = "drug_usage")
    public String getDrugUsage() {
        return drugUsage;
    @Column(name = "disp_deposite")
    public String getDispDeposite() {
        return dispDeposite;
    }
    public void setDrugUsage(String drugUsage) {
        this.drugUsage = drugUsage;
    public void setDispDeposite(String dispDeposite) {
        this.dispDeposite = dispDeposite;
    }
	@Column(name = "day_count")
    public Integer getDayCount() {
        return dayCount;
    @Column(name = "dosage")
    public String getDosage() {
        return dosage;
    }
    public void setDayCount(Integer dayCount) {
        this.dayCount = dayCount;
    public void setDosage(String dosage) {
        this.dosage = dosage;
    }
	@Column(name = "bind_flag")
    public String getBindFlag() {
        return bindFlag;
    @Column(name = "quantity")
    public String getQuantity() {
        return quantity;
    }
    public void setBindFlag(String bindFlag) {
        this.bindFlag = bindFlag;
    public void setQuantity(String quantity) {
        this.quantity = quantity;
    }
	@Column(name = "charge")
    public Integer getCharge() {
        return charge;
    @Column(name = "unit")
    public String getUnit() {
        return unit;
    }
    public void setCharge(Integer charge) {
        this.charge = charge;
    public void setUnit(String unit) {
        this.unit = unit;
    }
	@Column(name = "cost")
    public Integer getCost() {
        return cost;
    @Column(name = "usage")
    public String getUsage() {
        return usage;
    }
    public void setCost(Integer cost) {
        this.cost = cost;
    public void setUsage(String usage) {
        this.usage = usage;
    }
	@Column(name = "drug_num_unit_name")
    public String getDrugNumUnitName() {
        return drugNumUnitName;
    @Column(name = "supply_code")
    public String getSupplyCode() {
        return supplyCode;
    }
    public void setDrugNumUnitName(String drugNumUnitName) {
        this.drugNumUnitName = drugNumUnitName;
    public void setSupplyCode(String supplyCode) {
        this.supplyCode = supplyCode;
    }
	@Column(name = "drug_num_unit")
    public String getDrugNumUnit() {
        return drugNumUnit;
    @Column(name = "days")
    public String getDays() {
        return days;
    }
    public void setDrugNumUnit(String drugNumUnit) {
        this.drugNumUnit = drugNumUnit;
    public void setDays(String days) {
        this.days = days;
    }
	@Column(name = "jw_sub_code")
    public String getJwSubCode() {
        return jwSubCode;
    @Column(name = "frequency")
    public String getFrequency() {
        return frequency;
    }
    public void setJwSubCode(String jwSubCode) {
        this.jwSubCode = jwSubCode;
    public void setFrequency(String frequency) {
        this.frequency = frequency;
    }
	@Column(name = "del")
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }

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

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_log")
public class WlyyPrescriptionLogDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionLogDO extends UuidIdentityEntity {
    /**
	 * 

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

@@ -1,6 +1,7 @@
package com.yihu.jw.entity.hospital.prescription;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -16,7 +17,7 @@ import java.util.Date;
*/
@Entity
@Table(name = "wlyy_prescription_reviewed")
public class WlyyPrescriptionReviewedDO extends UuidIdentityEntityWithOperator {
public class WlyyPrescriptionReviewedDO extends UuidIdentityEntity {
    /**
	 * 

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

@@ -11,6 +11,7 @@ public class BaseHospitalRequestMapping {
     * 基础请求地址
     */
    private abstract static class Basic {
        public static final String api_success ="success";
        public static final String CREATE =  "/create";
        public static final String DELETE = "/delete";
        public static final String UPDATE = "/update";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/consult/WlyyHospitalConsultPriceVO.java

@@ -63,6 +63,11 @@ public class WlyyHospitalConsultPriceVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "价格", example = "模块1")
    private Integer price;
    /**
     * 医院编码
     */
    @ApiModelProperty(value = "医院编码", example = "模块1")
    private String hospital;
    public String getSaasId() {
        return saasId;
@@ -113,5 +118,10 @@ public class WlyyHospitalConsultPriceVO extends UuidIdentityVOWithOperator {
        this.price = price;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionDiagnosisVO.java

@@ -23,56 +23,31 @@ import java.util.Date;
public class WlyyPrescriptionDiagnosisVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 关联处方
	 */
	@ApiModelProperty(value = "关联处方", example = "模块1")
     * 关联处方
     */
    @ApiModelProperty(value = "关联处方", example = "模块1")
    private String prescriptionId;
    /**
	 * 诊断结果名称
	 */
	@ApiModelProperty(value = "诊断结果名称", example = "模块1")
     * 诊断结果名称
     */
    @ApiModelProperty(value = "诊断结果名称", example = "模块1")
    private String name;
    /**
	 * 健康问题名称
	 */
	@ApiModelProperty(value = "健康问题名称", example = "模块1")
    private String healthProblemName;
    /**
	 * 健康问题编码
	 */
	@ApiModelProperty(value = "健康问题编码", example = "模块1")
    private String healthProblem;
    /**
	 * 1主诊断 2次诊断
	 */
	@ApiModelProperty(value = "1主诊断 2次诊断", example = "模块1")
     * 1主诊断 2次诊断
     */
    @ApiModelProperty(value = "1主诊断 2次诊断", example = "模块1")
    private Integer type;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPrescriptionId() {
        return prescriptionId;
    }
@@ -87,20 +62,6 @@ public class WlyyPrescriptionDiagnosisVO extends UuidIdentityVOWithOperator {
        this.name = name;
    }
    public String getHealthProblemName() {
        return healthProblemName;
    }
    public void setHealthProblemName(String healthProblemName) {
        this.healthProblemName = healthProblemName;
    }
    public String getHealthProblem() {
        return healthProblem;
    }
    public void setHealthProblem(String healthProblem) {
        this.healthProblem = healthProblem;
    }
    public Integer getType() {
        return type;
    }
@@ -115,5 +76,4 @@ public class WlyyPrescriptionDiagnosisVO extends UuidIdentityVOWithOperator {
        this.createTime = createTime;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionInfoVO.java

@@ -22,211 +22,78 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String saasId;
    /**
	 * 处方code 关联表wlyy_prescription code
	 */
	@ApiModelProperty(value = "处方code 关联表wlyy_prescription code", example = "模块1")
     * 处方code 关联表wlyy_prescription code
     */
    @ApiModelProperty(value = "处方code 关联表wlyy_prescription code", example = "模块1")
    private String prescriptionId;
    /**
	 * 药品code
	 */
	@ApiModelProperty(value = "药品code", example = "模块1")
    private String drugCode;
     * 药品编号
     */
    @ApiModelProperty(value = "药品编号", example = "模块1")
    private String drugNo;
    /**
	 * 药品名称
	 */
	@ApiModelProperty(value = "药品名称", example = "模块1")
     * 药品名称
     */
    @ApiModelProperty(value = "药品名称", example = "模块1")
    private String drugName;
    /**
	 * 科目类别编码
	 */
	@ApiModelProperty(value = "科目类别编码", example = "模块1")
    private String subjectClass;
    /**
	 * 吃药频率
	 */
	@ApiModelProperty(value = "吃药频率", example = "模块1")
    private String drugRate;
    /**
	 * 药品规格
	 */
	@ApiModelProperty(value = "药品规格", example = "模块1")
    private String drugFormat;
    /**
	 * 药品数目
	 */
	@ApiModelProperty(value = "药品数目", example = "模块1")
    private Integer num;
    /**
	 * 是否冷藏 1是 0否
	 */
	@ApiModelProperty(value = "是否冷藏 1是 0否", example = "模块1")
    private Integer isRefrigerate;
    /**
	 * 药品用法
	 */
	@ApiModelProperty(value = "药品用法", example = "模块1")
    private String direction;
    /**
	 * 药品价格 单位是分
	 */
	@ApiModelProperty(value = "药品价格 单位是分", example = "模块1")
    private Integer price;
     * 库房号
     */
    @ApiModelProperty(value = "库房号", example = "模块1")
    private String dispDeposite;
    /**
	 * 用药频次名称
	 */
	@ApiModelProperty(value = "用药频次名称", example = "模块1")
    private String drugRateName;
     * 药量
     */
    @ApiModelProperty(value = "药量", example = "模块1")
    private String dosage;
    /**
	 * 备注
	 */
	@ApiModelProperty(value = "备注", example = "模块1")
    private String remark;
     *
     */
    @ApiModelProperty(value = "", example = "模块1")
    private String quantity;
    /**
	 * 皮试类型名称
	 */
	@ApiModelProperty(value = "皮试类型名称", example = "模块1")
    private String physicSkinTestName;
     *
     */
    @ApiModelProperty(value = "", example = "模块1")
    private String unit;
    /**
	 * 注射地点名称
	 */
	@ApiModelProperty(value = "注射地点名称", example = "模块1")
    private String physicSkinTest;
     * 频率
     */
    @ApiModelProperty(value = "频率", example = "模块1")
    private String usage;
    /**
	 * 注射地点名称
	 */
	@ApiModelProperty(value = "注射地点名称", example = "模块1")
    private String physicInjectPlaceName;
     * 用法
     */
    @ApiModelProperty(value = "用法", example = "模块1")
    private String supplyCode;
    /**
	 * 注射地点编码
	 */
	@ApiModelProperty(value = "注射地点编码", example = "模块1")
    private String physicInjectPlace;
     * 天数
     */
    @ApiModelProperty(value = "天数", example = "模块1")
    private String days;
    /**
	 * 总量单位名称
	 */
	@ApiModelProperty(value = "总量单位名称", example = "模块1")
    private String physicAmountUnitName;
     * 频率
     */
    @ApiModelProperty(value = "组数", example = "模块1")
    private String frequency;
    /**
	 * 总量单位编码
	 */
	@ApiModelProperty(value = "总量单位编码", example = "模块1")
    private String physicAmountUnit;
    /**
	 * 用药总量
	 */
	@ApiModelProperty(value = "用药总量", example = "模块1")
    private String physicAmount;
    /**
	 * 剂量单位名称
	 */
	@ApiModelProperty(value = "剂量单位名称", example = "模块1")
    private String physicDoseUnitName;
    /**
	 * 剂量单位编码
	 */
	@ApiModelProperty(value = "剂量单位编码", example = "模块1")
    private String physicDoseUnit;
    /**
	 * 用药剂量
	 */
	@ApiModelProperty(value = "用药剂量", example = "模块1")
    private String physicDose;
    /**
	 * 用药方法名称
	 */
	@ApiModelProperty(value = "用药方法名称", example = "模块1")
    private String usageName;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String drugUsage;
    /**
	 * 用药天数
	 */
	@ApiModelProperty(value = "用药天数", example = "模块1")
    private Integer dayCount;
    /**
	 * 成组标志, 0.非成组,1.成组
	 */
	@ApiModelProperty(value = "成组标志, 0.非成组,1.成组", example = "模块1")
    private String bindFlag;
    /**
	 * 自付
	 */
	@ApiModelProperty(value = "自付", example = "模块1")
    private Integer charge;
    /**
	 * 金额
	 */
	@ApiModelProperty(value = "金额", example = "模块1")
    private Integer cost;
    /**
	 * 数量单位名称
	 */
	@ApiModelProperty(value = "数量单位名称", example = "模块1")
    private String drugNumUnitName;
    /**
	 * 数量单位编码
	 */
	@ApiModelProperty(value = "数量单位编码", example = "模块1")
    private String drugNumUnit;
    /**
	 * HIS子处方号
	 */
	@ApiModelProperty(value = "HIS子处方号", example = "模块1")
    private String jwSubCode;
    /**
	 * 1可用 0删除
	 */
	@ApiModelProperty(value = "1可用 0删除", example = "模块1")
     * 1可用 0删除
     */
    @ApiModelProperty(value = "1可用 0删除", example = "模块1")
    private Integer del;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPrescriptionId() {
        return prescriptionId;
    }
@@ -234,11 +101,11 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
        this.prescriptionId = prescriptionId;
    }
    public String getDrugCode() {
        return drugCode;
    public String getDrugNo() {
        return drugNo;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    public void setDrugNo(String drugNo) {
        this.drugNo = drugNo;
    }
    public String getDrugName() {
@@ -248,200 +115,60 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
        this.drugName = drugName;
    }
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
    public String getDrugRate() {
        return drugRate;
    }
    public void setDrugRate(String drugRate) {
        this.drugRate = drugRate;
    }
    public String getDrugFormat() {
        return drugFormat;
    }
    public void setDrugFormat(String drugFormat) {
        this.drugFormat = drugFormat;
    }
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public Integer getIsRefrigerate() {
        return isRefrigerate;
    }
    public void setIsRefrigerate(Integer isRefrigerate) {
        this.isRefrigerate = isRefrigerate;
    }
    public String getDirection() {
        return direction;
    public String getDispDeposite() {
        return dispDeposite;
    }
    public void setDirection(String direction) {
        this.direction = direction;
    public void setDispDeposite(String dispDeposite) {
        this.dispDeposite = dispDeposite;
    }
    public Integer getPrice() {
        return price;
    public String getDosage() {
        return dosage;
    }
    public void setPrice(Integer price) {
        this.price = price;
    public void setDosage(String dosage) {
        this.dosage = dosage;
    }
    public String getDrugRateName() {
        return drugRateName;
    public String getQuantity() {
        return quantity;
    }
    public void setDrugRateName(String drugRateName) {
        this.drugRateName = drugRateName;
    public void setQuantity(String quantity) {
        this.quantity = quantity;
    }
    public String getRemark() {
        return remark;
    public String getUnit() {
        return unit;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    public void setUnit(String unit) {
        this.unit = unit;
    }
    public String getPhysicSkinTestName() {
        return physicSkinTestName;
    public String getUsage() {
        return usage;
    }
    public void setPhysicSkinTestName(String physicSkinTestName) {
        this.physicSkinTestName = physicSkinTestName;
    public void setUsage(String usage) {
        this.usage = usage;
    }
    public String getPhysicSkinTest() {
        return physicSkinTest;
    public String getSupplyCode() {
        return supplyCode;
    }
    public void setPhysicSkinTest(String physicSkinTest) {
        this.physicSkinTest = physicSkinTest;
    public void setSupplyCode(String supplyCode) {
        this.supplyCode = supplyCode;
    }
    public String getPhysicInjectPlaceName() {
        return physicInjectPlaceName;
    public String getDays() {
        return days;
    }
    public void setPhysicInjectPlaceName(String physicInjectPlaceName) {
        this.physicInjectPlaceName = physicInjectPlaceName;
    public void setDays(String days) {
        this.days = days;
    }
    public String getPhysicInjectPlace() {
        return physicInjectPlace;
    public String getFrequency() {
        return frequency;
    }
    public void setPhysicInjectPlace(String physicInjectPlace) {
        this.physicInjectPlace = physicInjectPlace;
    }
    public String getPhysicAmountUnitName() {
        return physicAmountUnitName;
    }
    public void setPhysicAmountUnitName(String physicAmountUnitName) {
        this.physicAmountUnitName = physicAmountUnitName;
    }
    public String getPhysicAmountUnit() {
        return physicAmountUnit;
    }
    public void setPhysicAmountUnit(String physicAmountUnit) {
        this.physicAmountUnit = physicAmountUnit;
    }
    public String getPhysicAmount() {
        return physicAmount;
    }
    public void setPhysicAmount(String physicAmount) {
        this.physicAmount = physicAmount;
    }
    public String getPhysicDoseUnitName() {
        return physicDoseUnitName;
    }
    public void setPhysicDoseUnitName(String physicDoseUnitName) {
        this.physicDoseUnitName = physicDoseUnitName;
    }
    public String getPhysicDoseUnit() {
        return physicDoseUnit;
    }
    public void setPhysicDoseUnit(String physicDoseUnit) {
        this.physicDoseUnit = physicDoseUnit;
    }
    public String getPhysicDose() {
        return physicDose;
    }
    public void setPhysicDose(String physicDose) {
        this.physicDose = physicDose;
    }
    public String getUsageName() {
        return usageName;
    }
    public void setUsageName(String usageName) {
        this.usageName = usageName;
    }
    public String getDrugUsage() {
        return drugUsage;
    }
    public void setDrugUsage(String drugUsage) {
        this.drugUsage = drugUsage;
    }
    public Integer getDayCount() {
        return dayCount;
    }
    public void setDayCount(Integer dayCount) {
        this.dayCount = dayCount;
    }
    public String getBindFlag() {
        return bindFlag;
    }
    public void setBindFlag(String bindFlag) {
        this.bindFlag = bindFlag;
    }
    public Integer getCharge() {
        return charge;
    }
    public void setCharge(Integer charge) {
        this.charge = charge;
    }
    public Integer getCost() {
        return cost;
    }
    public void setCost(Integer cost) {
        this.cost = cost;
    }
    public String getDrugNumUnitName() {
        return drugNumUnitName;
    }
    public void setDrugNumUnitName(String drugNumUnitName) {
        this.drugNumUnitName = drugNumUnitName;
    }
    public String getDrugNumUnit() {
        return drugNumUnit;
    }
    public void setDrugNumUnit(String drugNumUnit) {
        this.drugNumUnit = drugNumUnit;
    }
    public String getJwSubCode() {
        return jwSubCode;
    }
    public void setJwSubCode(String jwSubCode) {
        this.jwSubCode = jwSubCode;
    public void setFrequency(String frequency) {
        this.frequency = frequency;
    }
    public Integer getDel() {
@@ -451,5 +178,4 @@ public class WlyyPrescriptionInfoVO extends UuidIdentityVOWithOperator {
        this.del = del;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/system/SystemDictService.java

@@ -76,23 +76,23 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
        JSONArray jsonArray = new JSONArray();
        JSONObject jsonObject = new JSONObject();
        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictIcd10Service.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictIcd10Service.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHospitalDeptService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictHospitalDeptService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictJobTitleService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictJobTitleService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHealthProblemService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictHealthProblemService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictMedicineService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictMedicineService.queryAll(saasId, createPage(page, size, sorts));
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictDiseaseService.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = dictDiseaseService.queryAll(saasId, createPage(page, size, sorts));
        } else {
            jsonObject = this.queryAll(saasId, creatPage(page, size, sorts));
            jsonObject = this.queryAll(saasId, createPage(page, size, sorts));
        }
        jsonArray.add(jsonObject);
        return jsonArray;
@@ -123,23 +123,23 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
        JSONArray jsonArray = new JSONArray();
        JSONObject jsonObject = new JSONObject();
        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictIcd10Service.queryAll(userId, creatPage(page, size, sorts));
            jsonObject = dictIcd10Service.queryAll(userId, createPage(page, size, sorts));
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHospitalDeptService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictHospitalDeptService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictJobTitleService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictJobTitleService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictHealthProblemService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictHealthProblemService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictMedicineService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictMedicineService.queryAll("", createPage(page, size, sorts));
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            jsonObject = dictDiseaseService.queryAll("", creatPage(page, size, sorts));
            jsonObject = dictDiseaseService.queryAll("", createPage(page, size, sorts));
        } else {
            jsonObject = this.queryAll("", creatPage(page, size, sorts));
            jsonObject = this.queryAll("", createPage(page, size, sorts));
        }
        jsonArray.add(jsonObject);
        return jsonArray;

svr/svr-internet-hospital/pom.xml

@@ -59,10 +59,7 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.cloud</groupId>-->
            <!--<artifactId>spring-cloud-starter-zipkin</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-activemq</artifactId>
@@ -93,19 +90,12 @@
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>${parent.version}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-web</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>com.yihu.jw</groupId>-->
            <!--<artifactId>common-tracer</artifactId>-->
        <!--</dependency>-->
        <!-- 文件服务器 -->
        <dependency>
            <groupId>com.yihu</groupId>
@@ -190,16 +180,13 @@
            <artifactId>base-service</artifactId>
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>sms-service</artifactId>
            <version>2.0.0</version>
            <scope>compile</scope>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>junit</groupId>-->
            <!--<artifactId>junit</artifactId>-->
            <!--<groupId>com.yihu.jw</groupId>-->
            <!--<artifactId>sms-service</artifactId>-->
            <!--<version>2.0.0</version>-->
            <!--<scope>compile</scope>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.junit.platform</groupId>
            <artifactId>junit-platform-commons</artifactId>
@@ -211,6 +198,10 @@
            <artifactId>thumbnailator</artifactId>
            <version>0.4.8</version>
        </dependency>
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
        </dependency>
    </dependencies>
    <build>

svr/svr-internet-hospital/src/main/java/com/yihu/SvrInternetHospitalApplication.java

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
/**

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/ConsultPriceDao.java

@@ -0,0 +1,19 @@
package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalConsultPriceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface ConsultPriceDao extends PagingAndSortingRepository<WlyyHospitalConsultPriceDO, String>, JpaSpecificationExecutor<WlyyHospitalConsultPriceDO>  {
    // 根据机构编码查询所有计费列表
    List<WlyyHospitalConsultPriceDO> findByHospital(String hospital);
    // 根据机构编码、服务科室、医生类型、服务对象，查询单条价格记录
    WlyyHospitalConsultPriceDO findByHospitalAndDeptAndDoctorJobAndServiceRange(String hospital, String dept, String doctorJob, String serviceRange);
    // 根据id 查询已有记录
    WlyyHospitalConsultPriceDO findById(String id);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/ReservationSettingDao.java

@@ -0,0 +1,13 @@
package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalReservationSettingDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ReservationSettingDao extends PagingAndSortingRepository<WlyyHospitalReservationSettingDO, String>, JpaSpecificationExecutor<WlyyHospitalReservationSettingDO>  {
    // 根据id 查询已有记录
    WlyyHospitalReservationSettingDO findById(String id);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/SysDictDao.java

@@ -0,0 +1,18 @@
package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface SysDictDao extends PagingAndSortingRepository<WlyyHospitalSysDictDO, String>, JpaSpecificationExecutor<WlyyHospitalSysDictDO>  {
    WlyyHospitalSysDictDO findByHospitalAndDictCode(String hospital, String dictCode);
    List<WlyyHospitalSysDictDO> findByHospitalAndDictName(String hospital, String dictName);
    WlyyHospitalSysDictDO findById(String id);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/ConsultPriceEndpoint.java

@@ -0,0 +1,101 @@
package com.yihu.jw.hospital.endpoint.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalConsultPriceDO;
import com.yihu.jw.hospital.service.consult.ConsultPriceService;
import com.yihu.jw.restmodel.hospital.consult.WlyyHospitalConsultPriceVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
 * Created by Trick on 2019/5/16.
 */
@RestController
@RequestMapping("internet/consult/price" )
@Api(tags = "医院咨询计费价目表", description = "互联网医院")
public class ConsultPriceEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ConsultPriceService consultPriceService;
    /**
     * 新增咨询计费信息
     * @param jsonData
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/create", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "新增咨询计费信息", notes = "新增咨询计费信息")
    public Envelop createConsultPrice(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        int flag = -1;
        WlyyHospitalConsultPriceDO wlyyHospitalConsultPriceDO = new WlyyHospitalConsultPriceDO();
        Map dataDetail  = JSONObject.fromObject(jsonData);
        String hospital = dataDetail.get("hospital").toString();
        // 获取到职称及服务对象列表，拆分成json数组，再进行处理
        String data = dataDetail.get("data") == "" ? "": dataDetail.get("data") .toString();
        JSONArray array = JSONArray.fromObject(data);
        if (array.size() > 0) {
                for (int i = 0; i < array.size(); i++) {
                JSONObject jsonObject = array.getJSONObject(i);
                wlyyHospitalConsultPriceDO = consultPriceService.saveConsultPrice(jsonObject,hospital);
                if(wlyyHospitalConsultPriceDO != null){
                    flag = 0;
                }else{
                    break;
                }
            }
        }
        if(flag == 0){
            return success("新增咨费成功！");
        }else{
            return failed("新增咨费失败！");
        }
    }
    @GetMapping(value = "/search")
    @ApiOperation(value = "获取分页")
    public PageEnvelop<WlyyHospitalConsultPriceVO> page(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<WlyyHospitalConsultPriceDO> wlyyHospitalConsultPriceDOS = consultPriceService.search(fields, filters, sorts, page, size);
        int count = (int) consultPriceService.getCount(filters);
        return success(wlyyHospitalConsultPriceDOS, count, page, size, WlyyHospitalConsultPriceVO.class);
    }
    @PostMapping(value = "/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除指定ID的咨费记录", notes = "新增咨询计费信息")
    public Envelop deleteConsultPrice(
            @ApiParam(name = "id", value = "唯一标识ID")
            @RequestParam(value = "id", required = false) String id) {
        consultPriceService.deleteConsultPrice(id);
        return success("删除成功！");
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/ReservationSettingEndpoint.java

@@ -0,0 +1,106 @@
package com.yihu.jw.hospital.endpoint.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalConsultPriceDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalReservationSettingDO;
import com.yihu.jw.hospital.service.consult.ConsultPriceService;
import com.yihu.jw.hospital.service.consult.ReservationSettingService;
import com.yihu.jw.restmodel.hospital.consult.WlyyHospitalConsultPriceVO;
import com.yihu.jw.restmodel.hospital.consult.WlyyHospitalReservationSettingVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by Trick on 2019/5/16.
 */
@RestController
@RequestMapping("internet/reservation/setting" )
@Api(tags = "服务配置", description = "互联网医院")
public class ReservationSettingEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ReservationSettingService reservationSettingService;
    @PostMapping(value = "/create", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "新增服务配置信息", notes = "服务配置")
    public Envelop createResverationSetting(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        int flag = -1;
        WlyyHospitalReservationSettingDO wlyyHospitalReservationSettingDO = new WlyyHospitalReservationSettingDO();
        Map dataDetail  = JSONObject.fromObject(jsonData);
        Map baseInfo = new HashMap();
        String hospital = dataDetail.get("hospital").toString();
        baseInfo.put("city",dataDetail.get("city").toString());
        baseInfo.put("cityName",dataDetail.get("cityName").toString());
        baseInfo.put("town",dataDetail.get("town").toString());
        baseInfo.put("townName",dataDetail.get("townName").toString());
        baseInfo.put("hospital",dataDetail.get("hospital").toString());
        baseInfo.put("hospitalName",dataDetail.get("hospitalName").toString());
        // 获取到职称及服务对象列表，拆分成json数组，再进行处理
        String data = dataDetail.get("data") == "" ? "": dataDetail.get("data") .toString();
        JSONArray array = JSONArray.fromObject(data);
        if (array.size() > 0) {
                for (int i = 0; i < array.size(); i++) {
                JSONObject jsonObject = array.getJSONObject(i);
                    wlyyHospitalReservationSettingDO = reservationSettingService.saveReverationSetting(jsonObject,baseInfo);
                if(wlyyHospitalReservationSettingDO != null){
                    flag = 0;
                }else{
                    break;
                }
            }
        }
        if(flag == 0){
            return success("新增服务配置成功！");
        }else{
            return failed("新增服务配置失败！");
        }
    }
    @GetMapping(value = "/search")
    @ApiOperation(value = "获取分页")
    public PageEnvelop<WlyyHospitalReservationSettingVO> page(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<WlyyHospitalReservationSettingDO> wlyyHospitalReservationSettingDOS = reservationSettingService.search(fields, filters, sorts, page, size);
        int count = (int) reservationSettingService.getCount(filters);
        return success(wlyyHospitalReservationSettingDOS, count, page, size, WlyyHospitalReservationSettingVO.class);
    }
    @PostMapping(value = "/delete", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除指定ID的配置服务记录", notes = "服务配置")
    public Envelop deleteConsultPrice(
            @ApiParam(name = "id", value = "唯一标识ID")
            @RequestParam(value = "id", required = false) String id) {
        reservationSettingService.deleteReservationSetting(id);
        return success("删除成功！");
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/SysDictEndpoint.java

@@ -0,0 +1,142 @@
package com.yihu.jw.hospital.endpoint.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.service.consult.SysDictService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by Trick on 2019/5/16.
 */
@RestController
@RequestMapping("internet/consult/sysdict" )
@Api(tags = "互联网医院功能业务字典及开关设置表", description = "互联网医院")
public class SysDictEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SysDictService sysDictService;
    /**
     * 新增功能业务字典
     * @param jsonData
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/create", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "新增&修改功能业务字典", notes = "互联网医院功能业务字典及开关设置表")
    public Envelop createSysDict(
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        int flag = -1;
        Envelop envelop = new Envelop();
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = new WlyyHospitalSysDictDO();
        Map dataDetail  = JSONObject.fromObject(jsonData);
        String hospital = dataDetail.get("hospital") == "" ? "": dataDetail.get("hospital") .toString();
        String dictName = dataDetail.get("dictName") == "" ? "": dataDetail.get("dictName") .toString();
        String data = dataDetail.get("data") == "" ? "": dataDetail.get("data") .toString();
        JSONArray array = JSONArray.fromObject(data);
        if(array.size()>0) {
            for (int i = 0; i < array.size(); i++) {
                JSONObject jsonObject = array.getJSONObject(i);
                wlyyHospitalSysDictDO = sysDictService.saveConsultSetting(jsonObject, hospital, dictName);
                if (wlyyHospitalSysDictDO != null) {
                    flag = 0;
                    continue;
                } else {
                    break;
                }
            }
            if (flag < 0) {
                return failed("配置新增失败!");
            } else {
                return success("配置新增成功!", wlyyHospitalSysDictDO);
            }
        }else{
            return failed("获取待更新配置项失败！");
        }
    }
    /**
     * 该接口实现按医院编号、字典名称、字典项编码进行查询的功能
     * 字典及项值约定：
     * dictName( 候诊延时： WaitingDelay )  dictCode ( 等待时长：WaitingTime  过号延时保号： OverdueDelay   过号延时时长： OverdueTime  延时退费规则: DelayedRefundRule )
     * dictName( 邀请专家配置： InvitedConfig )   dictCode ( 支付配置：PayType  邀请确认：InvitedValid   退费规则：RefundRule )
     */
    @GetMapping(value = "/findByHosAndDn", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "基于医院编号及字典名称，查询配置列表", notes = "互联网医院功能业务字典及开关设置表")
    public Envelop findByHosAndDn(
            @ApiParam(name = "hospital", value = "医院编码", required = true)
            @RequestParam(value = "hospital", required = true) String hospital,
            @ApiParam(name = "dictName", value = "字典名称", defaultValue = "")
            @RequestParam(value = "dictName", required = false) String dictName ) throws Exception {
        ListEnvelop listEnvelop = new ListEnvelop();
        List<WlyyHospitalSysDictDO>  wlyyHospitalSysDictDOS = new ArrayList<WlyyHospitalSysDictDO>();
        wlyyHospitalSysDictDOS = sysDictService.findByHospitalAndDictName(hospital,dictName);
        Map res = new HashMap();
        res.put("hospital",hospital);
        res.put("dictName",dictName);
        if(wlyyHospitalSysDictDOS != null){
            for(WlyyHospitalSysDictDO wlyyHospitalSysDictDO : wlyyHospitalSysDictDOS){
                res.put(wlyyHospitalSysDictDO.getDictCode().toString(),wlyyHospitalSysDictDO.getDictValue().toString());
            }
            return success("查询配置信息成功！",res);
        }else{
            return failed("配置信息未存储，请先保存！");
        }
    }
    /**
     * 根据医院编号及字典编码，获取配置界面中某一配置项的值信息
     * dictName( 候诊延时： WaitingDelay )  dictCode ( 等待时长：WaitingTime  过号延时保号： OverdueDelay   过号延时时长： OverdueTime  延时退费规则: DelayedRefundRule )
     * dictName( 邀请专家配置： InvitedConfig )   dictCode ( 支付配置：PayType  邀请确认：InvitedValid   退费规则：RefundRule )
     * @param hospital
     * @param dictCode
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/findByHosAndDc", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "基于医院编号、字典名称及字典项编码，查询指定配置", notes = "互联网医院功能业务字典及开关设置表")
    public ObjEnvelop findByHosAndDc(
            @ApiParam(name = "hospital", value = "医院编码", required = true)
            @RequestParam(value = "hospital", required = true) String hospital,
            @ApiParam(name = "dictCode", value = "字典项编码", defaultValue = "")
            @RequestParam(value = "dictCode", required = false) String dictCode ) throws Exception {
        ObjEnvelop objEnvelop = new ObjEnvelop();
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = new WlyyHospitalSysDictDO();
        wlyyHospitalSysDictDO = sysDictService.findByHospitalAndDictCode(hospital,dictCode);
        if(wlyyHospitalSysDictDO != null){
            objEnvelop.setObj(wlyyHospitalSysDictDO);
            objEnvelop.setStatus(200);
            objEnvelop.setMessage("查询配置信息成功！");
        }else{
            objEnvelop.setStatus(-1);
            objEnvelop.setMessage("对不起，未查询到相关的配置信息！");
        }
        return objEnvelop;
    }
}

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

@@ -1,11 +1,22 @@
package com.yihu.jw.hospital.endpoint.prescription;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
 * Created by Trick on 2019/5/16.
 */
@@ -14,5 +25,44 @@ import org.springframework.web.bind.annotation.RestController;
@Api(value = "在线复诊", description = "在线复诊接口", tags = {"在线复诊接口"})
public class PrescriptionEndpoint extends EnvelopRestEndpoint {
    
    @Autowired
    private PrescriptionService prescriptionService;
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPrescriptionList)
    @ApiOperation(value = "获取续方记录列表", notes = "获取续方记录列表")
    public MixEnvelop<WlyyPrescriptionVO,WlyyPrescriptionVO> findPrescriptionList(@ApiParam(name = "patient", value = "居民code")
                                                                                  @RequestParam(value = "patient", required = false) String patient,
                                                                                  @ApiParam(name = "status", value = "状态，多状态‘,’分割，例如‘1,2’，‘1,2,3’")
                                                                                  @RequestParam(value = "status", required = false)String status,
                                                                                  @ApiParam(name = "startTime", value = "开始时间，‘yyyy-MM-dd’")
                                                                                  @RequestParam(value = "startTime", required = false)String startTime,
                                                                                  @ApiParam(name = "endTime", value = "结束时间,yyyy-MM-dd’")
                                                                                  @RequestParam(value = "endTime", required = false)String endTime,
                                                                                  @RequestParam(value = "page", required = true) Integer page,
                                                                                  @ApiParam(name = "size", value = "每页大小")
                                                                                  @RequestParam(value = "size", required = true) Integer size) {
        return prescriptionService.findPrescriptionList(patient,status,startTime,endTime,page,size);
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findPrescriptionInfo)
    @ApiOperation(value = "获取所有居民相关信息，续方信息，物流信息，药品信息（单条）", notes = "获取所有居民相关信息，续方信息，物流信息，药品信息（单条）")
    public ObjEnvelop<Map<String,Object>> findPrescriptionInfo(@ApiParam(name = "prescriptionId", value = "续方明细")
                                                               @RequestParam(value = "prescriptionId", required = false) String prescriptionId) {
        return success(BaseHospitalRequestMapping.Prescription.api_success,prescriptionService.findPrescriptionInfo(prescriptionId));
    }
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.checkPrescription)
    @ApiOperation(value = "判断是否可续方,true 可以，false不可以", notes = "判断是否可续方,true 可以，false不可以")
    public ObjEnvelop<Boolean> checkPrescription(@ApiParam(name = "patient", value = "续方明细")
                                                               @RequestParam(value = "patient", required = false) String patient) {
        return success(BaseHospitalRequestMapping.Prescription.api_success,prescriptionService.checkPrescription(patient));
    }
    //===========
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/ConsultPriceService.java

@@ -0,0 +1,73 @@
package com.yihu.jw.hospital.service.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalConsultPriceDO;
import com.yihu.jw.hospital.dao.consult.ConsultPriceDao;
import com.yihu.mysql.query.BaseJpaService;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service
public class ConsultPriceService extends BaseJpaService<WlyyHospitalConsultPriceDO, ConsultPriceDao> {
    @Autowired
    private ConsultPriceDao consultPriceDao;
    /**
     * // 根据机构编码查询所有计费列表
     * @param jsonObject
     * @param hospital
     * @return
     *
     */
    public WlyyHospitalConsultPriceDO saveConsultPrice(JSONObject jsonObject, String hospital){
        /*CREATE TABLE `wlyy_hospital_consult_price` (
             `id` varchar(50) NOT NULL,
             `saas_id` varchar(50) DEFAULT NULL,
             `type` int(1) DEFAULT '1' COMMENT '0图文 1视频',
             `pay_type` int(1) DEFAULT '0' COMMENT '0按次收费 1计时收费 3固定时长收费 4',
             `dept` varchar(500) DEFAULT NULL COMMENT '服务科室',
             `doctor_job` varchar(50) DEFAULT NULL COMMENT '0专家 1主任 2医师',
             `service_range` varchar(50) DEFAULT NULL COMMENT '0帮扶医院、社区  1普通患者',
             `price` int(11) DEFAULT NULL COMMENT '价格',
             `hospital` varchar(50) DEFAULT NULL,
                   PRIMARY KEY (`id`)
           ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='医院咨询计费价目表';*/
        int flag = -1;
        WlyyHospitalConsultPriceDO wlyyHospitalConsultPriceDO = new WlyyHospitalConsultPriceDO();
        Map dataDetail  = JSONObject.fromObject(jsonObject);
        String id = dataDetail.get("id") == "" ? "":dataDetail.get("id").toString();
        // 若id为空，则为新增，否则走更新操作。
        if ("".equals(id)) {
            wlyyHospitalConsultPriceDO.setSaasId("");
            wlyyHospitalConsultPriceDO.setType(dataDetail.get("type") == "" ? 0 : Integer.parseInt(dataDetail.get("type").toString()));
            wlyyHospitalConsultPriceDO.setPayType(dataDetail.get("payType") == "" ? 0 : Integer.parseInt(dataDetail.get("payType").toString()));
            wlyyHospitalConsultPriceDO.setDept(dataDetail.get("dept") == "" ? "" : dataDetail.get("dept").toString());
            wlyyHospitalConsultPriceDO.setDoctorJob(dataDetail.get("doctorJob") == "" ? "" : dataDetail.get("doctorJob").toString());
            wlyyHospitalConsultPriceDO.setServiceRange(dataDetail.get("serviceRange") == "" ? "" : dataDetail.get("serviceRange").toString());
            wlyyHospitalConsultPriceDO.setPrice(dataDetail.get("price") == "" ? 0 : Integer.parseInt(dataDetail.get("price").toString()));
            wlyyHospitalConsultPriceDO.setHospital(hospital);
            wlyyHospitalConsultPriceDO = consultPriceDao.save(wlyyHospitalConsultPriceDO);
        }else{
            WlyyHospitalConsultPriceDO wlyyHospitalConsultPriceDOL = consultPriceDao.findById(id);
            wlyyHospitalConsultPriceDOL.setType(dataDetail.get("type") == "" ? 0 : Integer.parseInt(dataDetail.get("type").toString()));
            wlyyHospitalConsultPriceDOL.setPayType(dataDetail.get("payType") == "" ? 0 : Integer.parseInt(dataDetail.get("payType").toString()));
            wlyyHospitalConsultPriceDOL.setDept(dataDetail.get("dept") == "" ? "" : dataDetail.get("dept").toString());
            wlyyHospitalConsultPriceDOL.setDoctorJob(dataDetail.get("doctorJob") == "" ? "" : dataDetail.get("doctorJob").toString());
            wlyyHospitalConsultPriceDOL.setServiceRange(dataDetail.get("serviceRange") == "" ? "" : dataDetail.get("serviceRange").toString());
            wlyyHospitalConsultPriceDOL.setPrice(dataDetail.get("price") == "" ? 0 : Integer.parseInt(dataDetail.get("price").toString()));
            wlyyHospitalConsultPriceDO.setHospital(hospital);
            wlyyHospitalConsultPriceDO = consultPriceDao.save(wlyyHospitalConsultPriceDOL);
        }
        return wlyyHospitalConsultPriceDO;
    }
    public void deleteConsultPrice(String id){
        consultPriceDao.delete(id);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/ReservationSettingService.java

@@ -0,0 +1,64 @@
package com.yihu.jw.hospital.service.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalReservationSettingDO;
import com.yihu.jw.hospital.dao.consult.ReservationSettingDao;
import com.yihu.mysql.query.BaseJpaService;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
@Service
public class ReservationSettingService extends BaseJpaService<WlyyHospitalReservationSettingDO, ReservationSettingDao> {
    @Autowired
    private ReservationSettingDao reservationSettingDao;
    public WlyyHospitalReservationSettingDO saveReverationSetting(JSONObject jsonObject, Map baseInfo){
        int flag = -1;
        WlyyHospitalReservationSettingDO wlyyHospitalReservationSettingDO = new WlyyHospitalReservationSettingDO();
        Map dataDetail  = JSONObject.fromObject(jsonObject);
        String id = dataDetail.get("id") == "" ? "":dataDetail.get("id").toString();
        // 若id为空，则为新增，否则走更新操作。
        if ("".equals(id)) {
            wlyyHospitalReservationSettingDO.setSaasId("");
            wlyyHospitalReservationSettingDO.setCity(baseInfo.get("city").toString());
            wlyyHospitalReservationSettingDO.setCityName(baseInfo.get("cityName").toString());
            wlyyHospitalReservationSettingDO.setTown(baseInfo.get("town").toString());
            wlyyHospitalReservationSettingDO.setTownName(baseInfo.get("townName").toString());
            wlyyHospitalReservationSettingDO.setHospital(baseInfo.get("hospital").toString());
            wlyyHospitalReservationSettingDO.setHospitalName(baseInfo.get("hospitalName").toString());
            wlyyHospitalReservationSettingDO.setDept(dataDetail.get("dept").toString());
            wlyyHospitalReservationSettingDO.setDeptName(dataDetail.get("deptName").toString());
            wlyyHospitalReservationSettingDO.setDoctor(dataDetail.get("doctor").toString());
            wlyyHospitalReservationSettingDO.setDoctorName(dataDetail.get("doctorName").toString());
            wlyyHospitalReservationSettingDO.setJob(dataDetail.get("job").toString());
            wlyyHospitalReservationSettingDO.setJobName(dataDetail.get("jobName").toString());
            wlyyHospitalReservationSettingDO.setDiseaseRange(dataDetail.get("diseaseRange").toString());
            wlyyHospitalReservationSettingDO.setConsultType(Integer.parseInt(dataDetail.get("consultType").toString()));
            wlyyHospitalReservationSettingDO.setReservationStatus(Integer.parseInt(dataDetail.get("reservationStatus").toString()));
            wlyyHospitalReservationSettingDO = reservationSettingDao.save(wlyyHospitalReservationSettingDO);
        }else{
            WlyyHospitalReservationSettingDO wlyyHospitalReservationSettingDOL = reservationSettingDao.findById(id);
            wlyyHospitalReservationSettingDOL.setDept(dataDetail.get("dept").toString());
            wlyyHospitalReservationSettingDOL.setDeptName(dataDetail.get("deptName").toString());
            wlyyHospitalReservationSettingDOL.setDoctor(dataDetail.get("doctor").toString());
            wlyyHospitalReservationSettingDOL.setDoctorName(dataDetail.get("doctorName").toString());
            wlyyHospitalReservationSettingDOL.setJob(dataDetail.get("job").toString());
            wlyyHospitalReservationSettingDOL.setJobName(dataDetail.get("jobName").toString());
            wlyyHospitalReservationSettingDOL.setDiseaseRange(dataDetail.get("diseaseRange").toString());
            wlyyHospitalReservationSettingDOL.setConsultType(Integer.parseInt(dataDetail.get("consultType").toString()));
            wlyyHospitalReservationSettingDOL.setReservationStatus(Integer.parseInt(dataDetail.get("reservationStatus").toString()));
            wlyyHospitalReservationSettingDO = reservationSettingDao.save(wlyyHospitalReservationSettingDOL);
        }
        return  wlyyHospitalReservationSettingDO;
    }
    public void deleteReservationSetting(String id){
        reservationSettingDao.delete(id);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/SysDictService.java

@@ -0,0 +1,83 @@
package com.yihu.jw.hospital.service.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dao.consult.SysDictDao;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class SysDictService {
    @Autowired
    private SysDictDao sysDictDao;
    /**
     * 新增&更新社区医生邀请专家配置
     * @param jsonObject
     * @return
     */
    public WlyyHospitalSysDictDO saveConsultSetting(JSONObject jsonObject,String hospital,String dictName ){
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = new WlyyHospitalSysDictDO();
        //JSON数据解析
        Map dataDetail  = JSONObject.fromObject(jsonObject);
        String dictCode = dataDetail.get("dictCode") == "" ? "": dataDetail.get("dictCode") .toString();
        String dictValue = dataDetail.get("dictValue") == "" ? "": dataDetail.get("dictValue") .toString();
        String id = dataDetail.get("id") == "" ? "": dataDetail.get("id") .toString();
        String saasId = "";
        if("".equals(id)){
            wlyyHospitalSysDictDO.setSaasId(saasId);
            wlyyHospitalSysDictDO.setHospital(hospital);
            wlyyHospitalSysDictDO.setDictName(dictName);
            wlyyHospitalSysDictDO.setDictCode(dictCode);
            wlyyHospitalSysDictDO.setDictValue(dictValue);
            wlyyHospitalSysDictDO = sysDictDao.save(wlyyHospitalSysDictDO);
        }else{
            WlyyHospitalSysDictDO wlyyHospitalSysDictDOL = sysDictDao.findById(id);
            wlyyHospitalSysDictDOL.setDictValue(dictValue);
            wlyyHospitalSysDictDO = sysDictDao.save(wlyyHospitalSysDictDOL);
        }
        return wlyyHospitalSysDictDO;
    }
    /**
     * 根据医院编号及字典编码，获取配置界面中某一配置项的值信息
     * dictName( 候诊延时： WaitingDelay )  dictCode ( 等待时长：WaitingTime  过号延时保号： OverdueDelay   过号延时时长： OverdueTime  延时退费规则: DelayedRefundRule )
     * dictName( 邀请专家配置： InvitedConfig )   dictCode ( 支付配置：PayType  邀请确认：InvitedValid   退费规则：RefundRule )
     * @param hospital
     * @param dictCode
     * @return
     */
    public WlyyHospitalSysDictDO findByHospitalAndDictCode(String hospital, String dictCode){
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = sysDictDao.findByHospitalAndDictCode(hospital,dictCode);
        if(wlyyHospitalSysDictDO != null){
            return wlyyHospitalSysDictDO;
        }else{
            return null;
        }
    }
    /**
     * 根据医院编号及字典名称，获取配置界面所有的配置信息
     * dictName( 候诊延时： WaitingDelay )
     * dictName( 邀请专家配置： InvitedConfig )
     * @param hospital
     * @param dictName
     * @return
     */
    public List<WlyyHospitalSysDictDO> findByHospitalAndDictName(String hospital, String dictName){
        List<WlyyHospitalSysDictDO> wlyyHospitalSysDictDOs = sysDictDao.findByHospitalAndDictName(hospital,dictName);
        if(wlyyHospitalSysDictDOs != null & wlyyHospitalSysDictDOs.size() > 0){
            return wlyyHospitalSysDictDOs;
        }else{
            return null;
        }
    }
}

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

@@ -202,9 +202,11 @@ public class ActivityController extends EnvelopRestEndpoint {
                                                                    @ApiParam(name="street",value = "街道")
                                                                        @RequestParam(value = "street",required = false)String street,
                                                                    @ApiParam(name="town",value = "区")
                                                                        @RequestParam(value = "town",required = false)String town){
                                                                        @RequestParam(value = "town",required = false)String town,
                                                                    @ApiParam(name="hospital",value = "社区")
                                                                        @RequestParam(value = "hospital",required = false)String hospital){
        try{
            return service.selectActivityRanking(activityId,patient,page,size,street,town);
            return service.selectActivityRanking(activityId,patient,page,size,street,town,hospital);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());

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

@@ -591,7 +591,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
     * @param size
     * @return
     */
    public MixEnvelop<JSONObject,JSONObject> selectActivityRanking(String activityId,String patient,Integer page,Integer size,String street,String town){
    public MixEnvelop<JSONObject,JSONObject> selectActivityRanking(String activityId,String patient,Integer page,Integer size,String street,String town,String hospital){
        MixEnvelop<JSONObject,JSONObject> envelop = new MixEnvelop<>();
        ActivityDO activityDO = activityDao.selectById(activityId);
        JSONObject jsonObject = new JSONObject();
@@ -605,7 +605,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "ORDER BY " +
                " btpd.total DESC,btpd.create_time ASC LIMIT " + (page-1)*size+","+size;
        List<TaskPatientDetailDO> patientDetailDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(TaskPatientDetailDO.class));
        long count=0L;
        long count=1L;
        int j =0;
        for (TaskPatientDetailDO taskPatientDetailDO:patientDetailDOS){
            String timeSeparated = DateUtils.getDatePoor(new Date(),taskPatientDetailDO.getUpdateTime());
@@ -632,7 +632,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "ORDER BY " +
                " btpd.couponTotal DESC,btpd.create_time ASC LIMIT " + (page-1)*size+","+size;
        List<TaskPatientDetailDO> patientDetailDOS1 = jdbcTemplate.query(sqlCoupon,new BeanPropertyRowMapper<>(TaskPatientDetailDO.class));
        long count2 = 0l;
        long count2 = 1l;
        int i=0;
        for (TaskPatientDetailDO taskPatientDetailDO:patientDetailDOS1){
            String timeSeparated = DateUtils.getDatePoor(new Date(),taskPatientDetailDO.getUpdateTime());
@@ -685,6 +685,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "WHERE " +
                " btpd1.activity_id = '"+activityDO.getId()+"' AND btpd1.sum >= (SELECT SUM(s.total) as total " +
                "FROM  wlyy_health_bank_task_patient_detail s WHERE s.patient_id ='"+patient+"' AND  s.activity_id='"+activityId+"')" +
                " ORDER BY btpd1.sum desc "+
                " limit "+countTotal+",1" ;
        List<Map<String,Object>> rstotal9 = jdbcTemplate.queryForList(rankingSql9);
        Integer total = 0;
@@ -736,6 +737,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "WHERE " +
                 " btpd1.sum >= (SELECT SUM(s.total) as total " +
                "FROM  wlyy_health_bank_task_patient_detail s WHERE s.patient_id ='"+patient+"' AND  s.activity_id='"+activityId+"')" +
                " ORDER BY btpd1.sum desc "+
                " limit "+countTotal1+",1" ;
        List<Map<String,Object>> totalSql10 = jdbcTemplate.queryForList(rankingSql10);
        Integer total2 = 0;
@@ -759,7 +761,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "ORDER BY " +
                " btpd.total DESC)btpd1 WHERE  btpd1.patientId IN(SELECT p.code FROM wlyy.wlyy_patient p WHERE p.street = '"+street+"')"+" ORDER BY btpd1.create_time ";
        List<TaskPatientDetailDO> patientDetailDOS2 = jdbcTemplate.query(rankingSql3,new BeanPropertyRowMapper<>(TaskPatientDetailDO.class));
        long count3=0L;
        long count3=1L;
        for (TaskPatientDetailDO taskPatientDetailDO:patientDetailDOS2){
            String timeSeparated = DateUtils.getDatePoor(new Date(),taskPatientDetailDO.getUpdateTime());
            String goodsSql = "select * from wlyy_health_bank_exchange_goods where patient_id ='"+taskPatientDetailDO.getPatientId()+"' " +
@@ -775,6 +777,20 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                count3+=1;
            }
        }
        //积分社区排行
        String sql1= "select s.rank,IFNULL(s.sum,0) as sum,s.patient_id from (SELECT @rownum :=@rownum + 1 AS rank, r.sum, r.patient_id FROM " +
                "(SELECT@rowNum := 0) b," +
                " (SELECT sum(bcd.integrate) AS sum, hbtd.patient_id, hbtd.create_time FROM " +
                "wlyy_health_bank_task_patient_detail hbtd " +
                "  LEFT  JOIN wlyy_health_bank_credits_detail bcd ON hbtd.patient_id=bcd.patient_id " +
                "AND bcd.transaction_id='"+taskPatientDetailDO1.getTaskId()+"'" +
                "WHERE hbtd.task_id = '"+taskPatientDetailDO1.getTaskId()+"' " +"and hbtd.hospital = '"+hospital+"'"+
                "GROUP BY hbtd.patient_id) r ORDER BY r.sum DESC,r.create_time DESC)s where s.patient_id ='"+patient+"'";
        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql1);
        long count10=0L;
        if (maps!= null && maps.size()!=0){
            count10 =new Double((Double) maps.get(0).get("rank")).longValue();
        }
        //区排名
        String rankingSql4  ="SELECT btpd1.patientId, btpd1.total, btpd1.create_time AS updateTime FROM (SELECT btpd.patient_id AS patientId,btpd.total,btpd.create_time AS create_time FROM ( SELECT sum(btpd.total) AS total, btpd.patient_id,btpd.create_time " +
                "FROM wlyy_health_bank_task_patient_detail btpd " +
@@ -784,7 +800,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "ORDER BY " +
                " btpd.total DESC)btpd1 WHERE  btpd1.patientId IN(SELECT p.code FROM wlyy.wlyy_patient p WHERE p.town = '"+town+"')"+" ORDER BY btpd1.create_time ";
        List<TaskPatientDetailDO> patientDetailDOS3 = jdbcTemplate.query(rankingSql4,new BeanPropertyRowMapper<>(TaskPatientDetailDO.class));
        long count4=0L;
        long count4=1L;
        for (TaskPatientDetailDO taskPatientDetailDO:patientDetailDOS3){
            String timeSeparated = DateUtils.getDatePoor(new Date(),taskPatientDetailDO.getUpdateTime());
            String goodsSql = "select * from wlyy_health_bank_exchange_goods where patient_id ='"+taskPatientDetailDO.getPatientId()+"' " +
@@ -811,7 +827,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "ORDER BY " +
                " btpd.couponTotal DESC )btpd1 WHERE  btpd1.patientId IN(SELECT p.code FROM wlyy.wlyy_patient p WHERE p.street = '"+street+"') ORDER BY btpd1.create_time ";
        List<TaskPatientDetailDO> patientDetailDOS4 = jdbcTemplate.query(rankingSql5,new BeanPropertyRowMapper<>(TaskPatientDetailDO.class));
        long count5 = 0l;
        long count5 = 1l;
        for (TaskPatientDetailDO taskPatientDetailDO:patientDetailDOS4){
            String timeSeparated = DateUtils.getDatePoor(new Date(),taskPatientDetailDO.getUpdateTime());
            String goodsSql = "select * from wlyy_health_bank_exchange_goods where patient_id ='"+taskPatientDetailDO.getPatientId()+"' " +
@@ -836,7 +852,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
                "ORDER BY " +
                " btpd.couponTotal DESC )btpd1 WHERE  btpd1.patientId IN(SELECT p.code FROM wlyy.wlyy_patient p WHERE p.town = '"+town+"') ORDER BY btpd1.create_time ";
        List<TaskPatientDetailDO> patientDetailDOS5 = jdbcTemplate.query(rankingSql6,new BeanPropertyRowMapper<>(TaskPatientDetailDO.class));
        long count6 = 0l;
        long count6 = 1l;
        for (TaskPatientDetailDO taskPatientDetailDO:patientDetailDOS5){
            String timeSeparated = DateUtils.getDatePoor(new Date(),taskPatientDetailDO.getUpdateTime());
            String goodsSql = "select * from wlyy_health_bank_exchange_goods where patient_id ='"+taskPatientDetailDO.getPatientId()+"' " +
@@ -854,7 +870,20 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        }
        //社区排行
        String sql8= "select s.rank,IFNULL(s.sum,0) as sum,s.patient_id from (SELECT @rownum :=@rownum + 1 AS rank, r.sum, r.patient_id FROM " +
                "(SELECT@rowNum := 0) b," +
                " (SELECT sum(bcd.coupon) AS sum, hbtd.patient_id, hbtd.create_time FROM " +
                "wlyy_health_bank_task_patient_detail hbtd " +
                "  LEFT  JOIN wlyy_health_bank_credits_detail bcd ON hbtd.patient_id=bcd.patient_id " +
                "AND bcd.transaction_id='"+taskPatientDetailDO1.getTaskId()+"'" +
                "WHERE hbtd.task_id = '"+taskPatientDetailDO1.getTaskId()+"' " +"and hbtd.hospital = '"+hospital+"'"+
                "GROUP BY hbtd.patient_id) r ORDER BY r.sum DESC,r.create_time DESC)s where s.patient_id ='"+patient+"'";
        List<Map<String,Object>> maps1 = jdbcTemplate.queryForList(sql8);
        long count11=0L;
        if (maps1!= null && maps1.size()!=0){
            count11 =  new Double((Double) maps1.get(0).get("rank")).longValue();
        }
        //街道排名
@@ -1035,6 +1064,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
            jsonObject.put("couponTotal",taskPatientDetailDO1.getCouponTotal());//本人活动劵总数
            jsonObject.put("couponRanking",patientDetailDOS1);//活动劵人数排名
            jsonObject.put("signCouponRanking",count7);//活动劵团队排名
            jsonObject.put("activityHospitalCouponRanking",count11);//社区排名
            if (count2 ==1){
                jsonObject.put("differTotal",0);
            }else {
@@ -1047,6 +1077,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
            jsonObject.put("activityTownIntegrateRanking",count4);//积分全区排名
            jsonObject.put("activityRanking",count);//积分排名
            jsonObject.put("signRanking",count8);//积分团队排名
            jsonObject.put("activityHospitalIntegrateRanking",count10);//社区排名
            if (count==1){
                jsonObject.put("differTotal",0);//相距前一个差多少积分
            }else {

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

@@ -811,7 +811,13 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                        "transaction_id = '"+creditsDetailDO.getTransactionId()+"' AND create_time > '"+DateUtils.getDayBegin() +"' AND" +
                        " create_time < '"+DateUtils.getDayEnd()+"'AND ISNULL(description)";
                List<CreditsDetailDO> creditsDetailDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(CreditsDetailDO.class));
                int integrate1=0;
                for (CreditsDetailDO detailDO:creditsDetailDOS){
                    integrate1+= detailDO.getIntegrate();
                }
                ActivityRuleDO activityRuleDO = activityRuleDao.selectByActivityId(taskPatientDetailDO.getActivityId());
                logger.info("开始"+activityRuleDO.getValue1());
                logger.info("参数:"+creditsDetailDO.getIntegrate()+creditsDetailDO.getStepNumber());
                if (activityRuleDO.getValue1() != null){
                    JSONObject object = JSONObject.parseObject(activityRuleDO.getValue1());
                    //获取步数
@@ -825,15 +831,17 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                        if (creditsDetailDOS != null && creditsDetailDOS.size() != 0){
                            CreditsDetailDO creditsDetailDO1 = creditsDetailDOS.get(0);
                            if (creditsDetailDO.getStepNumber()>0 && creditsDetailDO.getStepNumber()<=step){
                                int integrate1=creditsDetailDO1.getIntegrate();
                                creditsDetailDO1.setIntegrate(creditsDetailDO.getIntegrate());
                                creditsDetailDO1.setTradeDirection(1);
                                CreditsDetailDO creditsDetailDO2 = credittsLogDetailDao.save(creditsDetailDO1);
                                creditsDetailDO.setIntegrate(creditsDetailDO.getIntegrate());
                                creditsDetailDO.setTradeDirection(1);
                                creditsDetailDO.setUpdateTime(new Date());
                                creditsDetailDO.setCreateTime(new Date());
                                creditsDetailDO.setTradeType("ACTIVITY_TASK");
                                CreditsDetailDO creditsDetailDO2 = credittsLogDetailDao.save(creditsDetailDO);
                                AccountDO accountDO = accountDao.findOne(creditsDetailDO2.getAccountId());
                                accountDO.setTotal(accountDO.getTotal()-integrate1+creditsDetailDO2.getIntegrate());
                                accountDO.setTotal(accountDO.getTotal()+creditsDetailDO2.getIntegrate());
                                AccountDO accountDO1 = accountDao.save(accountDO);
                                creditsDetailDO2.setTotal(accountDO1.getTotal());
                                taskPatientDetailDO.setTotal(taskPatientDetailDO.getTotal()-integrate1+creditsDetailDO2.getIntegrate());
                                taskPatientDetailDO.setTotal(taskPatientDetailDO.getTotal()+creditsDetailDO2.getIntegrate());
                                taskPatientDetailDao.save(taskPatientDetailDO);
                                creditsDetailDOS.clear();
                                creditsDetailDOS.add(creditsDetailDO2);
@@ -859,6 +867,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                                accountDO.setTotal(accountDO.getTotal()+creditsDetailDO2.getIntegrate());
                                taskPatientDetailDO.setTotal(taskPatientDetailDO.getTotal()+creditsDetailDO2.getIntegrate());
                                taskPatientDetailDao.save(taskPatientDetailDO);
                                accountDao.save(accountDO);
                                creditsDetailDO2.setTotal(accountDO.getTotal());
                                creditsDetailDOS.add(creditsDetailDO2);
                                break;