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

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

@@ -30,4 +30,7 @@ public interface OutpatientDao extends PagingAndSortingRepository<WlyyOutpatient
    @Query("from WlyyOutpatientDO a where a.generalDoctor = ?1 and a.registerDate >=?2 and a.registerDate <=?3 and a.status = ?4 and a.doctor is not null order by registerDate ASC")
    List<WlyyOutpatientDO> findByGeneralDoctor(String generalDoctor, Date startDate,Date endDate,String status);
    List<WlyyOutpatientDO> findByStatus(String status);
}

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

@@ -8,7 +8,7 @@ import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Trick on 2019/9/23.
 * Created by Trick on 2019/9/23
 */
@Entity
@Table(name = "wlyy_inspection")
@@ -31,6 +31,8 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
    private String information;//病史与体征',
    private String checkEquip;//类别',
    private String checkPart;//部位',
    private String checkPartName;//部位名称',
    private String adresult;//辅助检查治疗',
    private String goal;//检查目的',
    private String opview;//手术所见-病理申请单必填',
@@ -268,4 +270,12 @@ public class WlyyInspectionDO extends UuidIdentityEntity {
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }
    public String getCheckPartName() {
        return checkPartName;
    }
    public void setCheckPartName(String checkPartName) {
        this.checkPartName = checkPartName;
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/PrescriptionStatusUpdateService.java

@@ -260,4 +260,8 @@ public class PrescriptionStatusUpdateService {
        return null;
    }
//    public void setOutPatientOver(){
//        outpatientDao.
//    }
}