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

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

@@ -11,7 +11,7 @@ import java.util.List;
 */
public interface PrescriptionLogDao extends PagingAndSortingRepository<WlyyPrescriptionLogDO, String>, JpaSpecificationExecutor<WlyyPrescriptionLogDO> {
    List<WlyyPrescriptionLogDO> findByOutpatientIdOrderByCreateTimeDESC(String outpatientId);
    List<WlyyPrescriptionLogDO> findByOutpatientIdOrderByCreateTimeDesc(String outpatientId);
    List<WlyyPrescriptionLogDO> findByPrescriptionCodeOrderByCreateTimeDESC(String prescriptionCode);
    List<WlyyPrescriptionLogDO> findByPrescriptionCodeOrderByCreateTimeDesc(String prescriptionCode);
}

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

@@ -57,7 +57,7 @@ public class PrescriptionLogService  extends BaseJpaService<WlyyPrescriptionLogD
     * @return
     */
    public List<WlyyPrescriptionLogDO> findByOutpatientId(String outpatientId){
        return logDao.findByOutpatientIdOrderByCreateTimeDESC(outpatientId);
        return logDao.findByOutpatientIdOrderByCreateTimeDesc(outpatientId);
    }
    /**
@@ -66,6 +66,6 @@ public class PrescriptionLogService  extends BaseJpaService<WlyyPrescriptionLogD
     * @return
     */
    public List<WlyyPrescriptionLogDO> findByPrescriptionCode(String prescriptionCode){
        return logDao.findByPrescriptionCodeOrderByCreateTimeDESC(prescriptionCode);
        return logDao.findByPrescriptionCodeOrderByCreateTimeDesc(prescriptionCode);
    }
}

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

@@ -5,7 +5,7 @@ import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.xml.crypto.Data;
import java.util.Date;
/**
 * Created by Trick on 2019/9/26.
@@ -18,7 +18,7 @@ public class WlyyInspectionPartsDictDO extends IntegerIdentityEntity {
    private String name;//部位名称',
    private String parentCode;//上级部位名称',
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Data createTime;//
    private Date createTime;//
    public String getCode() {
        return code;
@@ -44,11 +44,11 @@ public class WlyyInspectionPartsDictDO extends IntegerIdentityEntity {
        this.parentCode = parentCode;
    }
    public Data getCreateTime() {
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Data createTime) {
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}