代码修改

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

@@ -1,11 +1,9 @@
package com.yihu.jw.hospital.appointment.dao;
import com.yihu.jw.entity.hospital.appointment.WlyyAppointmentDO;
import com.yihu.jw.entity.hospital.appointment.WlyySpecialDiseaseDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
@@ -16,4 +14,7 @@ public interface SpecialDiseaseDao extends JpaRepository<WlyySpecialDiseaseDO, S
    @Query("from WlyySpecialDiseaseDO a order by a.sort asc")
    List<WlyySpecialDiseaseDO> findAllOrderBySortASC();
    @Query("from WlyySpecialDiseaseDO a where a.code=?1")
    WlyySpecialDiseaseDO findByCode(String code);
}

business/base-service/src/main/java/com/yihu/jw/knowledge/service/BaseKnowledgeDictService.java

@@ -4,9 +4,10 @@ package com.yihu.jw.knowledge.service;
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.hospital.appointment.WlyySpecialDiseaseDO;
import com.yihu.jw.entity.knowledge.BaseKnowledgeDict;
import com.yihu.jw.entity.knowledge.BaseKnowledgeDictRelation;
import com.yihu.jw.hospital.appointment.dao.SpecialDiseaseDao;
import com.yihu.jw.knowledge.dao.BaseKnowledgeDictDao;
import com.yihu.jw.knowledge.dao.BaseKnowledgeDictRelationDao;
import com.yihu.jw.mysql.query.BaseJpaService;
@@ -44,6 +45,8 @@ public class BaseKnowledgeDictService extends BaseJpaService<BaseKnowledgeDict,
    private DictHospitalDeptDao hospitalDeptDao;
    @Autowired
    private BaseDoctorDao doctorDao;
    @Autowired
    private SpecialDiseaseDao specialDiseaseDao;
    /**
     * 新增及修改字典
@@ -155,13 +158,13 @@ public class BaseKnowledgeDictService extends BaseJpaService<BaseKnowledgeDict,
                String deptstr[]= dept.split(",");
                String doctorstr[]= doctor.split(",");
                List<DictHospitalDeptDO> hospitalDeptDOS = new ArrayList<>();
                List<BaseDoctorDO> doctorDOS = new ArrayList<>();
                List<WlyySpecialDiseaseDO> doctorDOS = new ArrayList<>();
                for (int i=0;i<deptstr.length-1;i++){
                    DictHospitalDeptDO hospitalDeptDO = hospitalDeptDao.findByCode(deptstr[i]);
                    hospitalDeptDOS.add(hospitalDeptDO);
                }
                for (int i=0;i<doctorstr.length-1;i++){
                    BaseDoctorDO doctorDO = doctorDao.findById(doctorstr[i]).get();
                    WlyySpecialDiseaseDO doctorDO = specialDiseaseDao.findByCode(doctorstr[i]);
                    doctorDOS.add(doctorDO);
                }
                dictRelation.setDeptDOS(hospitalDeptDOS);

common/common-entity/src/main/java/com/yihu/jw/entity/knowledge/BaseKnowledgeDictRelation.java

@@ -2,8 +2,7 @@ package com.yihu.jw.entity.knowledge;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.hospital.dict.BaseDeptDict;
import com.yihu.jw.entity.hospital.appointment.WlyySpecialDiseaseDO;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -22,12 +21,12 @@ public class BaseKnowledgeDictRelation extends UuidIdentityEntityWithOperator {
	private String dictId;//字典id
	private String dept; //科室code，多个以逗号隔开
	private String doctor; //医生code 多个以逗号隔开
	private String doctor; //疾病code 多个以逗号隔开--WlyySpecialDiseaseDO
	private List<DictHospitalDeptDO> deptDOS;
	private List<BaseDoctorDO> doctorDOS;
	private List<WlyySpecialDiseaseDO> doctorDOS;
	@Transient
	public List<DictHospitalDeptDO> getDeptDOS() {
@@ -39,11 +38,11 @@ public class BaseKnowledgeDictRelation extends UuidIdentityEntityWithOperator {
	}
	@Transient
	public List<BaseDoctorDO> getDoctorDOS() {
	public List<WlyySpecialDiseaseDO> getDoctorDOS() {
		return doctorDOS;
	}
	public void setDoctorDOS(List<BaseDoctorDO> doctorDOS) {
	public void setDoctorDOS(List<WlyySpecialDiseaseDO> doctorDOS) {
		this.doctorDOS = doctorDOS;
	}