代码修改

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

@@ -4847,6 +4847,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            } else {
                rs.put("scoreList", null);
            }
            rs.put("doctorLable",findDoctorLabel(doctor));
        }
        return rs;
@@ -5028,11 +5030,30 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                rs.put("authPw", baseDoctorService.findDoctorPwlimitDate(doctor));
            }
            //医生标签
            rs.put("doctorLable", findDoctorLabel(doctor));
        }
        return rs;
    }
    //获取医生标签
    public String findDoctorLabel(String doctor){
        String sql = "SELECT GROUP_CONCAT(name) doctorLable from (" +
                "SELECT CONCAT(di.name,'专病医生') name from base_disease_hospital di" +
                "INNER JOIN base_doctor_hospital d on d.del=1 and FIND_IN_SET(d.dept_code,di.dept)" +
                "WHERE di.`status`=1 and d.doctor_code='"+doctor+"'" +
                "UNION" +
                "SELECT CONCAT(t.name,'成员') name from base_team t,base_team_member m" +
                "WHERE t.del='1' and t.id=m.team_code and m.del='1' " +
                "and m.doctor_code='"+doctor+"') a";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        if(list.size()>0){
            return list.get(0).get("doctorLable")+"";
        }
        return "";
    }
    /**
     * 居民取消复诊或者医生拒绝接诊
     *

common/common-entity/src/db/2024.sql

@@ -42,4 +42,9 @@ ADD COLUMN `is_positive` varchar(255) NULL COMMENT '是否新冠阳性 1是0否'
ADD COLUMN `inquiry_sign` varchar(255) NULL COMMENT '问诊标识1发热咨询0普通门诊' AFTER `is_positive`,
ADD COLUMN `visit_type` varchar(255) NULL COMMENT '就诊类型：1首诊2复诊' AFTER `inquiry_sign`,
ADD COLUMN `virus_flag` varchar(255) NULL COMMENT '新冠病毒：1阴性、2阳性、0无' AFTER `visit_type`,
ADD COLUMN `is_disease` varchar(255) NULL COMMENT '特殊病种1是0否' AFTER `virus_flag`;
ADD COLUMN `is_disease` varchar(255) NULL COMMENT '特殊病种1是0否' AFTER `virus_flag`;
-- 2023-02-26
ALTER TABLE `base`.`wlyy_knowledge_category`
    ADD COLUMN `is_check` tinyint(1) NULL COMMENT '是否开启审核1开启 0关闭， 默认开启' ;

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/article/KnowledgeCategoryDO.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.hospital.article;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -21,7 +22,8 @@ public class KnowledgeCategoryDO extends UuidIdentityEntity {
	private Date updateTime;  // 编辑时间
	private Integer del;    // 是否删除，1正常，0删除'
	private String pid;   // 父id
	
	private Integer isCheck;   // 是否开启审核1开启 0关闭， 默认开启
	
	public String getName() {
		return name;
@@ -62,4 +64,13 @@ public class KnowledgeCategoryDO extends UuidIdentityEntity {
	public void setPid(String pid) {
		this.pid = pid;
	}
	@Column(name = "is_check")
	public Integer getIsCheck() {
		return isCheck;
	}
	public void setIsCheck(Integer isCheck) {
		this.isCheck = isCheck;
	}
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/team/DoctorTeamEndpoint.java

@@ -1,8 +1,6 @@
package com.yihu.jw.hospital.endpoint.team;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.team.service.TeamService;
import com.yihu.jw.wlyy.service.WlyyBusinessService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,12 +18,8 @@ import org.springframework.web.bind.annotation.RestController;
@Api(value = "医生团队",  tags = {"医生团队"})
public class DoctorTeamEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private TeamService teamService;
    @Autowired
    private WlyyBusinessService wlyyBusinessService;
    @Autowired
    private BasePatientDao patientDao;
    private static final String TONGAN_TOWN = "350212";
    @GetMapping(value = "doctorInfo")

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

@@ -48,6 +48,9 @@ public class KnowledgeCategoryService extends BaseJpaService<KnowledgeCategoryDO
			knowledgeCategoryDO.setDel(one.getDel());
			knowledgeCategoryDO.setUpdateTime(new Date());
		}
		if(knowledgeCategoryDO.getIsCheck()==null){
			knowledgeCategoryDO.setIsCheck(1);
		}
		return knowledgeCategoryDao.save(knowledgeCategoryDO);
	}