Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/internet/entity/MedicalSkillOrdersDO.java

@@ -1,5 +1,7 @@
package com.yihu.jw.internet.entity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -7,10 +9,8 @@ import java.io.Serializable;
@Entity
@Table(name = "medical_skill_orders")
public class MedicalSkillOrdersDO  implements Serializable {
    @Column(name = "id")
    private String id;
public class MedicalSkillOrdersDO  extends UuidIdentityEntityWithOperator implements Serializable {
    
    @Column(name = "cd_org")
    private String cdOrg;
    @Column(name = "app_time")

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

@@ -20,7 +20,7 @@ public class KnowledgeCategoryDO extends UuidIdentityEntity {
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date updateTime;  // 编辑时间
	private Integer del;    // 是否删除，1正常，0删除'
	private Long pid;   // 父id
	private String pid;   // 父id
	
	
	public String getName() {
@@ -55,11 +55,11 @@ public class KnowledgeCategoryDO extends UuidIdentityEntity {
		this.del = del;
	}
	
	public Long getPid() {
	public String getPid() {
		return pid;
	}
	
	public void setPid(Long pid) {
	public void setPid(String pid) {
		this.pid = pid;
	}
}

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

@@ -14,6 +14,6 @@ import java.util.List;
 * @date 2019/9/10 14:07
 */
public interface KnowledgeArticleDao extends PagingAndSortingRepository<KnowledgeArticleDO, String>, JpaSpecificationExecutor<KnowledgeArticleDO> {
	@Query("select a from KnowledgeArticleDO a where a.del=1 and category = :category")
	List<KnowledgeArticleDO> findByCategory(@Param("category") String category);
	@Query("select a from KnowledgeArticleDO a where a.del=1 and (categoryFirst = ?1 or categorySecond=?1)")
	List<KnowledgeArticleDO> findByCategory(String category);
}

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

@@ -12,7 +12,7 @@ import org.springframework.data.repository.query.Param;
 * @author huangwenjie
 */
public interface KnowledgeCategoryDao extends PagingAndSortingRepository<KnowledgeCategoryDO, String>, JpaSpecificationExecutor<KnowledgeCategoryDO> {
	@Query("update KnowledgeCategoryDO c set c.del = 0 where c.id = :id")
	@Query("update KnowledgeCategoryDO c set c.del = 0 where c.id = ?1")
	@Modifying
	void updateDel(@Param("id") String id);
	void updateDel(String id);
}

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

@@ -33,7 +33,7 @@ public class KnowledgeCategoryService extends BaseJpaService<KnowledgeCategoryDO
		jsonData = URLDecoder.decode(jsonData,"utf-8");
		KnowledgeCategoryDO knowledgeCategoryDO = objectMapper.readValue(jsonData, KnowledgeCategoryDO.class);
		if (null == knowledgeCategoryDO.getPid()) {
			knowledgeCategoryDO.setPid(0l);
			knowledgeCategoryDO.setPid("0");
		}
		if (null == knowledgeCategoryDO.getId()) {
			// 新增