代码修改

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

@@ -1,10 +1,9 @@
package com.yihu.jw.hospital.dao.consult;
package com.yihu.jw.article.dao;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
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.jpa.repository.JpaRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;

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

@@ -1,11 +1,10 @@
package com.yihu.jw.hospital.dao.consult;
package com.yihu.jw.article.dao;
import com.yihu.jw.entity.hospital.article.KnowledgeCategoryDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.query.Param;
/**
 * 健康文章分类

business/base-service/src/main/java/com/yihu/jw/article/service/KnowledgeArticleDictService.java

@@ -12,7 +12,7 @@ import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.article.KnowledgeCategoryDO;
import com.yihu.jw.entity.hospital.survey.WlyySurveyTemplateDO;
import com.yihu.jw.entity.hospital.survey.WlyySurveyUserDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
@@ -69,6 +69,8 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
    @Autowired
    private HibenateUtils hibenateUtils;
    @Autowired
    private KnowledgeCategoryDao knowledgeCategoryDao;
    @Autowired
    private UserDao userDao;
    @Autowired
@@ -153,11 +155,11 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
     */
    public KnowledgeArticleDictDO saveArticle(String jsonData, Integer type) throws Exception {
        KnowledgeArticleDictDO knowledgeArticleDO = EntityUtils.jsonToEntity(jsonData, KnowledgeArticleDictDO.class);
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("articleNeedCheck").orElse(null);
        ;
//        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("articleNeedCheck").orElse(null);
        KnowledgeCategoryDO knowledgeCategoryDO = knowledgeCategoryDao.findById(knowledgeArticleDO.getCategorySecond()).orElse(null);
        Boolean articleNeedCheck = true;
        if (wlyyHospitalSysDictDO != null) {
            if (!wlyyHospitalSysDictDO.getDictValue().equalsIgnoreCase("1")) {
        if (knowledgeCategoryDO != null) {
            if (knowledgeCategoryDO.getIsCheck()==null||knowledgeCategoryDO.getIsCheck()!=1) {
                articleNeedCheck = false;
            }
        }
@@ -180,13 +182,13 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
            if (type == 1) {
                BaseDoctorDO userDO = doctorDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);
                ;
                if (userDO != null) {
                    knowledgeArticleDO.setCreateUserName(userDO.getName());
                }
            } else {
                BaseDoctorDO userDO = doctorDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);
                ;
                if (userDO != null) {
                    knowledgeArticleDO.setCreateUserName(userDO.getName());
                }

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -1020,6 +1020,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
            if (StringUtils.isNotBlank(patientId)){
                sql += " and t.patient = '"+patientId+"'";
            }
            sql += " order by t.create_time ";
            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
            if (list!=null&&list.size()>0){
                for (Map<String,Object> map:list){

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

@@ -364,6 +364,25 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    @Autowired
    private HealthCareNewService healthCareNewService;
    //已就诊医生列表
    public PageEnvelop visitedDoctorPage(String patientId,String startTime,String endTime,Integer page,Integer size){
        String sql = "SELECT d.id,d.name,d.job_title_name jobTitleName,o.dept_name deptName,d.photo,date_format(MAX(o.create_time),'%Y-%m-%d %H:%i:%S' )" +
                " createTime,o.outpatient_type outpatientType ";
        String countSql = " select count(distinct d.id)";
        String filter = "" +
                "from wlyy_outpatient o,base_doctor d " +
                "WHERE o.patient='"+patientId+"' and o.doctor=d.id ";
        if(StringUtils.isNotBlank(startTime)){
            filter += " and o.create_time>='"+startTime+"' ";
        }
        if(StringUtils.isNotBlank(endTime)){
            filter += " and o.create_time<='"+endTime+" 23:59:59' ";
        }
        String orderBy = " GROUP BY d.id order by createTime desc limit "+(page-1)*size+","+size;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filter+orderBy);
        Long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,size,count);
    }
    /**
     * 获取居民就诊记录接口
@@ -7908,16 +7927,27 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    }
    public Map<String, Object> updatePatientInfo(String patient, String name, String idcard, String ssc, Integer sex, String townCode, String townName, String committeeCode, String committeeName, String address, String photo, String mobile, String province, String provinceName, String city, String cityName) {
    public Map<String, Object> updatePatientInfo(String patient, String name, String idcard,String cardType, String ssc, Integer sex, String townCode, String townName, String committeeCode, String committeeName, String address, String photo, String mobile, String province, String provinceName, String city, String cityName) {
        Map<String, Object> rs = new HashedMap();
        BasePatientDO basePatientDO = basePatientDao.findById(patient).orElse(null);
        PatientMedicareCardDO patientMedicareCardDO = basePatientMedicareCardDao.findByTypeAndPatientCodeAndDel("A_01", patient, "1");
        if (StringUtils.isNoneBlank(name)) {
            basePatientDO.setName(name);
        }
        if (StringUtils.isNoneBlank(idcard)) {
            basePatientDO.setIdcard(idcard);
        if(StringUtils.isBlank(basePatientDO.getIdcard())){
            //身份证空才允许修改
            if (StringUtils.isNoneBlank(idcard)) {
                boolean tmp = basePatientDao.existsByIdcardAndDel(idcard,"1");
                if(tmp){
                    throw new ServiceException("该身份证已存在账号，不允许修改成此身份证");
                }
                basePatientDO.setIdcard(idcard);
            }
        }
        if (StringUtils.isNoneBlank(cardType)) {
            basePatientDO.setCardType(cardType);
        }
        if (sex != null) {
            basePatientDO.setSex(sex);
        }